8000 chore(): node6 support & tests · angular/angular-cli@fc0491b · GitHub
[go: up one dir, main page]
Skip to content

Commit fc0491b

Browse files
jkurijkuri
committed
chore(): node6 support & tests
1 parent 72bc9d9 commit fc0491b

File tree

8 files changed

+19
-12
lines changed

8 files changed

+19
-12
lines changed

‎.appveyor.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
environment:
2-
nodejs_version: "5.0"
2+
matrix:
3+
- nodejs_version: "5.0"
4+
- nodejs_version: "6.0"
35

46
install:
57
- ps: Install-Product node $env:nodejs_version

‎.travis.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ env:
66
matrix:
77
- NODE_VERSION=5 SCRIPT=lint
88
- NODE_VERSION=5 SCRIPT=test
9+
- NODE_VERSION=6 SCRIPT=test
910
os:
1011
- linux
1112
- osx

‎addon/ng2/blueprints/ng2/files/__path__/typings.d.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,5 @@
22
// https://github.com/typings/typings
33
// https://www.typescriptlang.org/docs/handbook/writing-declaration-files.html
44

5-
/// <reference path="<%= refToTypings %>/typings/browser.d.ts" />
5+
/// <reference path="<%= refToTypings %>/typings/index.d.ts 8000 " />
66
<% if(!isMobile) { %>declare var module: { id: string };<% } %>

‎addon/ng2/blueprints/ng2/files/e2e/typings.d.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
/// <reference path="../typings/main.d.ts" />
1+
/// <reference path="../typings/index.d.ts" />

‎addon/ng2/blueprints/ng2/files/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,6 @@
4747
"ts-node": "0.5.5",
4848
"tslint": "3.11.0",
4949
"typescript": "1.8.10",
50-
"typings": "0.8.1"<%= stylePackage %>
50+
"typings": "1.3.1"<%= stylePackage %>
5151
}
5252
}

‎addon/ng2/blueprints/ng2/files/typings.json

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,10 @@
11
{
2-
"ambientDevDependencies": {
2+
"globalDevDependencies": {
33
"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",
55
"selenium-webdriver": "registry:dt/selenium-webdriver#2.44.0+20160317120654"
66
},
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"
109
}
1110
}

‎tests/e2e/e2e_workflow.spec.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ describe('Basic end-to-end Workflow', function () {
4949
it('Can create new project using `ng new test-project`', function () {
5050
this.timeout(4200000);
5151

52-
return ng(['new', 'test-project', '--link-cli=true']).then(function () {
52+
return ng(['new', 'test-project']).then(function () {
5353
expect(existsSync(path.join(root, 'test-project')));
5454
});
5555
});
@@ -118,7 +118,7 @@ describe('Basic end-to-end Workflow', function () {
118118
this.timeout(240000);
119119

120120
function executor(resolve, reject) {
121-
child_process.exec(`${ngBin} e2e`, (error, stdout, stderr) => {
121+
child_process.exec('ng e2e', (error, stdout, stderr) => {
122122
if (error !== null) {
123123
resolve(stderr);
124124
} else {
@@ -146,7 +146,7 @@ describe('Basic end-to-end Workflow', function () {
146146
serveProcess.stdout.on('data', (data) => {
147147
if (/Build successful/.test(data) && !startedProtractor) {
148148
startedProtractor = true;
149-
child_process.exec(`${ngBin} e2e`, (error, stdout, stderr) => {
149+
child_process.exec('ng e2e', (error, stdout, stderr) => {
150150
if (error !== null) {
151151
reject(stderr)
152152
} else {

‎typings.json

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,5 +12,10 @@
1212
"node": "github:DefinitelyTyped/DefinitelyTyped/node/node.d.ts#8cf8164641be73e8f1e652c2a5b967c7210b6729",
1313
"shelljs": "github:DefinitelyTyped/DefinitelyTyped/shelljs/shelljs.d.ts#ce14ae27a020194da3d35aa3468ca1e9e5296316",
1414
"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"
1520
}
1621
}

0 commit comments

Comments
 (0)
0