Upgrade to mocha-phantomjs-core 1.1.0 to fix a few bugs

nathanboktae · nathanboktae · commit 7f614b3c87a2 · 2015-09-20T23:52:09.000-07:00
diff --git a/bin/mocha-phantomjs b/bin/mocha-phantomjs
@@ -63,7 +63,7 @@ program
   .usage('[options] page')
   .option('-R, --reporter <name>',       'specify the reporter to use', 'spec')
   .option('-f, --file <filename>',       'specify the file to dump reporter output')
-  .option('-t, --timeout <timeout>',     'specify the test startup timeout to use', parseInt, 6000)
+  .option('-t, --timeout <timeout>',     'specify the test startup timeout to use', parseInt)
   .option('-g, --grep <pattern>',        'only run tests matching <pattern>')
   .option('-i, --invert',                'invert --grep matches')
   .option('-b, --bail',                  'exit on the first test failure')
@@ -106,7 +106,7 @@ var page     = function(){
 }();
 var config = JSON.stringify({
   hooks: program.hooks,
-  timeout: program.timeout,
+  timeout: program.timeout || 6000,
   cookies: cookies,
   headers: headers,
   settings: settings,
diff --git a/package.json b/package.json
@@ -37,7 +37,7 @@
   },
   "dependencies": {
     "phantomjs": "1.9.7-15",
-    "mocha-phantomjs-core": "< 2.0.0",
+    "mocha-phantomjs-core": "^1.1.0",
     "commander": "^2.8.1"
   },
   "devDependencies": {
diff --git a/test/mocha-phantomjs.coffee b/test/mocha-phantomjs.coffee
@@ -42,16 +42,15 @@ describe 'mocha-phantomjs', ->
     code.should.equal 1
     stderr.should.match /Unable to open file 'nonesuch'/
 
-  # https://github.com/nathanboktae/mocha-phantomjs-core/issues/5
-  xit 'returns a failure code when mocha fails to run any tests', ->
+  it 'returns a failure code when mocha fails to run any tests', ->
     { code, stderr } = yield run [fileURL('no-tests')]
     code.should.equal 1
-    stderr.should.match /Failed to run any tests/
+    stderr.should.match /mocha.run\(\) was called with no tests/
 
   it 'returns a failure code when mocha is not started in a timely manner', ->
     { code, stderr } = yield run ['-t', 500, fileURL('timeout')]
+    stderr.should.match /mocha.run\(\) was not called within 500ms of the page loading/
     code.should.not.equal 0
-    stderr.should.match /Failed to run any tests/
 
   it 'returns a failure code when there is a page error', ->
     { code, stderr } = yield run [fileURL('error')]
diff --git a/test/resource-errors.html b/test/resource-errors.html
@@ -9,12 +9,14 @@
   <body>
     <div id="mocha"></div>
     <script src="../node_modules/mocha/mocha.js"></script>
+    <script src="../node_modules/chai/chai.js"></script>
     <script>
-      mocha.ui('bdd');
-      mocha.reporter('html');
+      mocha.ui('bdd')
+      var expect = chai.expect
     </script>
+    <script src="lib/passing.js"></script>
     <script>
-      mocha.run();
+      mocha.run()
     </script>
   </body>
 </html>
diff --git a/test/timeout.html b/test/timeout.html
@@ -5,6 +5,11 @@
     <meta charset="utf-8">
   </head>
   <body>
+    <script src="../node_modules/chai/chai.js"></script>
+    <script src="../node_modules/mocha/mocha.js"></script>
+    <script> mocha.ui('bdd'); var expect = chai.expect</script>
+
+    <script src="lib/passing.js"></script>
   </body>
 </html>
 
