test: update e2e tests

Author: jkuri

tests/acceptance/generate-component.spec.js

@@ -10,6 +10,7 @@ var tmp = require('../helpers/tmp');
 var root = process.cwd();
 var conf = require('ember-cli/tests/helpers/conf');
 var Promise = require('ember-cli/lib/ext/promise');
+var SilentError = require('silent-error');
 
 describe('Acceptance: ng generate component', function () {
   before(conf.setup);
@@ -134,8 +135,9 @@ describe('Acceptance: ng generate component', function () {
 
   it('ng generate component ..' + path.sep + 'my-comp from root dir will fail', () => {
     return ng(['generate', 'component', '..' + path.sep + 'my-comp']).then(() => {
-      var testPath = path.join(root, 'tmp', 'foo', 'src', 'client', 'app', '..', 'my-comp', 'my-comp.component.ts');
-      expect(existsSync(testPath)).to.equal(false);
+      throw new SilentError(`ng generate component ..${path.sep}my-comp from root dir should fail.`);
+    }, (err) => {
+      expect(err).to.equal(`Invalid path: "..${path.sep}my-comp" cannot be above the "src${path.sep}client${path.sep}app" directory`);
     });
   });
 

tests/acceptance/generate-directive.spec.js

@@ -10,6 +10,7 @@ var tmp = require('../helpers/tmp');
 var root = process.cwd();
 var conf = require('ember-cli/tests/helpers/conf');
 var Promise = require('ember-cli/lib/ext/promise');
+var SilentError = require('silent-error');
 
 describe('Acceptance: ng generate directive', function () {
   before(conf.setup);
@@ -144,8 +145,9 @@ describe('Acceptance: ng generate directive', function () {
 
   it('ng generate directive ..' + path.sep + 'my-dir from root dir will fail', () => {
     return ng(['generate', 'directive', '..' + path.sep + 'my-dir']).then(() => {
-      var testPath = path.join(root, 'tmp', 'foo', 'src', 'client', 'app', '..', 'my-dir', 'my-dir.directive.ts');
-      expect(existsSync(testPath)).to.equal(false);
+      throw new SilentError(`ng generate directive ..${path.sep}my-dir from root dir should fail.`);
+    }, (err) => {
+      expect(err).to.equal(`Invalid path: "..${path.sep}my-dir" cannot be above the "src${path.sep}client${path.sep}app" directory`);
     });
   });
 });

tests/acceptance/generate-pipe.spec.js

@@ -10,6 +10,7 @@ var tmp = require('../helpers/tmp');
 var root = process.cwd();
 var conf = require('ember-cli/tests/helpers/conf');
 var Promise = require('ember-cli/lib/ext/promise');
+var SilentError = require('silent-error');
 
 describe('Acceptance: ng generate pipe', function () {
   before(conf.setup);
@@ -133,8 +134,9 @@ describe('Acceptance: ng generate pipe', function () {
 
   it('ng generate pipe ..' + path.sep + 'my-pipe from root dir will fail', () => {
     return ng(['generate', 'pipe', '..' + path.sep + 'my-pipe']).then(() => {
-      var testPath = path.join(root, 'tmp', 'foo', 'src', 'client', 'app', '..', 'my-pipe.pipe.ts');
-      expect(existsSync(testPath)).to.equal(false);
+      throw new SilentError(`ng generate pipe ..${path.sep}my-pipe from root dir should fail.`);
+    }, (err) => {
+      expect(err).to.equal(`Invalid path: "..${path.sep}my-pipe" cannot be above the "src${path.sep}client${path.sep}app" directory`);
     });
   });
 });

tests/acceptance/generate-service.spec.js

@@ -10,6 +10,7 @@ var tmp = require('../helpers/tmp');
 var root = process.cwd();
 var conf = require('ember-cli/tests/helpers/conf');
 var Promise = require('ember-cli/lib/ext/promise');
+var SilentError = require('silent-error');
 
 describe('Acceptance: ng generate service', function () {
   before(conf.setup);
@@ -136,8 +137,9 @@ describe('Acceptance: ng generate service', function () {
 
   it('ng generate service ..' + path.sep + 'my-svc from root dir will fail', () => {
     return ng(['generate', 'service', '..' + path.sep + 'my-svc']).then(() => {
-      var testPath = path.join(root, 'tmp', 'foo', 'src', 'client', 'app', '..', 'my-svc.service.ts');
-      expect(existsSync(testPath)).to.equal(false);
+      throw new SilentError(`ng generate service ..${path.sep}my-svc from root dir should fail.`);
+    }, (err) => {
+      expect(err).to.equal(`Invalid path: "..${path.sep}my-svc" cannot be above the "src${path.sep}client${path.sep}app" directory`);
     });
   });
 });

tests/acceptance/github-pages-deploy.spec.js

@@ -58,7 +58,10 @@ describe('Acceptance: ng github-pages:deploy', function() {
   it('should fail with uncommited changes', function() {
     execStub.addExecSuccess('git status --porcelain', 'M dir/file.ext');
     return ng(['github-pages:deploy', '--skip-build'])
-      .then((ret) => expect(ret).to.equal(1))
+      .catch((ret) => {
+        expect(ret.name).to.equal('SilentError');
+        expect(ret.isSilentError).to.equal(true);
+      });
   });
 
   it('should deploy with defaults to existing remote', function() {
@@ -226,7 +229,10 @@ describe('Acceptance: ng github-pages:deploy', function() {
 
     return ng(['github-pages:deploy', '--skip-build', `--gh-token=${token}`,
       `--gh-username=${username}`])
-      .then((ret) => expect(ret).to.equal(1))
+      .catch((ret) => {
+        expect(ret.name).to.equal('SilentError');
+        expect(ret.isSilentError).to.equal(true);
+      })
       .then(() => httpsStub.restore());
   });
 });

tests/acceptance/new.spec.js

@@ -13,6 +13,7 @@ var root = process.cwd();
 var util = require('util');
 var conf = require('ember-cli/tests/helpers/conf');
 var EOL = require('os').EOL;
+var SilentError = require('silent-error');
 
 describe('Acceptance: ng new', function () {
   before(conf.setup);
@@ -64,12 +65,12 @@ describe('Acceptance: ng new', function () {
     return ng(['new', 'foo', '--skip-npm', '--skip-bower']).then(confirmBlueprinted);
   });
 
-  it('ng new with empty app name doesnt throw exception', function () {
-    return ng(['new', '']);
+  it('ng new with empty app does throw exception', function () {
+    expect(ng(['new', ''])).to.throw;
   });
 
-  it('ng new without app name doesnt throw exception', function () {
-    return ng(['new']);
+  it('ng new without app name does throw exception', function () {
+    expect(ng(['new', ''])).to.throw;
   });
 
   it('ng new with app name creates new directory and has a dasherized package name', function () {
@@ -84,9 +85,11 @@ describe('Acceptance: ng new', function () {
   it('Cannot run ng new, inside of ember-cli project', function () {
     return ng(['new', 'foo', '--skip-npm', '--skip-bower', '--skip-git'])
       .then(function () {
-        return ng(['new', 'foo', '--skip-npm', '--skip-bower', '--skip-git']).then(function () {
+        return ng(['new', 'foo', '--skip-npm', '--skip-bower', '--skip-git']).then(() => {
+          throw new SilentError('Cannot run ng new, inside of ember-cli project should fail.');
+        }, () => {
           expect(!existsSync('foo'));
-        });
+        })
       })
       .then(confirmBlueprinted);
   });

tests/e2e/e2e_workflow.spec.js

@@ -68,7 +68,7 @@ describe('Basic end-to-end Workflow', function () {
     var envContent = fs.readFileSync(envPath, { encoding: 'utf8' });
     expect(envContent).to.include('production:true');
     // Also does not create new things in GIT.
-    expect(sh.exec('git status --porcelain').output).to.be.equal('');
+    expect(sh.exec('git status --porcelain').output).to.be.equal(undefined);
   });
 
   it('Can run `ng build` in created project', function () {
@@ -80,7 +80,7 @@ describe('Basic end-to-end Workflow', function () {
       })
       .then(function () {
         // Also does not create new things in GIT.
-        expect(sh.exec('git status --porcelain').output).to.be.equal('');
+        expect(sh.exec('git status --porcelain').output).to.be.equal(undefined);
       })
       .catch(() => {
         throw new Error('Build failed.');