chore(): node6 support & tests

jkuri · jkuri · commit fb57a16376b2 · 2016-07-14T23:48:48.000+02:00
diff --git a/.travis.yml b/.travis.yml
@@ -6,6 +6,7 @@ env:
   matrix:
     - NODE_VERSION=5 SCRIPT=lint
     - NODE_VERSION=5 SCRIPT=test
+    - NODE_VERSION=6 SCRIPT=test
 os:
   - linux
   - osx
diff --git a/addon/ng2/blueprints/ng2/files/__path__/typings.d.ts b/addon/ng2/blueprints/ng2/files/__path__/typings.d.ts
@@ -2,5 +2,5 @@
 // https://github.com/typings/typings
 // https://www.typescriptlang.org/docs/handbook/writing-declaration-files.html
 
-/// <reference path="<%= refToTypings %>/typings/browser.d.ts" />
+/// <reference path="<%= refToTypings %>/typings/index.d.ts" />
 <% if(!isMobile) { %>declare var module: { id: string };<% } %>
diff --git a/addon/ng2/blueprints/ng2/files/e2e/typings.d.ts b/addon/ng2/blueprints/ng2/files/e2e/typings.d.ts
@@ -1 +1 @@
-/// <reference path="../typings/main.d.ts" />
+/// <reference path="../typings/index.d.ts" />
diff --git a/addon/ng2/blueprints/ng2/files/package.json b/addon/ng2/blueprints/ng2/files/package.json
@@ -47,6 +47,6 @@
     "ts-node": "0.5.5",
     "tslint": "3.11.0",
     "typescript": "1.8.10",
-    "typings": "0.8.1"<%= stylePackage %>
+    "typings": "1.3.1"<%= stylePackage %>
   }
 }
diff --git a/addon/ng2/blueprints/ng2/files/typings.json b/addon/ng2/blueprints/ng2/files/typings.json
@@ -1,11 +1,10 @@
 {
-  "ambientDevDependencies": {
+  "globalDevDependencies": {
     "angular-protractor": "registry:dt/angular-protractor#1.5.0+20160425143459",
-    "jasmine": "registry:dt/jasmine#2.2.0+20160412134438",
+    "jasmine": "registry:dt/jasmine#2.2.0+20160621224255",
     "selenium-webdriver": "registry:dt/selenium-webdriver#2.44.0+20160317120654"
   },
-  "ambientDependencies": {
-    "es6-shim": "registry:dt/es6-shim#0.31.2+20160317120654"<% if (isMobile) {%>,
-    "node": "registry:dt/node#4.0.0+20160509154515" <% } %>
+  "globalDependencies": {
+    "es6-shim": "registry:dt/es6-shim#0.31.2+20160602141504"
   }
 }
diff --git a/tests/e2e/e2e_workflow.spec.js b/tests/e2e/e2e_workflow.spec.js
@@ -49,7 +49,7 @@ describe('Basic end-to-end Workflow', function () {
   it('Can create new project using `ng new test-project`', function () {
     this.timeout(4200000);
 
-    return ng(['new', 'test-project', '--link-cli=true']).then(function () {
+    return ng(['new', 'test-project']).then(function () {
       expect(existsSync(path.join(root, 'test-project')));
     });
   });
@@ -118,7 +118,7 @@ describe('Basic end-to-end Workflow', function () {
     this.timeout(240000);
 
     function executor(resolve, reject) {
-      child_process.exec(`${ngBin} e2e`, (error, stdout, stderr) => {
+      child_process.exec('ng e2e', (error, stdout, stderr) => {
         if (error !== null) {
           resolve(stderr);
         } else {
@@ -146,7 +146,7 @@ describe('Basic end-to-end Workflow', function () {
       serveProcess.stdout.on('data', (data) => {
         if (/Build successful/.test(data) && !startedProtractor) {
           startedProtractor = true;
-          child_process.exec(`${ngBin} e2e`, (error, stdout, stderr) => {
+          child_process.exec('ng e2e', (error, stdout, stderr) => {
             if (error !== null) {
               reject(stderr)
             } else {
diff --git a/typings.json b/typings.json
@@ -12,5 +12,10 @@
     "node": "github:DefinitelyTyped/DefinitelyTyped/node/node.d.ts#8cf8164641be73e8f1e652c2a5b967c7210b6729",
     "shelljs": "github:DefinitelyTyped/DefinitelyTyped/shelljs/shelljs.d.ts#ce14ae27a020194da3d35aa3468ca1e9e5296316",
     "through": "github:DefinitelyTyped/DefinitelyTyped/through/through.d.ts#4ffee4a839f36d4f13ea7b0bc03ed2ca853e79d5"
+  },
+  "globalDependencies": {
+    "angular-protractor": "registry:dt/angular-protractor#1.5.0+20160425143459",
+    "jasmine": "registry:dt/jasmine#2.2.0+20160621224255",
+    "selenium-webdriver": "registry:dt/selenium-webdriver#2.44.0+20160317120654"
   }
 }

Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-/// <reference path="../typings/main.d.ts" />`
	`1`	`+/// <reference path="../typings/index.d.ts" />`
Original file line number	Diff line number	Diff line change
`@@ -47,6 +47,6 @@`
`47`	`47`	`"ts-node": "0.5.5",`
`48`	`48`	`"tslint": "3.11.0",`
`49`	`49`	`"typescript": "1.8.10",`
`50`		`- "typings": "0.8.1"<%= stylePackage %>`
	`50`	`+ "typings": "1.3.1"<%= stylePackage %>`
`51`	`51`	`}`
`52`	`52`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,11 +1,10 @@`
`1`	`1`	`{`
`2`		`- "ambientDevDependencies": {`
	`2`	`+ "globalDevDependencies": {`
`3`	`3`	`"angular-protractor": "registry:dt/angular-protractor#1.5.0+20160425143459",`
`4`		`- "jasmine": "registry:dt/jasmine#2.2.0+20160412134438",`
	`4`	`+ "jasmine": "registry:dt/jasmine#2.2.0+20160621224255",`
`5`	`5`	`"selenium-webdriver": "registry:dt/selenium-webdriver#2.44.0+20160317120654"`
`6`	`6`	`},`
`7`		`- "ambientDependencies": {`
`8`		`- "es6-shim": "registry:dt/es6-shim#0.31.2+20160317120654"<% if (isMobile) {%>,`
`9`		`- "node": "registry:dt/node#4.0.0+20160509154515" <% } %>`
	`7`	`+ "globalDependencies": {`
	`8`	`+ "es6-shim": "registry:dt/es6-shim#0.31.2+20160602141504"`
`10`	`9`	`}`
`11`	`10`	`}`
Original file line number	Diff line number	Diff line change
`@@ -12,5 +12,10 @@`
`12`	`12`	`"node": "github:DefinitelyTyped/DefinitelyTyped/node/node.d.ts#8cf8164641be73e8f1e652c2a5b967c7210b6729",`
`13`	`13`	`"shelljs": "github:DefinitelyTyped/DefinitelyTyped/shelljs/shelljs.d.ts#ce14ae27a020194da3d35aa3468ca1e9e5296316",`
`14`	`14`	`"through": "github:DefinitelyTyped/DefinitelyTyped/through/through.d.ts#4ffee4a839f36d4f13ea7b0bc03ed2ca853e79d5"`
	`15`	`+ },`
	`16`	`+ "globalDependencies": {`
	`17`	`+ "angular-protractor": "registry:dt/angular-protractor#1.5.0+20160425143459",`
	`18`	`+ "jasmine": "registry:dt/jasmine#2.2.0+20160621224255",`
	`19`	`+ "selenium-webdriver": "registry:dt/selenium-webdriver#2.44.0+20160317120654"`
`15`	`20`	`}`
`16`	`21`	`}`