From b84d41bcd659730f826e6ad37a2d821dc9037ed1 Mon Sep 17 00:00:00 2001
From: Quincy Larson <michaelqlarson@gmail.com>
Date: Sun, 7 Jun 2015 18:29:00 -0700
Subject: [PATCH] write tests for first 5 jquery challenges

---
 public/js/lib/coursewares/iFrameScripts_0.0.4.js  |  2 +-
 seed_data/challenges/future-jquery-ajax-json.json | 12 +++++++-----
 views/coursewares/showHTML.jade                   |  8 +++++---
 3 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/public/js/lib/coursewares/iFrameScripts_0.0.4.js b/public/js/lib/coursewares/iFrameScripts_0.0.4.js
index 2092acc066..1d5db5413d 100644
--- a/public/js/lib/coursewares/iFrameScripts_0.0.4.js
+++ b/public/js/lib/coursewares/iFrameScripts_0.0.4.js
@@ -19,5 +19,5 @@
         }
       }
     }
-  }, 250);
+  }, 10);
 })();
diff --git a/seed_data/challenges/future-jquery-ajax-json.json b/seed_data/challenges/future-jquery-ajax-json.json
index acab88f2c6..1fbadc7649 100644
--- a/seed_data/challenges/future-jquery-ajax-json.json
+++ b/seed_data/challenges/future-jquery-ajax-json.json
@@ -53,7 +53,8 @@
         "Make all <code>img</code> elements bounce $('img').addClass('animated bounce')"
       ],
       "tests": [
-        "expect($('img'), 'Make sure you add the animated bounce class').to.have.class('animated bounce')"
+        "assert($('img').hasClass('animated') && $('img').hasClass('bounce'), 'Use the jQuery <code>addClass()</code> function to give the classes \"animated\" and \"bounce\" to your <code>img</code> element.')",
+        "assert(!editor.match(/class.*animated/g), 'Only use jQuery to add these classes to the element.')"
       ],
       "challengeSeed": [
         "fccss",
@@ -98,13 +99,13 @@
 
       ],
       "tests": [
-
+        "assert($('.btn').hasClass('animated') && $('.btn').hasClass('shake'), 'Use the jQuery <code>addClass()</code> function to give the classes \"animated\" and \"shake\" to all your elements with the class \"btn\".')",
+        "assert(!editor.match(/class.*animated/g), 'Only use jQuery to add these classes to the element.')"
       ],
       "challengeSeed": [
         "fccss",
         "  $(document).ready(function() {",
         "    $('img').addClass('animated bounce');",
-        "    $('.btn').addClass('animated shake');",
         "  });",
         "fcces",
         "<br>",
@@ -144,7 +145,7 @@
 
       ],
       "tests": [
-        "assert($('form').attr('id') === 'cat-photo-form', 'Add an ID  <code>script</code> element has a closing tag.')"
+        "assert($('form').attr('id') === 'cat-photo-form', 'Add the ID of \"cat-photo-form\" to your <code>form</code> element.')"
       ],
       "challengeSeed": [
         "fccss",
@@ -190,7 +191,8 @@
 
       ],
       "tests": [
-
+        "assert($('#cat-photo-form') && $('#cat-photo-form').hasClass('animated') && $('#cat-photo-form').hasClass('pulse'), 'Select the element with the <code>id</code> of \"cat-photo-form\" and use the jQuery <code>addClass()</code> function to give it the classes of \"animated\" and \"pulse\".')",
+        "assert(!editor.match(/class.*animated/g), 'Only use jQuery to add these classes to the element.')"
       ],
       "challengeSeed": [
         "fccss",
diff --git a/views/coursewares/showHTML.jade b/views/coursewares/showHTML.jade
index 56cc0fbc80..88e8ed7f72 100644
--- a/views/coursewares/showHTML.jade
+++ b/views/coursewares/showHTML.jade
@@ -28,10 +28,12 @@ block content
                             h4.text-center.negative-10= name
                             .bonfire-instructions
                                 for sentence in details
-                                    p.wrappable.!= sentence
+                                    p.wrappable.negative-10!= sentence
                                 .negative-bottom-margin-30
                 if (user)
-                    a.btn.btn-primary.btn-sm.btn-block.negative-10#next-courseware-button Go to my next challenge (ctrl + enter)
+                    label.btn.btn-primary.btn-block.negative-10#next-courseware-button
+                        .ion-checkmark-circled
+                            | &nbsp; Go to my next challenge (ctrl + enter)
 
                     if (user.sentSlackInvite)
                         .button-spacer
@@ -46,7 +48,7 @@ block content
                     script.
                         var userLoggedIn = true;
                 else
-                    a.btn.signup-btn.btn-block.btn-sm.btn-block.negative-15(href='/login') Sign in so you can save your progress
+                    a.btn.signup-btn.btn-block.btn-block.negative-15(href='/login') Sign in so you can save your progress
                         script.
                             var userLoggedIn = false;
                 .button-spacer