Merge pull request #1692 from vladikoff/removeNodeBlanket

Remove grunt-blanket-mocha I dig it. Travis is happy, local testing is happy. r+, thanks @vladikoff!
mozilla · Sep 23, 2014 · a71a577 · a71a577
2 parents ef29c38 + 4892bd3
commit a71a577
Show file tree

Hide file tree

Showing 7 changed files with 1,054 additions and 5,809 deletions.
diff --git a/app/tests/lib/helpers.js b/app/tests/lib/helpers.js
@@ -21,7 +21,7 @@ define([
     } else {
       var message =
           'Cannot check for focus - document does not have focus.\n' +
-          'If this is in PhantomJS, Travis-CI, Sauce Labs, or Opera, this is expected.\n' +
+          'If this is in Travis-CI, Sauce Labs, or Opera, this is expected.\n' +
           'Otherwise, try focusing the test document instead of \n' +
           'another window or dev tools.';
 

diff --git a/bower.json b/bower.json
@@ -10,6 +10,7 @@
     "html5shiv": "3.7.2",
     "jquery": "1.11.1",
     "mocha": "1.18.2",
+    "mocha-blanketjs-adapter": "1.0.0",
     "mustache": "0.7.3",
     "normalize-css": "2.1.3",
     "p": "https://github.com/rkatic/p.git#ce57958635f71376a4563ca1ae5820f6fbe1f956",

diff --git a/grunttasks/blanket_mocha.js b/grunttasks/blanket_mocha.js