Skip to content

Commit c48dd76

Browse files
alexeaglemhevery
authored andcommitted
build: move typings_test to new integration test fixture (angular#14149)
PR Close angular#14149
1 parent 49fb814 commit c48dd76

File tree

6 files changed

+33
-26
lines changed

6 files changed

+33
-26
lines changed

build.sh

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -151,6 +151,9 @@ do
151151
if [[ -e ${SRCDIR}/tsconfig-testing.json ]]; then
152152
echo "====== COMPILING TESTING: ${TSC} -p ${SRCDIR}/tsconfig-testing.json"
153153
$TSC -p ${SRCDIR}/tsconfig-testing.json
154+
if [[ -n "${EXPERIMENTAL_ES2015_DISTRO}" ]]; then
155+
$TSC -p ${SRCDIR}/tsconfig-testing.json --target es2015 --outDir ${ES2015_DESTDIR}
156+
fi
154157
fi
155158

156159
if [[ -e ${SRCDIR}/tsconfig-2015.json ]]; then
File renamed without changes.
Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
{
2+
"name": "angular-integration",
3+
"description": "Assert that users with TypeScript 2.0 can type-check an Angular application",
4+
"version": "0.0.0",
5+
"license": "MIT",
6+
"dependencies": {
7+
"@angular/common": "file:../../dist/packages-dist-es2015/common",
8+
"@angular/compiler": "file:../../dist/packages-dist-es2015/compiler",
9+
"@angular/compiler-cli": "file:../../dist/packages-dist-es2015/compiler-cli",
10+
"@angular/core": "file:../../dist/packages-dist-es2015/core",
11+
"@angular/http": "file:../../dist/packages-dist-es2015/http",
12+
"@angular/platform-browser": "file:../../dist/packages-dist-es2015/platform-browser",
13+
"@angular/platform-browser-dynamic": "file:../../dist/packages-dist-es2015/platform-browser-dynamic",
14+
"@angular/platform-server": "file:../../dist/packages-dist-es2015/platform-server",
15+
"@angular/router": "file:../../dist/packages-dist-es2015/router",
16+
"@angular/tsc-wrapped": "file:../../dist/tools/@angular/tsc-wrapped",
17+
"@angular/upgrade": "file:../../dist/packages-dist-es2015/upgrade",
18+
"@types/jasmine": "^2.5.41",
19+
"rxjs": "file:../../node_modules/rxjs",
20+
"source-map-explorer": "^1.3.3",
21+
"typescript": "~2.0",
22+
"zone.js": "^0.7.6"
23+
},
24+
"scripts": {
25+
"test": "tsc"
26+
}
27+
}

tools/typings-test/tsconfig.json renamed to integration/typings_test_ts20/tsconfig.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,8 @@
77
"outDir": "../../dist/typing-test/",
88
"rootDir": ".",
99
"target": "es5",
10-
"lib": ["es5", "dom", "es2015.collection", "es2015.iterable", "es2015.promise"]
10+
"lib": ["es5", "dom", "es2015.collection", "es2015.iterable", "es2015.promise"],
11+
"types": []
1112
},
1213
"files": [
1314
"include-all.ts",

scripts/ci-lite/test_e2e.sh

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,8 @@ echo 'travis_fold:end:test.buildPackages'
2323

2424
./integration/build_rxjs_es6.sh
2525
./integration/run_tests.sh
26-
#TODO(alexeagle): move offline_compiler_test and typings-test to integration/
26+
#TODO(alexeagle): move offline_compiler_test to integration/
2727
./scripts/ci-lite/offline_compiler_test.sh
28-
./tools/typings-test/test.sh
2928

3029
$(npm bin)/gulp public-api:enforce
3130

tools/typings-test/test.sh

Lines changed: 0 additions & 23 deletions
This file was deleted.

0 commit comments

Comments
 (0)