chore: remove the NODE 4 tests.

hansl · hansl · commit b87e72a29f62 · 2016-04-26T10:33:44.000-07:00
diff --git a/.travis.yml b/.travis.yml
@@ -1,15 +1,14 @@
 sudo: false
 env:
-  - NODE_VERSION=4 SCRIPT=lint
-  - NODE_VERSION=4 SCRIPT=test
+  - NODE_VERSION=5 SCRIPT=lint
   - NODE_VERSION=5 SCRIPT=test
 os:
   - linux
   - osx
 matrix:
   exclude:
     - os: osx
-      env: NODE_VERSION=4 SCRIPT=lint
+      env: NODE_VERSION=5 SCRIPT=lint
 
 script:
   - npm run-script $SCRIPT
diff --git a/lib/broccoli/angular2-app.js b/lib/broccoli/angular2-app.js
@@ -24,6 +24,8 @@ class Angular2App extends BroccoliPlugin {
     super();
     options = options || {};
 
+    this._initProject();
+
     this._options = options;
     this._sourceDir = options.sourceDir || 'src/client';
     this._inputNode = inputNode || this._buildInputTree();
@@ -34,7 +36,6 @@ class Angular2App extends BroccoliPlugin {
       additionalFiles: ['**/*.spec.ts']
     };
 
-    this._initProject();
     this._notifyAddonIncluded();
 
     this._tree = this._buildTree();
@@ -72,13 +73,13 @@ class Angular2App extends BroccoliPlugin {
    */
   _buildInputTree() {
     return new BroccoliMergeTrees([
-        new BroccoliFunnel(this._sourceDir, { destDir: this._sourceDir, name: 'source' }),
-        new BroccoliFunnel('typings', { include: ['browser.d.ts', 'browser/**/*' ], destDir: 'typings' }),
-        new BroccoliFunnel('config', { destDir: 'config' }),
-        new BroccoliFunnel('public', { destDir: 'public' })
-      ], {
-        overwrite: true
-      });
+      new BroccoliFunnel(this._sourceDir, { destDir: this._sourceDir, name: 'source' }),
+      new BroccoliFunnel('typings', { include: ['browser.d.ts', 'browser/**/*' ], destDir: 'typings' }),
+      new BroccoliFunnel('config', { destDir: 'config' }),
+      new BroccoliFunnel('public', { destDir: 'public' })
+    ], {
+      overwrite: true
+    });
   }
 
   /**
@@ -419,18 +420,12 @@ class Angular2App extends BroccoliPlugin {
    * @return {Funnel} The config files tree.
    */
   _getConfigTree() {
-    var environment = process.env.EMBER_ENV;
-    if (environment == 'production') {
-      environment = 'prod';
-    } else if (environment == 'development') {
-      environment = 'dev';
-    }
-    var envConfigFile = `config/environment.${environment}.ts`;
+    var envConfigFile = isProduction ? 'environment.prod.ts' : 'environment.dev.ts';
 
-    return new BroccoliFunnel(this._inputNode, {
-      files: [envConfigFile],
-      getDestinationPath: () => path.join(this._sourceDir, 'app/environment.ts'),
-      name: 'environment'
+    return new BroccoliFunnel('config', {
+      include: [envConfigFile],
+      destDir: path.join(this._sourceDir, 'app'),
+      getDestinationPath: () => 'environment.ts'
     });
   }
 }
diff --git a/package.json b/package.json
@@ -50,7 +50,6 @@
     "shelljs": "^0.6.0",
     "silent-error": "^1.0.0",
     "symlink-or-copy": "^1.0.1",
-    "tslint": "^3.8.0",
     "typescript": "^1.9.0-dev.20160421",
     "typings": "^0.7.9"
   },
diff --git a/tests/e2e/e2e_workflow.spec.js b/tests/e2e/e2e_workflow.spec.js
@@ -19,6 +19,9 @@ function existsSync(path) {
   }
 }
 
+const bin = path.normalize('./node_modules/angular-cli/bin/ng');
+
+
 describe('Basic end-to-end Workflow', function () {
   before(conf.setup);
 
@@ -62,7 +65,7 @@ describe('Basic end-to-end Workflow', function () {
 
     // Can't user the `ng` helper because somewhere the environment gets
     // stuck to the first build done
-    sh.exec('ng build --environment=production --silent');
+    sh.exec(`${bin} build --environment=production --silent`);
     expect(existsSync(path.join(process.cwd(), 'dist'))).to.be.equal(true);
     var envPath = path.join(process.cwd(), 'dist', 'app', 'environment.js');
     var envContent = fs.readFileSync(envPath, { encoding: 'utf8' });
@@ -77,13 +80,9 @@ describe('Basic end-to-end Workflow', function () {
     return ng(['build', '--silent'])
       .then(function () {
         expect(existsSync(path.join(process.cwd(), 'dist'))).to.be.equal(true);
-      })
-      .then(function () {
+
         // Also does not create new things in GIT.
         expect(sh.exec('git status --porcelain').output).to.be.equal('');
-      })
-      .catch(() => {
-        throw new Error('Build failed.');
       });
   });
 
@@ -190,45 +189,41 @@ describe('Basic end-to-end Workflow', function () {
     return ng(['build', '--silent'])
       .then(function () {
         expect(existsSync(tmpFileLocation));
-      })
-      .catch(err => {
-        throw new Error(err)
       });
   });
 
   it('Installs sass support successfully', function() {
     this.timeout(420000);
 
     sh.exec('npm install node-sass', { silent: true });
-    return ng(['generate', 'component', 'test-component'])
-    .then(() => {
-      let componentPath = path.join(process.cwd(), 'src', 'client', 'app', 'test-component');
-      let cssFile = path.join(componentPath, 'test-component.component.css');
-      let scssFile = path.join(componentPath, 'test-component.component.scss');
-
-      expect(existsSync(componentPath)).to.be.equal(true);
-      sh.mv(cssFile, scssFile);
-      expect(existsSync(scssFile)).to.be.equal(true);
-      expect(existsSync(cssFile)).to.be.equal(false);
-      let scssExample = '.outer {\n  .inner { background: #fff; }\n }';
-      fs.writeFileSync(scssFile, scssExample, 'utf8');
-
-      sh.exec('ng build --silent');
-      let destCss = path.join(process.cwd(), 'dist', 'app', 'test-component', 'test-component.component.css');
-      expect(existsSync(destCss)).to.be.equal(true);
-      let contents = fs.readFileSync(destCss, 'utf8');
-      expect(contents).to.include('.outer .inner');
-
-      sh.rm('-f', destCss);
-      process.chdir('src');
-      sh.exec('ng build --silent');
-      expect(existsSync(destCss)).to.be.equal(true);
-      contents = fs.readFileSync(destCss, 'utf8');
-      expect(contents).to.include('.outer .inner');
-
-      process.chdir('..');
-      sh.exec('npm uninstall node-sass', { silent: true });
-    });
+    sh.exec(`${bin} generate component test-component`);
+
+    let componentPath = path.join(process.cwd(), 'src', 'client', 'app', 'test-component');
+    let cssFile = path.join(componentPath, 'test-component.component.css');
+    let scssFile = path.join(componentPath, 'test-component.component.scss');
+
+    expect(existsSync(componentPath)).to.be.equal(true);
+    sh.mv(cssFile, scssFile);
+    expect(existsSync(scssFile)).to.be.equal(true);
+    expect(existsSync(cssFile)).to.be.equal(false);
+    let scssExample = '.outer {\n  .inner { background: #fff; }\n }';
+    fs.writeFileSync(scssFile, scssExample, 'utf8');
+
+    sh.exec(`${bin} build --silent`);
+    let destCss = path.join(process.cwd(), 'dist', 'app', 'test-component', 'test-component.component.css');
+    expect(existsSync(destCss)).to.be.equal(true);
+    let contents = fs.readFileSync(destCss, 'utf8');
+    expect(contents).to.include('.outer .inner');
+
+    sh.rm('-f', destCss);
+    process.chdir('src');
+    sh.exec(`../${bin} build --silent`);
+    expect(existsSync(destCss)).to.be.equal(true);
+    contents = fs.readFileSync(destCss, 'utf8');
+    expect(contents).to.include('.outer .inner');
+
+    process.chdir('..');
+    sh.exec('npm uninstall node-sass', { silent: true });
   });
 
   it('Installs less support successfully', function() {
@@ -248,15 +243,15 @@ describe('Basic end-to-end Workflow', function () {
       let lessExample = '.outer {\n  .inner { background: #fff; }\n }';
       fs.writeFileSync(lessFile, lessExample, 'utf8');
 
-      sh.exec('ng build --silent');
+      sh.exec(`${bin} build --silent`);
       let destCss = path.join(process.cwd(), 'dist', 'app', 'test-component', 'test-component.component.css');
       expect(existsSync(destCss)).to.be.equal(true);
       let contents = fs.readFileSync(destCss, 'utf8');
       expect(contents).to.include('.outer .inner');
 
       sh.rm('-f', destCss);
       process.chdir('src');
-      sh.exec('ng build --silent');
+      sh.exec(`../${bin} build --silent`);
       expect(existsSync(destCss)).to.be.equal(true);
       contents = fs.readFileSync(destCss, 'utf8');
       expect(contents).to.include('.outer .inner');
@@ -282,15 +277,15 @@ describe('Basic end-to-end Workflow', function () {
       let stylusExample = '.outer {\n  .inner { background: #fff; }\n }';
       fs.writeFileSync(stylusFile, stylusExample, 'utf8');
 
-      sh.exec('ng build --silent');
+      sh.exec(`${bin} build --silent`);
       let destCss = path.join(process.cwd(), 'dist', 'app', 'test-component', 'test-component.component.css');
       expect(existsSync(destCss)).to.be.equal(true);
       let contents = fs.readFileSync(destCss, 'utf8');
       expect(contents).to.include('.outer .inner');
 
       sh.rm('-f', destCss);
       process.chdir('src');
-      sh.exec('ng build --silent');
+      sh.exec(`../${bin} build --silent`);
       expect(existsSync(destCss)).to.be.equal(true);
       contents = fs.readFileSync(destCss, 'utf8');
       expect(contents).to.include('.outer .inner');
@@ -314,11 +309,7 @@ describe('Basic end-to-end Workflow', function () {
     return ng(['build', '--silent'])
       .then(function () {
         expect(existsSync(path.join(process.cwd(), 'dist'))).to.be.equal(true);
-      })
-      .catch(() => {
-        throw new Error('Build failed.');
-      })
-      .finally(function () {
+
         // Clean `tmp` folder
         process.chdir(path.resolve(root, '..'));
         sh.rm('-rf', './tmp');  // tmp.teardown takes too long
