Merge f5b9265 into ddc66ac

.travis.yml

@@ -6,11 +6,17 @@ node_js:
   - "0.11"
   - "iojs"
 
+branches:
+  only:
+    - master
+
 cache:
   directories:
     - node_modules
 
 script:
+  - mocha --version
+  - eslint --version
   - npm run cover
 
 after_script:

appveyor.yml

@@ -12,6 +12,10 @@ platform:
   - x86
   - x64
 
+branches:
+  only:
+    - master
+
 # Fix line endings in Windows. (runs before repo cloning)
 init:
   - git config --global core.autocrlf true
@@ -25,6 +29,8 @@ install:
 test_script:
   - node --version
   - npm --version
+  - mocha --version
+  - eslint --version
   - npm test
 
 # http://help.appveyor.com/discussions/questions/1310-delete-cache

lib/mocha/run.js

@@ -14,5 +14,5 @@ export default (lintTestFile, options) => {
   addCompilers(mochaCompilers, extensions);
   addFiles(mocha, mochaFiles, extensions, isMochaRecursive, lintTestFile);
 
-  mocha.run();
+  mocha.run(process.exit);
 };

test/acceptance/failure-test.js

@@ -15,7 +15,7 @@ describe('acceptance - failure', function() {
       '--eslint-args="**/*.js"',
       '--mocha-args="test/**/*-test.js"'
     ];
-    return run(args, workingDir).then(stdout => {
+    return run(args, workingDir).catch(stdout => {
       expect(stdout).to.contain(`${ok} this is my test`);
       expect(stdout).to.contain('my-file.js passes');
       expect(stdout).to.contain('my-test.js passes');

test/helpers/run.js

@@ -17,8 +17,13 @@ export default (args, workingDir) => {
         process.chdir(originalWorkingDir);
       }
 
-      if (stderr) {
+      let hasRuntimeError = stderr;
+      let hasTestError = err;
+
+      if (hasRuntimeError) {
         reject(stderr);
+      } else if (hasTestError) {
+        reject(stdout);
       } else {
         resolve(stdout);
       }

test/unit/mocha/run-test.js

@@ -62,6 +62,7 @@ describe('unit - mocha/run', function() {
   it('runs mocha', function() {
     run(null, {});
 
-    expect(mochaRun.args).to.deep.equal([[]]);
+    expect(mochaRun.args.length).to.equal(1);
+    expect(mochaRun.args[0].length).to.equal(1);
   });
 });