From ed9e89b51f05c0ffd8cb160a17b601d251f69eff Mon Sep 17 00:00:00 2001
From: Berkeley Martinez <Berkeley@robotie.com>
Date: Thu, 27 Aug 2015 11:23:17 -0700
Subject: [PATCH] super lint commonFramework

---
 client/commonFramework.js | 669 ++++++++++++++++++++------------------
 1 file changed, 360 insertions(+), 309 deletions(-)

diff --git a/client/commonFramework.js b/client/commonFramework.js
index 88793bf3a5..8545d542f9 100644
--- a/client/commonFramework.js
+++ b/client/commonFramework.js
@@ -1,4 +1,4 @@
-/* globals CodeMirror, challenge_Name, challengeType */
+/* globals CodeMirror, challenge_Id, challenge_Name, challengeType */
 // codeStorage
 var codeStorageFactory = (function($, localStorage) {
 
@@ -74,6 +74,13 @@ function replaceSafeTags(value) {
     .replace(/fcces/gi, '</script>');
 }
 
+var BDDregex = new RegExp(
+  '(expect(\s+)?\(.*\;)|' +
+  '(assert(\s+)?\(.*\;)|' +
+  '(assert\.\w.*\;)|' +
+  '(.*\.should\..*\;)'
+);
+
 var isInitRun = false;
 var initPreview = true;
 var editor;
@@ -144,19 +151,13 @@ var libraryIncludes = "<script src='//ajax.googleapis.com/ajax/libs/jquery/2.1.3
     "<link rel='stylesheet' href='//cdnjs.cloudflare.com/ajax/libs/animate.css/3.2.0/animate.min.css'/>" +
     "<link rel='stylesheet' href='//maxcdn.bootstrapcdn.com/bootstrap/3.3.1/css/bootstrap.min.css'/>" +
     "<link rel='stylesheet' href='//maxcdn.bootstrapcdn.com/font-awesome/4.2.0/css/font-awesome.min.css'/>" +
-    "<style>body { padding: 0px 3px 0px 3px; }</style>" +
-    "<script>var expect = chai.expect; var should = chai.should(); var assert = chai.assert;</script>";
+    '<style>body { padding: 0px 3px 0px 3px; }</style>' +
+    '<script>var expect = chai.expect; var should = chai.should(); var assert = chai.assert;</script>';
 
 var editorValueForIFrame;
 var iFrameScript = "<script src='/js/iFrameScripts.js'></script>";
 var delay;
 
-// Initialize CodeMirror editor with a nice html5 canvas demo.
-editor.on('keyup', function() {
-  clearTimeout(delay);
-  delay = setTimeout(updatePreview, 300);
-});
-
 function workerError(error) {
   var display = $('.runTimeError');
   var housing = $('#testSuite');
@@ -185,157 +186,184 @@ function scopejQuery(str) {
 }
 
 function safeHTMLRun(test) {
-    if(challengeType === "0"){
-        var previewFrame = document.getElementById('preview');
-        var preview = previewFrame.contentDocument || previewFrame.contentWindow.document;
-        if(editor.getValue().match(/\<script\>/gi) !== null) {
-            var s = editor.getValue().split(/\<\s?script\s?\>/gi)[1].split(/\<\s?\/\s?script\s?\>/gi)[0];
-            s = "var document = \"\"; var $ = function(){return(new function(){this.add=function(){return(this);};this.addBack=function(){return(this);};this.addClass=function(){return(this);};this.after=function(){return(this);};this.ajaxComplete=function(){return(this);};this.ajaxError=function(){return(this);};this.ajaxSend=function(){return(this);};this.ajaxStart=function(){return(this);};this.ajaxStop=function(){return(this);};this.ajaxSuccess=function(){return(this);};this.andSelf=function(){return(this);};this.animate=function(){return(this);};this.append=function(){return(this);};this.appendTo=function(){return(this);};this.attr=function(){return(this);};this.before=function(){return(this);};this.bind=function(){return(this);};this.blur=function(){return(this);};this.callbacksadd=function(){return(this);};this.callbacksdisable=function(){return(this);};this.callbacksdisabled=function(){return(this);};this.callbacksempty=function(){return(this);};this.callbacksfire=function(){return(this);};this.callbacksfired=function(){return(this);};this.callbacksfireWith=function(){return(this);};this.callbackshas=function(){return(this);};this.callbackslock=function(){return(this);};this.callbackslocked=function(){return(this);};this.callbacksremove=function(){return(this);};this.change=function(){return(this);};this.children=function(){return(this);};this.clearQueue=function(){return(this);};this.click=function(){return(this);};this.clone=function(){return(this);};this.closest=function(){return(this);};this.contents=function(){return(this);};this.context=function(){return(this);};this.css=function(){return(this);};this.data=function(){return(this);};this.dblclick=function(){return(this);};this.delay=function(){return(this);};this.delegate=function(){return(this);};this.dequeue=function(){return(this);};this.detach=function(){return(this);};this.die=function(){return(this);};this.each=function(){return(this);};this.empty=function(){return(this);};this.end=function(){return(this);};this.eq=function(){return(this);};this.error=function(){return(this);};this.fadeIn=function(){return(this);};this.fadeOut=function(){return(this);};this.fadeTo=function(){return(this);};this.fadeToggle=function(){return(this);};this.filter=function(){return(this);};this.find=function(){return(this);};this.finish=function(){return(this);};this.first=function(){return(this);};this.focus=function(){return(this);};this.focusin=function(){return(this);};this.focusout=function(){return(this);};this.get=function(){return(this);};this.has=function(){return(this);};this.hasClass=function(){return(this);};this.height=function(){return(this);};this.hide=function(){return(this);};this.hover=function(){return(this);};this.html=function(){return(this);};this.index=function(){return(this);};this.innerHeight=function(){return(this);};this.innerWidth=function(){return(this);};this.insertAfter=function(){return(this);};this.insertBefore=function(){return(this);};this.is=function(){return(this);};this.jQuery=function(){return(this);};this.jquery=function(){return(this);};this.keydown=function(){return(this);};this.keypress=function(){return(this);};this.keyup=function(){return(this);};this.last=function(){return(this);};this.length=function(){return(this);};this.live=function(){return(this);};this.load=function(){return(this);};this.load=function(){return(this);};this.map=function(){return(this);};this.mousedown=function(){return(this);};this.mouseenter=function(){return(this);};this.mouseleave=function(){return(this);};this.mousemove=function(){return(this);};this.mouseout=function(){return(this);};this.mouseover=function(){return(this);};this.mouseup=function(){return(this);};this.next=function(){return(this);};this.nextAll=function(){return(this);};this.nextUntil=function(){return(this);};this.not=function(){return(this);};this.off=function(){return(this);};this.offset=function(){return(this);};this.offsetParent=function(){return(this);};this.on=function(){return(this);};this.one=function(){return(this);};this.outerHeight=function(){return(this);};this.outerWidth=function(){return(this);};this.parent=function(){return(this);};this.parents=function(){return(this);};this.parentsUntil=function(){return(this);};this.position=function(){return(this);};this.prepend=function(){return(this);};this.prependTo=function(){return(this);};this.prev=function(){return(this);};this.prevAll=function(){return(this);};this.prevUntil=function(){return(this);};this.promise=function(){return(this);};this.prop=function(){return(this);};this.pushStack=function(){return(this);};this.queue=function(){return(this);};this.ready=function(){return(this);};this.remove=function(){return(this);};this.removeAttr=function(){return(this);};this.removeClass=function(){return(this);};this.removeData=function(){return(this);};this.removeProp=function(){return(this);};this.replaceAll=function(){return(this);};this.replaceWith=function(){return(this);};this.resize=function(){return(this);};this.scroll=function(){return(this);};this.scrollLeft=function(){return(this);};this.scrollTop=function(){return(this);};this.select=function(){return(this);};this.selector=function(){return(this);};this.serialize=function(){return(this);};this.serializeArray=function(){return(this);};this.show=function(){return(this);};this.siblings=function(){return(this);};this.size=function(){return(this);};this.slice=function(){return(this);};this.slideDown=function(){return(this);};this.slideToggle=function(){return(this);};this.slideUp=function(){return(this);};this.stop=function(){return(this);};this.submit=function(){return(this);};this.text=function(){return(this);};this.toArray=function(){return(this);};this.toggle=function(){return(this);};this.toggle=function(){return(this);};this.toggleClass=function(){return(this);};this.trigger=function(){return(this);};this.triggerHandler=function(){return(this);};this.unbind=function(){return(this);};this.undelegate=function(){return(this);};this.unload=function(){return(this);};this.unwrap=function(){return(this);};this.val=function(){return(this);};this.width=function(){return(this);};this.wrap=function(){return(this);};this.wrapAll=function(){return(this);};this.wrapInner=function(){return(this);}});};$.ajax=function(){return($);};$.ajaxPrefilter=function(){return($);};$.ajaxSetup=function(){return($);};$.ajaxTransport=function(){return($);};$.boxModel=function(){return($);};$.browser=function(){return($);};$.Callbacks=function(){return($);};$.contains=function(){return($);};$.cssHooks=function(){return($);};$.cssNumber=function(){return($);};$.data=function(){return($);};$.Deferred=function(){return($);};$.dequeue=function(){return($);};$.each=function(){return($);};$.error=function(){return($);};$.extend=function(){return($);};$.fnextend=function(){return($);};$.fxinterval=function(){return($);};$.fxoff=function(){return($);};$.get=function(){return($);};$.getJSON=function(){return($);};$.getScript=function(){return($);};$.globalEval=function(){return($);};$.grep=function(){return($);};$.hasData=function(){return($);};$.holdReady=function(){return($);};$.inArray=function(){return($);};$.isArray=function(){return($);};$.isEmptyObject=function(){return($);};$.isFunction=function(){return($);};$.isNumeric=function(){return($);};$.isPlainObject=function(){return($);};$.isWindow=function(){return($);};$.isXMLDoc=function(){return($);};$.makeArray=function(){return($);};$.map=function(){return($);};$.merge=function(){return($);};$.noConflict=function(){return($);};$.noop=function(){return($);};$.now=function(){return($);};$.param=function(){return($);};$.parseHTML=function(){return($);};$.parseJSON=function(){return($);};$.parseXML=function(){return($);};$.post=function(){return($);};$.proxy=function(){return($);};$.queue=function(){return($);};$.removeData=function(){return($);};$.sub=function(){return($);};$.support=function(){return($);};$.trim=function(){return($);};$.type=function(){return($);};$.unique=function(){return($);};$.when=function(){return($);};$.always=function(){return($);};$.done=function(){return($);};$.fail=function(){return($);};$.isRejected=function(){return($);};$.isResolved=function(){return($);};$.notify=function(){return($);};$.notifyWith=function(){return($);};$.pipe=function(){return($);};$.progress=function(){return($);};$.promise=function(){return($);};$.reject=function(){return($);};$.rejectWith=function(){return($);};$.resolve=function(){return($);};$.resolveWith=function(){return($);};$.state=function(){return($);};$.then=function(){return($);};$.currentTarget=function(){return($);};$.data=function(){return($);};$.delegateTarget=function(){return($);};$.isDefaultPrevented=function(){return($);};$.isImmediatePropagationStopped=function(){return($);};$.isPropagationStopped=function(){return($);};$.metaKey=function(){return($);};$.namespace=function(){return($);};$.pageX=function(){return($);};$.pageY=function(){return($);};$.preventDefault=function(){return($);};$.relatedTarget=function(){return($);};$.result=function(){return($);};$.stopImmediatePropagation=function(){return($);};$.stopPropagation=function(){return($);};$.target=function(){return($);};$.timeStamp=function(){return($);};$.type=function(){return($);};$.which=function(){return($);};"+s;
-            submit(
-                scopejQuery(s), function (cls, message) {
-                    if (cls) {
-                        console.log(message.error);
-                        workerError(message.error);
-                    } else {
-                        if(test){
-                            preview.open();
-                            preview.write(libraryIncludes + editor.getValue() + iFrameScript);
-                            codeStorage.updateStorage();
-                            preview.close();
-                        }
-                        else{
-                            preview.open();
-                            preview.write(libraryIncludes + editor.getValue());
-                            codeStorage.updateStorage();
-                            preview.close();
-                        }
-                    }
-                }
-            );
+  if (challengeType === '0') {
+    var previewFrame = document.getElementById('preview');
+    var preview = previewFrame.contentDocument || previewFrame.contentWindow.document;
+    if (editor.getValue().match(/\<script\>/gi) !== null) {
+      var s = editor
+        .getValue()
+        .split(/\<\s?script\s?\>/gi)[1]
+        .split(/\<\s?\/\s?script\s?\>/gi)[0];
 
+        // add feuxQuery
+      s = "var document = \"\"; var $ = function() {return(new function() {this.add=function() {return(this);};this.addBack=function() {return(this);};this.addClass=function() {return(this);};this.after=function() {return(this);};this.ajaxComplete=function() {return(this);};this.ajaxError=function() {return(this);};this.ajaxSend=function() {return(this);};this.ajaxStart=function() {return(this);};this.ajaxStop=function() {return(this);};this.ajaxSuccess=function() {return(this);};this.andSelf=function() {return(this);};this.animate=function() {return(this);};this.append=function() {return(this);};this.appendTo=function() {return(this);};this.attr=function() {return(this);};this.before=function() {return(this);};this.bind=function() {return(this);};this.blur=function() {return(this);};this.callbacksadd=function() {return(this);};this.callbacksdisable=function() {return(this);};this.callbacksdisabled=function() {return(this);};this.callbacksempty=function() {return(this);};this.callbacksfire=function() {return(this);};this.callbacksfired=function() {return(this);};this.callbacksfireWith=function() {return(this);};this.callbackshas=function() {return(this);};this.callbackslock=function() {return(this);};this.callbackslocked=function() {return(this);};this.callbacksremove=function() {return(this);};this.change=function() {return(this);};this.children=function() {return(this);};this.clearQueue=function() {return(this);};this.click=function() {return(this);};this.clone=function() {return(this);};this.closest=function() {return(this);};this.contents=function() {return(this);};this.context=function() {return(this);};this.css=function() {return(this);};this.data=function() {return(this);};this.dblclick=function() {return(this);};this.delay=function() {return(this);};this.delegate=function() {return(this);};this.dequeue=function() {return(this);};this.detach=function() {return(this);};this.die=function() {return(this);};this.each=function() {return(this);};this.empty=function() {return(this);};this.end=function() {return(this);};this.eq=function() {return(this);};this.error=function() {return(this);};this.fadeIn=function() {return(this);};this.fadeOut=function() {return(this);};this.fadeTo=function() {return(this);};this.fadeToggle=function() {return(this);};this.filter=function() {return(this);};this.find=function() {return(this);};this.finish=function() {return(this);};this.first=function() {return(this);};this.focus=function() {return(this);};this.focusin=function() {return(this);};this.focusout=function() {return(this);};this.get=function() {return(this);};this.has=function() {return(this);};this.hasClass=function() {return(this);};this.height=function() {return(this);};this.hide=function() {return(this);};this.hover=function() {return(this);};this.html=function() {return(this);};this.index=function() {return(this);};this.innerHeight=function() {return(this);};this.innerWidth=function() {return(this);};this.insertAfter=function() {return(this);};this.insertBefore=function() {return(this);};this.is=function() {return(this);};this.jQuery=function() {return(this);};this.jquery=function() {return(this);};this.keydown=function() {return(this);};this.keypress=function() {return(this);};this.keyup=function() {return(this);};this.last=function() {return(this);};this.length=function() {return(this);};this.live=function() {return(this);};this.load=function() {return(this);};this.load=function() {return(this);};this.map=function() {return(this);};this.mousedown=function() {return(this);};this.mouseenter=function() {return(this);};this.mouseleave=function() {return(this);};this.mousemove=function() {return(this);};this.mouseout=function() {return(this);};this.mouseover=function() {return(this);};this.mouseup=function() {return(this);};this.next=function() {return(this);};this.nextAll=function() {return(this);};this.nextUntil=function() {return(this);};this.not=function() {return(this);};this.off=function() {return(this);};this.offset=function() {return(this);};this.offsetParent=function() {return(this);};this.on=function() {return(this);};this.one=function() {return(this);};this.outerHeight=function() {return(this);};this.outerWidth=function() {return(this);};this.parent=function() {return(this);};this.parents=function() {return(this);};this.parentsUntil=function() {return(this);};this.position=function() {return(this);};this.prepend=function() {return(this);};this.prependTo=function() {return(this);};this.prev=function() {return(this);};this.prevAll=function() {return(this);};this.prevUntil=function() {return(this);};this.promise=function() {return(this);};this.prop=function() {return(this);};this.pushStack=function() {return(this);};this.queue=function() {return(this);};this.ready=function() {return(this);};this.remove=function() {return(this);};this.removeAttr=function() {return(this);};this.removeClass=function() {return(this);};this.removeData=function() {return(this);};this.removeProp=function() {return(this);};this.replaceAll=function() {return(this);};this.replaceWith=function() {return(this);};this.resize=function() {return(this);};this.scroll=function() {return(this);};this.scrollLeft=function() {return(this);};this.scrollTop=function() {return(this);};this.select=function() {return(this);};this.selector=function() {return(this);};this.serialize=function() {return(this);};this.serializeArray=function() {return(this);};this.show=function() {return(this);};this.siblings=function() {return(this);};this.size=function() {return(this);};this.slice=function() {return(this);};this.slideDown=function() {return(this);};this.slideToggle=function() {return(this);};this.slideUp=function() {return(this);};this.stop=function() {return(this);};this.submit=function() {return(this);};this.text=function() {return(this);};this.toArray=function() {return(this);};this.toggle=function() {return(this);};this.toggle=function() {return(this);};this.toggleClass=function() {return(this);};this.trigger=function() {return(this);};this.triggerHandler=function() {return(this);};this.unbind=function() {return(this);};this.undelegate=function() {return(this);};this.unload=function() {return(this);};this.unwrap=function() {return(this);};this.val=function() {return(this);};this.width=function() {return(this);};this.wrap=function() {return(this);};this.wrapAll=function() {return(this);};this.wrapInner=function() {return(this);}});};$.ajax=function() {return($);};$.ajaxPrefilter=function() {return($);};$.ajaxSetup=function() {return($);};$.ajaxTransport=function() {return($);};$.boxModel=function() {return($);};$.browser=function() {return($);};$.Callbacks=function() {return($);};$.contains=function() {return($);};$.cssHooks=function() {return($);};$.cssNumber=function() {return($);};$.data=function() {return($);};$.Deferred=function() {return($);};$.dequeue=function() {return($);};$.each=function() {return($);};$.error=function() {return($);};$.extend=function() {return($);};$.fnextend=function() {return($);};$.fxinterval=function() {return($);};$.fxoff=function() {return($);};$.get=function() {return($);};$.getJSON=function() {return($);};$.getScript=function() {return($);};$.globalEval=function() {return($);};$.grep=function() {return($);};$.hasData=function() {return($);};$.holdReady=function() {return($);};$.inArray=function() {return($);};$.isArray=function() {return($);};$.isEmptyObject=function() {return($);};$.isFunction=function() {return($);};$.isNumeric=function() {return($);};$.isPlainObject=function() {return($);};$.isWindow=function() {return($);};$.isXMLDoc=function() {return($);};$.makeArray=function() {return($);};$.map=function() {return($);};$.merge=function() {return($);};$.noConflict=function() {return($);};$.noop=function() {return($);};$.now=function() {return($);};$.param=function() {return($);};$.parseHTML=function() {return($);};$.parseJSON=function() {return($);};$.parseXML=function() {return($);};$.post=function() {return($);};$.proxy=function() {return($);};$.queue=function() {return($);};$.removeData=function() {return($);};$.sub=function() {return($);};$.support=function() {return($);};$.trim=function() {return($);};$.type=function() {return($);};$.unique=function() {return($);};$.when=function() {return($);};$.always=function() {return($);};$.done=function() {return($);};$.fail=function() {return($);};$.isRejected=function() {return($);};$.isResolved=function() {return($);};$.notify=function() {return($);};$.notifyWith=function() {return($);};$.pipe=function() {return($);};$.progress=function() {return($);};$.promise=function() {return($);};$.reject=function() {return($);};$.rejectWith=function() {return($);};$.resolve=function() {return($);};$.resolveWith=function() {return($);};$.state=function() {return($);};$.then=function() {return($);};$.currentTarget=function() {return($);};$.data=function() {return($);};$.delegateTarget=function() {return($);};$.isDefaultPrevented=function() {return($);};$.isImmediatePropagationStopped=function() {return($);};$.isPropagationStopped=function() {return($);};$.metaKey=function() {return($);};$.namespace=function() {return($);};$.pageX=function() {return($);};$.pageY=function() {return($);};$.preventDefault=function() {return($);};$.relatedTarget=function() {return($);};$.result=function() {return($);};$.stopImmediatePropagation=function() {return($);};$.stopPropagation=function() {return($);};$.target=function() {return($);};$.timeStamp=function() {return($);};$.type=function() {return($);};$.which=function() {return($);};" + s;
+
+      submit(scopejQuery(s), function(cls, message) {
+        if (cls) {
+          console.log(message.error);
+          workerError(message.error);
+        } else if (test) {
+          preview.open();
+          preview.write(libraryIncludes + editor.getValue() + iFrameScript);
+          codeStorage.updateStorage();
+          preview.close();
+        } else {
+          preview.open();
+          preview.write(libraryIncludes + editor.getValue());
+          codeStorage.updateStorage();
+          preview.close();
         }
-        else {
-            if(test){
-                preview.open();
-                preview.write(libraryIncludes + editor.getValue() +iFrameScript);
-                codeStorage.updateStorage();
-                preview.close();
-            }
-            else{
-                preview.open();
-                preview.write(libraryIncludes + editor.getValue());
-                codeStorage.updateStorage();
-                preview.close();
-            }
-        }
+      });
+    } else if (test) {
+      preview.open();
+      preview.write(libraryIncludes + editor.getValue() + iFrameScript);
+      codeStorage.updateStorage();
+      preview.close();
+    } else {
+      preview.open();
+      preview.write(libraryIncludes + editor.getValue());
+      codeStorage.updateStorage();
+      preview.close();
     }
+  }
 }
 
-if(typeof prodOrDev !== 'undefined') {
-    var nodeEnv = prodOrDev === 'production' ? 'http://www.freecodecamp.com' : 'http://localhost:3001';
-    if(challengeType === "0")
-    {
-        function updatePreview() {
-            editorValueForIFrame = editor.getValue();
-            var failedCommentTest = false;
-            if (editorValueForIFrame.match(/\<\!\-\-/gi) && editorValueForIFrame.match(/\-\-\>/gi) == null) {
-                failedCommentTest = true;
-            }
-            else if (editorValueForIFrame.match(/\<\!\-\-/gi) && editorValueForIFrame.match(/\<\!\-\-/gi).length > editorValueForIFrame.match(/\-\-\>/gi).length) {
-                failedCommentTest = true;
-            }
-            if (failedCommentTest) {
-                editor.setValue(editor.getValue() + "-->");
-                editorValueForIFrame = editorValueForIFrame + "-->";
-            }
-            if(!editor.getValue().match(/\$\s*?\(\s*?\$\s*?\)/gi)){
-                safeHTMLRun(false);
-            }
-            else{
-                workerError("Unsafe $($)");
-            }
-        }
+function updatePreview() {
+  editorValueForIFrame = editor.getValue();
+  var failedCommentTest = false;
+  if (
+    editorValueForIFrame.match(/\<\!\-\-/gi) &&
+    editorValueForIFrame.match(/\-\-\>/gi) == null
+  ) {
+    failedCommentTest = true;
+  } else if (
+    editorValueForIFrame.match(/\<\!\-\-/gi) &&
+    editorValueForIFrame.match(/\<\!\-\-/gi).length > editorValueForIFrame.match(/\-\-\>/gi).length
+  ) {
+    failedCommentTest = true;
+  }
 
-        setTimeout(updatePreview, 300);
-    }
+  if (failedCommentTest) {
+    editor.setValue(editor.getValue() + '-->');
+    editorValueForIFrame = editorValueForIFrame + '-->';
+  }
+
+  if (!editor.getValue().match(/\$\s*?\(\s*?\$\s*?\)/gi)) {
+    safeHTMLRun(false);
+  } else {
+    workerError('Unsafe $($)');
+  }
 }
+
+if (typeof prodOrDev !== 'undefined') {
+
+  var nodeEnv = prodOrDev === 'production' ?
+    'http://www.freecodecamp.com' :
+    'http://localhost:3001';
+
+  if (challengeType === '0') {
+    setTimeout(updatePreview, 300);
+  }
+}
+
+// Initialize CodeMirror editor with a nice html5 canvas demo.
+editor.on('keyup', function() {
+  clearTimeout(delay);
+  delay = setTimeout(updatePreview, 300);
+});
+
 /**
  * "post" methods
  */
 
 var testResults = [];
 var postSuccess = function(data) {
-    var testDoc = document.createElement("div");
-    $(testDoc)
-        .html("<div class='row'><div class='col-xs-2 text-center'><i class='ion-checkmark-circled big-success-icon'></i></div><div class='col-xs-10 test-output test-vertical-center wrappable'>" + JSON.parse(data) + "</div>");
-    $('#testSuite').append(testDoc);
-    testSuccess();
+  var testDoc = document.createElement('div');
+  $(testDoc).html(
+    "<div class='row'><div class='col-xs-2 text-center'><i class='ion-checkmark-circled big-success-icon'></i></div><div class='col-xs-10 test-output test-vertical-center wrappable'>" +
+    JSON.parse(data) +
+    '</div>'
+  );
+
+  $('#testSuite').append(testDoc);
+  testSuccess();
 };
 
 var postError = function(data) {
-    var testDoc = document.createElement("div");
-    $(testDoc)
-        .html("<div class='row'><div class='col-xs-2 text-center'><i class='ion-close-circled big-error-icon'></i></div><div class='col-xs-10 test-vertical-center test-output wrappable'>" + JSON.parse(data) + "</div>");
-    $('#testSuite').append(testDoc);
+  var testDoc = document.createElement('div');
+
+  $(testDoc).html(
+    "<div class='row'><div class='col-xs-2 text-center'><i class='ion-close-circled big-error-icon'></i></div><div class='col-xs-10 test-vertical-center test-output wrappable'>" +
+    JSON.parse(data) +
+    '</div>'
+  );
+
+  $('#testSuite').append(testDoc);
 };
+
 var goodTests = 0;
 var testSuccess = function() {
-    goodTests++;
-    if (goodTests === tests.length) {
-        showCompletion();
-    }
+  goodTests++;
+  if (goodTests === tests.length) {
+    showCompletion();
+  }
 };
 
 function showCompletion() {
-    if (isInitRun) {
-      isInitRun = false;
-      return;
-    }
-    var time = Math.floor(Date.now()) - started;
-    ga('send', 'event', 'Challenge', 'solved', challenge_Name + ', Time: ' + time +
-        ', Attempts: ' + attempts);
-    var bonfireSolution = myCodeMirror.getValue();
-    var didCompleteWith = $('#completed-with').val() || null;
-    $('#complete-courseware-dialog').modal('show');
-    $('#submit-challenge').click(function(e) {
-      e.preventDefault();
+  if (isInitRun) {
+    isInitRun = false;
+    return;
+  }
+  var time = Math.floor(Date.now()) - started;
+  ga(
+    'send',
+    'event',
+    'Challenge',
+    'solved',
+    challenge_Name + ', Time: ' + time + ', Attempts: ' + attempts
+  );
+  var bonfireSolution = myCodeMirror.getValue();
+  var didCompleteWith = $('#completed-with').val() || null;
+  $('#complete-courseware-dialog').modal('show');
+  $('#submit-challenge').click(function(e) {
+    e.preventDefault();
 
-      $('#submit-challenge')
-        .attr('disabled', 'true')
-        .removeClass('btn-primary')
-        .addClass('btn-warning disabled');
+    $('#submit-challenge')
+      .attr('disabled', 'true')
+      .removeClass('btn-primary')
+      .addClass('btn-warning disabled');
 
-      var $checkmarkContainer = $('#checkmark-container');
-      $checkmarkContainer.css({ height: $checkmarkContainer.innerHeight() });
+    var $checkmarkContainer = $('#checkmark-container');
+    $checkmarkContainer.css({ height: $checkmarkContainer.innerHeight() });
 
-      $('#challenge-checkmark')
-        .addClass('zoomOutUp')
-        // .removeClass('zoomInDown')
-        .delay(1000)
-        .queue(function(next) {
-          $(this).replaceWith(
-            '<div id="challenge-spinner" class="animated zoomInUp inner-circles-loader">submitting...</div>'
-          );
-          next();
-        });
+    $('#challenge-checkmark')
+      .addClass('zoomOutUp')
+      // .removeClass('zoomInDown')
+      .delay(1000)
+      .queue(function(next) {
+        $(this).replaceWith(
+          '<div id="challenge-spinner" class="animated zoomInUp inner-circles-loader">submitting...</div>'
+        );
+        next();
+      });
 
-      $.post(
-        '/completed-bonfire/', {
-          challengeInfo: {
-            challengeId: challenge_Id,
-            challengeName: challenge_Name,
-            completedWith: didCompleteWith,
-            challengeType: challengeType,
-            solution: bonfireSolution
-          }
-        },
-        function(res) {
-          if (res) {
-            window.location = '/challenges/next-challenge';
-          }
+    $.post(
+      '/completed-bonfire/', {
+        challengeInfo: {
+          challengeId: challenge_Id,
+          challengeName: challenge_Name,
+          completedWith: didCompleteWith,
+          challengeType: challengeType,
+          solution: bonfireSolution
         }
-      );
-    });
+      },
+      function(res) {
+        if (res) {
+          window.location = '/challenges/next-challenge';
+        }
+      }
+    );
+  });
 }
 
 var resetEditor = function resetEditor() {
@@ -366,16 +394,19 @@ if (challengeType !== '0') {
   ' * Your output will go here.\n' + ' * Console.log() -type statements\n' +
   ' * will appear in your browser\'s\n' + ' * DevTools JavaScript console.\n' +
   ' */');
-  codeOutput.setSize("100%", "100%");
+  codeOutput.setSize('100%', '100%');
 }
 
 var info = editor.getScrollInfo();
+
 var after = editor.charCoords({
-    line: editor.getCursor().line + 1,
-    ch: 0
-}, "local").top;
-if (info.top + info.clientHeight < after)
-    editor.scrollTo(null, after - info.clientHeight + 3);
+  line: editor.getCursor().line + 1,
+  ch: 0
+}, 'local').top;
+
+if (info.top + info.clientHeight < after) {
+  editor.scrollTo(null, after - info.clientHeight + 3);
+}
 
 var userTests;
 var testSalt = Math.random();
@@ -383,34 +414,35 @@ var testSalt = Math.random();
 
 var scrapeTests = function(userJavaScript) {
 
-    // insert tests from mongo
-    for (var i = 0; i < tests.length; i++) {
-        userJavaScript += '\n' + tests[i];
+  // insert tests from mongo
+  for (var i = 0; i < tests.length; i++) {
+    userJavaScript += '\n' + tests[i];
+  }
+
+  var counter = 0;
+  var match = BDDregex.exec(userJavaScript);
+
+  while (match) {
+    var replacement = '//' + counter + testSalt;
+    userJavaScript = userJavaScript.substring(0, match.index) +
+      replacement +
+      userJavaScript.substring(match.index + match[0].length);
+
+    if (!userTests) {
+      userTests = [];
     }
 
-    var counter = 0;
-    var regex = new RegExp(
-        /(expect(\s+)?\(.*\;)|(assert(\s+)?\(.*\;)|(assert\.\w.*\;)|(.*\.should\..*\;)/
-    );
-    var match = regex.exec(userJavaScript);
-    while (match != null) {
-        var replacement = '//' + counter + testSalt;
-        userJavaScript = userJavaScript.substring(0, match.index) + replacement +
-            userJavaScript.substring(match.index + match[0].length);
+    userTests.push({
+      'text': match[0],
+      'line': counter,
+      'err': null
+    });
 
-        if (!userTests) {
-            userTests = [];
-        }
-        userTests.push({
-            "text": match[0],
-            "line": counter,
-            "err": null
-        });
-        counter++;
-        match = regex.exec(userJavaScript);
-    }
+    counter++;
+    match = BDDregex.exec(userJavaScript);
+  }
 
-    return userJavaScript;
+  return userJavaScript;
 };
 
 function removeComments(userJavaScript) {
@@ -424,28 +456,33 @@ function removeLogs(userJavaScript) {
 
 var pushed = false;
 var createTestDisplay = function() {
-    if (pushed) {
-        userTests.pop();
+  if (pushed) {
+    userTests.pop();
+  }
+  for (var i = 0; i < userTests.length; i++) {
+    var test = userTests[i];
+    var testDoc = document.createElement('div');
+
+    if (test.err) {
+      console.log('Should be displaying bad tests');
+
+      $(testDoc).html(
+        "<div class='row'><div class='col-xs-2 text-center'><i class='ion-close-circled big-error-icon'></i></div><div class='col-xs-10 test-output wrappable test-vertical-center grayed-out-test-output'>" +
+        test.text + "</div><div class='col-xs-10 test-output wrappable'>" +
+        test.err + "</div></div><div class='ten-pixel-break'/>"
+      )
+        .appendTo($('#testSuite'));
+
+    } else {
+
+      $(testDoc).html(
+        "<div class='row'><div class='col-xs-2 text-center'><i class='ion-checkmark-circled big-success-icon'></i></div><div class='col-xs-10 test-output test-vertical-center wrappable grayed-out-test-output'>" +
+        test.text +
+        "</div></div><div class='ten-pixel-break'/>"
+      )
+        .appendTo($('#testSuite'));
     }
-    for (var i = 0; i < userTests.length; i++) {
-        var test = userTests[i];
-        var testDoc = document.createElement("div");
-        if (test.err != null) {
-            console.log('Should be displaying bad tests');
-            $(testDoc)
-                .html(
-                "<div class='row'><div class='col-xs-2 text-center'><i class='ion-close-circled big-error-icon'></i></div><div class='col-xs-10 test-output wrappable test-vertical-center grayed-out-test-output'>" +
-                test.text + "</div><div class='col-xs-10 test-output wrappable'>" +
-                test.err + "</div></div><div class='ten-pixel-break'/>")
-                .appendTo($('#testSuite'));
-        } else {
-            $(testDoc)
-                .html(
-                "<div class='row'><div class='col-xs-2 text-center'><i class='ion-checkmark-circled big-success-icon'></i></div><div class='col-xs-10 test-output test-vertical-center wrappable grayed-out-test-output'>" +
-                test.text + "</div></div><div class='ten-pixel-break'/>")
-                .appendTo($('#testSuite'));
-        }
-    };
+  }
 };
 
 var expect = chai.expect;
@@ -454,148 +491,162 @@ var should = chai.should();
 
 
 var reassembleTest = function(test, data) {
-    var lineNum = test.line;
-    var regexp = new RegExp("\/\/" + lineNum + testSalt);
-    return data.input.replace(regexp, test.text);
+  var lineNum = test.line;
+  var regexp = new RegExp('\/\/' + lineNum + testSalt);
+  return data.input.replace(regexp, test.text);
 };
 
 var runTests = function(err, data) {
-    //userTests = userTests ? null : [];
-    var allTestsPassed = true;
-    pushed = false;
-    $('#testSuite').children().remove();
-    if (err && userTests.length > 0) {
-        userTests = [{
-            text: "Program Execution Failure",
-            err: "No user tests were run."
-        }];
-        createTestDisplay();
-    }
-    //Add blocks to test exploits here!
-    else if(editorValue.match(/if\s\(null\)\sconsole\.log\(1\);/gi)){
-        allTestsPassed = false;
-        userTests = [{
-            text: "Program Execution Failure",
-            err: "Invalid if (null) console.log(1); detected"
-        }];
-        createTestDisplay();
-    }
-    else if (userTests) {
-        userTests.push(false);
-        pushed = true;
-        userTests.forEach(function(chaiTestFromJSON, indexOfTestArray,
-                                   __testArray) {
-            try {
-                if (chaiTestFromJSON) {
-                    var output = eval(reassembleTest(chaiTestFromJSON, data));
-                }
-            } catch (error) {
-                allTestsPassed = false;
-                __testArray[indexOfTestArray].err = error.message;
-            } finally {
-                if (!chaiTestFromJSON) {
-                    createTestDisplay();
-                }
-            }
-        });
+  // userTests = userTests ? null : [];
+  var allTestsPassed = true;
+  pushed = false;
+  $('#testSuite').children().remove();
+  if (err && userTests.length > 0) {
+    userTests = [{
+      text: 'Program Execution Failure',
+      err: 'No user tests were run.'
+    }];
+    createTestDisplay();
 
-        if (allTestsPassed) {
-            allTestsPassed = false;
-            showCompletion();
+  // Add blocks to test exploits here!
+  } else if (editorValue.match(/if\s\(null\)\sconsole\.log\(1\);/gi)) {
+    allTestsPassed = false;
+    userTests = [{
+      text: 'Program Execution Failure',
+      err: 'Invalid if (null) console.log(1); detected'
+    }];
+    createTestDisplay();
+  } else if (userTests) {
+    userTests.push(false);
+    pushed = true;
+    userTests.forEach(function(
+      chaiTestFromJSON,
+      indexOfTestArray,
+      __testArray
+    ) {
+      try {
+        if (chaiTestFromJSON) {
+          var output = eval(reassembleTest(chaiTestFromJSON, data));
         }
+      } catch (error) {
+        allTestsPassed = false;
+        __testArray[indexOfTestArray].err = error.message;
+      } finally {
+        if (!chaiTestFromJSON) {
+          createTestDisplay();
+        }
+      }
+    });
+
+    if (allTestsPassed) {
+      allTestsPassed = false;
+      showCompletion();
     }
+  }
 };
 
-function bonfireExecute(test) {
-    initPreview = false;
-    goodTests = 0;
-    attempts++;
-    ga('send', 'event', 'Challenge', 'ran-code', challenge_Name);
-    userTests = null;
-    $('#testSuite').empty();
-    if(challengeType !== "0" && !editor.getValue().match(/\$\s*?\(\s*?\$\s*?\)/gi)){
-        var userJavaScript = myCodeMirror.getValue();
-        var failedCommentTest = false;
-        if (userJavaScript.match(/\/\*/gi) && userJavaScript.match(/\*\//gi) == null) {
-            failedCommentTest = true;
-        }
-        else if (!failedCommentTest && userJavaScript.match(/\/\*/gi) && userJavaScript.match(/\/\*/gi).length > userJavaScript.match(/\*\//gi).length) {
-            failedCommentTest = true;
-        }
-        userJavaScript = removeComments(userJavaScript);
-        userJavaScript = scrapeTests(userJavaScript);
-        // simple fix in case the user forgets to invoke their function
+function bonfireExecute(shouldTest) {
+  initPreview = false;
+  goodTests = 0;
+  attempts++;
+  ga('send', 'event', 'Challenge', 'ran-code', challenge_Name);
+  userTests = null;
+  $('#testSuite').empty();
 
-        if(userJavaScript.match(/function/gi)){
-            if(userJavaScript.match(/function\s*?\(|function\s+\w+\s*?\(/gi)){
+  if (
+    challengeType !== '0' &&
+    !editor.getValue().match(/\$\s*?\(\s*?\$\s*?\)/gi)
+  ) {
+    var userJavaScript = myCodeMirror.getValue();
+    var failedCommentTest = false;
 
-                submit(userJavaScript, function (cls, message) {
-                    if (failedCommentTest) {
-                        myCodeMirror.setValue(myCodeMirror.getValue() + "*/");
-                        console.log('Caught Unfinished Comment');
-                        codeOutput.setValue("Unfinished multi-line comment");
-                        failedCommentTest = false;
-                    }
-                    else if (cls) {
-                        codeOutput.setValue(message.error);
-                        if(test)
-                            runTests('Error', null);
-                    } else {
-                        codeOutput.setValue(message.output);
-                        codeOutput.setValue(codeOutput.getValue().replace(/\\\"/gi, ''));
-                        message.input = removeLogs(message.input);
-                        if(test)
-                            runTests(null, message);
-                    }
-                });
-            }
-            else{
-                codeOutput.setValue("Unsafe or Unfinished function declaration");
-            }
-        }
-        else{
-            submit(userJavaScript, function (cls, message) {
-                if (failedCommentTest) {
-                    myCodeMirror.setValue(myCodeMirror.getValue() + "*/");
-                    console.log('Caught Unfinished Comment');
-                    codeOutput.setValue("Unfinished mulit-line comment");
-                    failedCommentTest = false;
-                }
-                else if (cls) {
-                    codeOutput.setValue(message.error);
-                    if(test)
-                        runTests('Error', null);
-                } else {
-                    codeOutput.setValue(message.output);
-                    codeOutput.setValue(codeOutput.getValue().replace(/\\\"/gi, ''));
-                    message.input = removeLogs(message.input);
-                    if(test)
-                        runTests(null, message);
-                }
-            });
-        }
+    // checks if the number of opening comments(/*) matches the number of
+    // closing comments(*/)
+    if (
+      userJavaScript.match(/\/\*/gi) &&
+      userJavaScript.match(/\/\*/gi).length > userJavaScript.match(/\*\//gi).length
+    ) {
+      failedCommentTest = true;
     }
-    else {
-        editorValueForIFrame = editor.getValue();
+
+    userJavaScript = removeComments(userJavaScript);
+    userJavaScript = scrapeTests(userJavaScript);
+    // simple fix in case the user forgets to invoke their function
+
+    if (userJavaScript.match(/function/gi)) {
+      if (userJavaScript.match(/function\s*?\(|function\s+\w+\s*?\(/gi)) {
+        submit(userJavaScript, function(cls, message) {
+          if (failedCommentTest) {
+            myCodeMirror.setValue(myCodeMirror.getValue() + '*/');
+            console.log('Caught Unfinished Comment');
+            codeOutput.setValue('Unfinished multi-line comment');
+            failedCommentTest = false;
+          } else if (cls) {
+            codeOutput.setValue(message.error);
+            if (test) {
+              runTests('Error', null);
+            }
+          } else {
+            codeOutput.setValue(message.output);
+            codeOutput.setValue(codeOutput.getValue().replace(/\\\"/gi, ''));
+            message.input = removeLogs(message.input);
+            if (shouldTest) {
+              runTests(null, message);
+            }
+          }
+        });
+      } else {
+        codeOutput.setValue('Unsafe or unfinished function declaration');
+      }
+    } else {
+      submit(userJavaScript, function(cls, message) {
+
         if (failedCommentTest) {
-            editor.setValue(editor.getValue() + "-->");
-            editorValueForIFrame = editorValueForIFrame + "-->";
-        }
-        if(!editor.getValue().match(/\$\s*?\(\s*?\$\s*?\)/gi) && challengeType === "0") {
-            safeHTMLRun(test);
-        }
-        else{
-            workerError("Unsafe $($)");
+          myCodeMirror.setValue(myCodeMirror.getValue() + '*/');
+          console.log('Caught Unfinished Comment');
+          codeOutput.setValue('Unfinished mulit-line comment');
+          failedCommentTest = false;
+        } else if (cls) {
+          codeOutput.setValue(message.error);
+          if (shouldTest) {
+            runTests('Error', null);
+          }
+        } else {
+          codeOutput.setValue(message.output);
+          codeOutput.setValue(codeOutput.getValue().replace(/\\\"/gi, ''));
+          message.input = removeLogs(message.input);
+
+          if (shouldTest) {
+            runTests(null, message);
+          }
         }
+      });
     }
-    setTimeout(function() {
-      var $marginFix = $('.innerMarginFix');
-      $marginFix.css('min-height', $marginFix.height());
-    }, 1000);
+  } else {
+
+    editorValueForIFrame = editor.getValue();
+
+    if (failedCommentTest) {
+      editor.setValue(editor.getValue() + '-->');
+      editorValueForIFrame = editorValueForIFrame + '-->';
+    }
+    if (
+      !editor.getValue().match(/\$\s*?\(\s*?\$\s*?\)/gi) &&
+      challengeType === '0'
+    ) {
+      safeHTMLRun(test);
+    } else {
+      workerError('Unsafe $($)');
+    }
+  }
+  setTimeout(function() {
+    var $marginFix = $('.innerMarginFix');
+    $marginFix.css('min-height', $marginFix.height());
+  }, 1000);
 }
 
 $('#submitButton').on('click', function() {
-    bonfireExecute(true);
+  bonfireExecute(true);
 });
 
 $(document).ready(function() {