From 99dcbd16e51c188554f5690462041285af136a9d Mon Sep 17 00:00:00 2001 From: Nathan Leniz Date: Thu, 22 Jan 2015 03:03:37 -0500 Subject: [PATCH] Adding should BDD to bonfire --- public/js/lib/bonfire/bonfireFramework.js | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/public/js/lib/bonfire/bonfireFramework.js b/public/js/lib/bonfire/bonfireFramework.js index e92455de1e..93518ca501 100644 --- a/public/js/lib/bonfire/bonfireFramework.js +++ b/public/js/lib/bonfire/bonfireFramework.js @@ -84,7 +84,7 @@ var testSalt = Math.random(); var scrapeTests = function(userJavaScript) { var counter = 0; - var regex = new RegExp(/(expect(\s+)?\(.*\;)|(assert(\s+)?\(.*\;)|(assert\.\w.*\;)/); + var regex = new RegExp(/(expect(\s+)?\(.*\;)|(assert(\s+)?\(.*\;)|(assert\.\w.*\;)|(.*\.should\..*\;)/); var match = regex.exec(userJavaScript); while (match != null) { var replacement = '//' + counter + testSalt; @@ -107,7 +107,8 @@ function removeComments(userJavaScript) { } function removeLogs(userJavaScript) { - return userJavaScript.replace(/(console\.[\w]+\s*\(.*\;)/g, ''); + //return userJavaScript.replace(/(console\.[\w]+\s*\(.*\;)/g, ''); + return userJavaScript; } $('#submitButton').on('click', function () { @@ -159,6 +160,8 @@ var createTestDisplay = function() { }; var assert = chai.assert; var expect = chai.expect; +var should = chai.should(); +console.log(should); var reassembleTest = function(test, data) { var lineNum = test.line; var regexp = new RegExp("\/\/" + lineNum + testSalt);