Skip to content

build: move typings_test to new integration test fixture #14149

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
alexeagle wants to merge 1 commit into from
Closed

build: move typings_test to new integration test fixture #14149

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -151,6 +151,9 @@ do
if [[ -e ${SRCDIR}/tsconfig-testing.json ]]; then
echo "====== COMPILING TESTING: ${TSC} -p ${SRCDIR}/tsconfig-testing.json"
$TSC -p ${SRCDIR}/tsconfig-testing.json
if [[ -n "${EXPERIMENTAL_ES2015_DISTRO}" ]]; then
$TSC -p ${SRCDIR}/tsconfig-testing.json --target es2015 --outDir ${ES2015_DESTDIR}
fi
fi

if [[ -e ${SRCDIR}/tsconfig-2015.json ]]; then
Expand Down
0 tools/typings-test/include-all.ts → integration/typings_test_ts20/include-all.ts
View file
Open in desktop
File renamed without changes.
27 changes: 27 additions & 0 deletions integration/typings_test_ts20/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
{
"name": "angular-integration",
"description": "Assert that users with TypeScript 2.0 can type-check an Angular application",
"version": "0.0.0",
"license": "MIT",
"dependencies": {
"@angular/common": "file:../../dist/packages-dist-es2015/common",
"@angular/compiler": "file:../../dist/packages-dist-es2015/compiler",
"@angular/compiler-cli": "file:../../dist/packages-dist-es2015/compiler-cli",
"@angular/core": "file:../../dist/packages-dist-es2015/core",
"@angular/http": "file:../../dist/packages-dist-es2015/http",
"@angular/platform-browser": "file:../../dist/packages-dist-es2015/platform-browser",
"@angular/platform-browser-dynamic": "file:../../dist/packages-dist-es2015/platform-browser-dynamic",
"@angular/platform-server": "file:../../dist/packages-dist-es2015/platform-server",
"@angular/router": "file:../../dist/packages-dist-es2015/router",
"@angular/tsc-wrapped": "file:../../dist/tools/@angular/tsc-wrapped",
"@angular/upgrade": "file:../../dist/packages-dist-es2015/upgrade",
"@types/jasmine": "^2.5.41",
"rxjs": "file:../../node_modules/rxjs",
"source-map-explorer": "^1.3.3",
"typescript": "~2.0",
"zone.js": "^0.7.6"
},
"scripts": {
"test": "tsc"
}
}
3 changes: 2 additions & 1 deletion tools/typings-test/tsconfig.json → integration/typings_test_ts20/tsconfig.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,8 @@
"outDir": "../../dist/typing-test/",
"rootDir": ".",
"target": "es5",
"lib": ["es5", "dom", "es2015.collection", "es2015.iterable", "es2015.promise"]
"lib": ["es5", "dom", "es2015.collection", "es2015.iterable", "es2015.promise"],
"types": []
},
"files": [
"include-all.ts",
Expand Down
3 changes: 1 addition & 2 deletions scripts/ci-lite/test_e2e.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,8 @@ echo 'travis_fold:end:test.buildPackages'

./integration/build_rxjs_es6.sh
./integration/run_tests.sh
#TODO(alexeagle): move offline_compiler_test and typings-test to integration/
#TODO(alexeagle): move offline_compiler_test to integration/
./scripts/ci-lite/offline_compiler_test.sh
./tools/typings-test/test.sh

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

Expand Down
23 changes: 0 additions & 23 deletions tools/typings-test/test.sh
View file
Open in desktop

This file was deleted.