Merge pull request #5053 from ember-cli/test-fixes

test fixes
ember-cli · Nov 10, 2015 · caf7c16 · caf7c16
2 parents c6915f6 + 705c559
commit caf7c16
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 6 deletions.
diff --git a/tests/fixtures/dummy-project-outdated/package.json b/tests/fixtures/dummy-project-outdated/package.json
@@ -27,4 +27,4 @@
     "express": "^4.1.1",
     "glob": "^3.2.9"
   }
-}
+}
diff --git a/tests/unit/models/addon-test.js b/tests/unit/models/addon-test.js
@@ -83,6 +83,7 @@ describe('models/addon.js', function() {
         var addonPath;
         addon.addonJsFiles = function(_path) {
           addonPath = _path;
+          return _path;
         };
 
         var root = path.join(fixturePath, 'with-styles');

diff --git a/tests/unit/models/watcher-test.js b/tests/unit/models/watcher-test.js
@@ -115,7 +115,9 @@ describe('Watcher', function() {
         message: 'buildFailed'
       }));
 
-      var outs = ui.output.split(EOL);
+      expect(ui.output).to.equal('');
+
+      var outs = ui.errors.split(EOL);
 
       expect(outs[0]).to.equal(chalk.red('File: someFile'));
       expect(outs[1]).to.equal(chalk.red('buildFailed'));
@@ -128,7 +130,9 @@ describe('Watcher', function() {
         message: 'buildFailed'
       }));
 
-      var outs = ui.output.split(EOL);
+      expect(ui.output).to.eql('');
+
+      var outs = ui.errors.split(EOL);
 
       expect(outs[0]).to.equal(chalk.red('File: someFile (24)'));
       expect(outs[1]).to.equal(chalk.red('buildFailed'));
@@ -140,7 +144,10 @@ describe('Watcher', function() {
         col: 80,
         message: 'buildFailed'
       }));
-      var outs = ui.output.split(EOL);
+
+      expect(ui.output).to.eql('');
+
+      var outs = ui.errors.split(EOL);
 
       expect(outs[0]).to.equal(chalk.red('File: someFile'));
       expect(outs[1]).to.equal(chalk.red('buildFailed'));
@@ -154,7 +161,9 @@ describe('Watcher', function() {
         message: 'buildFailed'
       }));
 
-      var outs = ui.output.split(EOL);
+      expect(ui.output).to.eql('');
+
+      var outs = ui.errors.split(EOL);
 
       expect(outs[0]).to.equal(chalk.red('File: someFile (24:80)'));
       expect(outs[1]).to.equal(chalk.red('buildFailed'));

diff --git a/tests/unit/tasks/server/express-server-test.js b/tests/unit/tasks/server/express-server-test.js
@@ -532,7 +532,7 @@ describe('express-server', function() {
               .get('/tests/test-file.txt')
               .set('accept', 'text/html')
               .expect(200)
-              .expect('some contents')
+              .expect(/some contents/)
               .expect('Content-Type', /text/)
               .end(function(err) {
                 if (err) {