From 879e3e5a908425cbe0932319c001fc4c71dec020 Mon Sep 17 00:00:00 2001 From: Quincy Larson Date: Sat, 30 May 2015 01:02:12 -0700 Subject: [PATCH] close #754 and #755 --- seed_data/challenges/basic-html5-and-css.json | 11 +++++++---- seed_data/challenges/bootstrap.json | 6 ++++-- 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/seed_data/challenges/basic-html5-and-css.json b/seed_data/challenges/basic-html5-and-css.json index 9cc32106d7..1bdf18cd55 100644 --- a/seed_data/challenges/basic-html5-and-css.json +++ b/seed_data/challenges/basic-html5-and-css.json @@ -1110,8 +1110,9 @@ "Once you've done this, hover over your image with your cursor. Your cursor's normal pointer should become the link clicking pointer. The photo is now a link." ], "tests": [ - "expect($('a').children('img').length, 'Wrap your image element inside an anchor element that has its href attribute set to \"#\"').to.equal(1);", - "expect(new RegExp('#').test($('a').children('img').parent().attr('href')), 'Make sure to specify the \"src\" attribute as \"#\"').to.be.true;" + "assert(new RegExp('#').test($('a').children('img').parent().attr('href')), 'Your anchor element should be a dead link with a href attribute set to \"#\".')", + "assert($('a').children('img').length > 0, 'Wrap your image element inside an anchor element.')", + "assert(editor.match(/<\\/a>/g).length > 1, 'Be sure that each of your a elements has a closing tag.')" ], "challengeSeed": [ "", @@ -1512,7 +1513,9 @@ ], "tests": [ "assert($('form').length > 0, 'Wrap your text input element within a form element.')", - "assert($('form').attr('action'), 'Your form element should have an action attribute.')" + "assert($('form').attr('action'), 'Your form element should have an action attribute.')", + "assert(editor.match(/<\\/form>/g), 'Make sure your form elements has a closing tag.')", + "assert(editor.match(/\\/submit-cat-photo/ig), 'Make sure your form action is set to /submit-cat-photo.')" ], "challengeSeed": [ "", @@ -2113,7 +2116,7 @@ "description": [ "Change the margin of the green box to match that of the red box.", "An element's margin controls the amount of space between an element's border and surrounding elements.", - "Here, we can see that the green box and the red box and the green box are nested within the yellow box. Note that the red box has more margin than the green box, making it appear smaller.", + "Here, we can see that the green box and the red box are nested within the yellow box. Note that the red box has more margin than the green box, making it appear smaller.", "When you increase the green box's margin, it will increase the distance between its border and surrounding elements." ], "tests": [ diff --git a/seed_data/challenges/bootstrap.json b/seed_data/challenges/bootstrap.json index 21ef48792c..1890fb411a 100644 --- a/seed_data/challenges/bootstrap.json +++ b/seed_data/challenges/bootstrap.json @@ -690,7 +690,7 @@ "name": "Waypoint: Ditch Custom CSS for Bootstrap", "difficulty": 0.055, "description": [ - "Delete the following from your style tag: .red-text, p, .smaller-image. Delete the p element with the dead link. Remove your red-text class from your h2 element and instead apply the text-primary Bootstrap class. Replace the smaller-image class on your top image with the img-responsive class.", + "
  1. Delete .red-text, p, and .smaller-image from your style element.
  2. Delete the p element that contains the dead link.
  3. Remove the red-text class from your h2 element and replace it with the text-primary Bootstrap class.
  4. Remove the smaller-image class from your first img element and replace it with the img-responsive class.
", "We can clean up our code and make our Cat Photo App look more conventional by using Bootstrap's built-in styles instead of the custom styles we created earlier.", "Don't worry - there will be plenty of time to customize our CSS later." ], @@ -881,7 +881,9 @@ "Go ahead and add a <i class=\"fa fa-thumbs-up\"></i> within your like button's element." ], "tests": [ - "assert($('.fa-thumbs-up').length > 0, 'You should add a <i class=\"fa fa-thumbs-up\"></i> within your like button element.')" + "assert($('.fa-thumbs-up').length > 0, 'Add a i element with the classes \"fa\" and \"fa-thumbs-up\".')", + "assert($('button').children('i').length > 0, 'Wrap your i element within your button element.')", + "assert(editor.match(/<\\/i>/g), 'Be sure to close your i element with a closing tag.')" ], "challengeSeed": [ "",