From 102ed3b03ceea77fb3bfd68616f87af7c2852a09 Mon Sep 17 00:00:00 2001 From: Alex Eagle Date: Fri, 13 Apr 2018 14:57:58 -0700 Subject: [PATCH] test: move platform-server integration test (#22810) Now it lives in our standard location for tests against npm packages PR Close #22810 --- .../platform-server}/README.md | 0 .../platform-server}/build.sh | 0 .../platform-server}/e2e/helloworld-spec.ts | 0 .../platform-server}/e2e/protractor.config.js | 0 .../e2e/transferstate-spec.ts | 0 .../platform-server}/e2e/tsconfig.json | 0 .../platform-server}/e2e/util.ts | 0 .../platform-server}/package.json | 26 +++++++++---------- .../src/helloworld/app.server.ts | 0 .../platform-server}/src/helloworld/app.ts | 0 .../platform-server}/src/helloworld/client.ts | 0 .../src/helloworld/hello-world.component.ts | 0 .../src/helloworld/index.html | 0 .../platform-server}/src/server.ts | 0 .../src/transferstate/app.server.ts | 0 .../platform-server}/src/transferstate/app.ts | 0 .../src/transferstate/client.ts | 0 .../src/transferstate/index.html | 0 .../transferstate/transfer-state.component.ts | 0 .../platform-server}/tsconfig.json | 0 .../platform-server}/webpack.client.config.js | 0 .../platform-server}/webpack.server.config.js | 0 .../integrationtest/.gitignore | 6 ----- .../integrationtest/run_tests.sh | 13 ---------- 24 files changed, 13 insertions(+), 32 deletions(-) rename {packages/platform-server/integrationtest => integration/platform-server}/README.md (100%) rename {packages/platform-server/integrationtest => integration/platform-server}/build.sh (100%) rename {packages/platform-server/integrationtest => integration/platform-server}/e2e/helloworld-spec.ts (100%) rename {packages/platform-server/integrationtest => integration/platform-server}/e2e/protractor.config.js (100%) rename {packages/platform-server/integrationtest => integration/platform-server}/e2e/transferstate-spec.ts (100%) rename {packages/platform-server/integrationtest => integration/platform-server}/e2e/tsconfig.json (100%) rename {packages/platform-server/integrationtest => integration/platform-server}/e2e/util.ts (100%) rename {packages/platform-server/integrationtest => integration/platform-server}/package.json (51%) rename {packages/platform-server/integrationtest => integration/platform-server}/src/helloworld/app.server.ts (100%) rename {packages/platform-server/integrationtest => integration/platform-server}/src/helloworld/app.ts (100%) rename {packages/platform-server/integrationtest => integration/platform-server}/src/helloworld/client.ts (100%) rename {packages/platform-server/integrationtest => integration/platform-server}/src/helloworld/hello-world.component.ts (100%) rename {packages/platform-server/integrationtest => integration/platform-server}/src/helloworld/index.html (100%) rename {packages/platform-server/integrationtest => integration/platform-server}/src/server.ts (100%) rename {packages/platform-server/integrationtest => integration/platform-server}/src/transferstate/app.server.ts (100%) rename {packages/platform-server/integrationtest => integration/platform-server}/src/transferstate/app.ts (100%) rename {packages/platform-server/integrationtest => integration/platform-server}/src/transferstate/client.ts (100%) rename {packages/platform-server/integrationtest => integration/platform-server}/src/transferstate/index.html (100%) rename {packages/platform-server/integrationtest => integration/platform-server}/src/transferstate/transfer-state.component.ts (100%) rename {packages/platform-server/integrationtest => integration/platform-server}/tsconfig.json (100%) rename {packages/platform-server/integrationtest => integration/platform-server}/webpack.client.config.js (100%) rename {packages/platform-server/integrationtest => integration/platform-server}/webpack.server.config.js (100%) delete mode 100644 packages/platform-server/integrationtest/.gitignore delete mode 100755 packages/platform-server/integrationtest/run_tests.sh diff --git a/packages/platform-server/integrationtest/README.md b/integration/platform-server/README.md similarity index 100% rename from packages/platform-server/integrationtest/README.md rename to integration/platform-server/README.md diff --git a/packages/platform-server/integrationtest/build.sh b/integration/platform-server/build.sh similarity index 100% rename from packages/platform-server/integrationtest/build.sh rename to integration/platform-server/build.sh diff --git a/packages/platform-server/integrationtest/e2e/helloworld-spec.ts b/integration/platform-server/e2e/helloworld-spec.ts similarity index 100% rename from packages/platform-server/integrationtest/e2e/helloworld-spec.ts rename to integration/platform-server/e2e/helloworld-spec.ts diff --git a/packages/platform-server/integrationtest/e2e/protractor.config.js b/integration/platform-server/e2e/protractor.config.js similarity index 100% rename from packages/platform-server/integrationtest/e2e/protractor.config.js rename to integration/platform-server/e2e/protractor.config.js diff --git a/packages/platform-server/integrationtest/e2e/transferstate-spec.ts b/integration/platform-server/e2e/transferstate-spec.ts similarity index 100% rename from packages/platform-server/integrationtest/e2e/transferstate-spec.ts rename to integration/platform-server/e2e/transferstate-spec.ts diff --git a/packages/platform-server/integrationtest/e2e/tsconfig.json b/integration/platform-server/e2e/tsconfig.json similarity index 100% rename from packages/platform-server/integrationtest/e2e/tsconfig.json rename to integration/platform-server/e2e/tsconfig.json diff --git a/packages/platform-server/integrationtest/e2e/util.ts b/integration/platform-server/e2e/util.ts similarity index 100% rename from packages/platform-server/integrationtest/e2e/util.ts rename to integration/platform-server/e2e/util.ts diff --git a/packages/platform-server/integrationtest/package.json b/integration/platform-server/package.json similarity index 51% rename from packages/platform-server/integrationtest/package.json rename to integration/platform-server/package.json index 81b1c8c698..074e55772a 100644 --- a/packages/platform-server/integrationtest/package.json +++ b/integration/platform-server/package.json @@ -8,19 +8,19 @@ "url": "https://github.com/angular/angular.git" }, "dependencies": { - "@angular/animations": "file:../../../dist/packages-dist/animations", - "@angular/common": "file:../../../dist/packages-dist/common", - "@angular/compiler": "file:../../../dist/packages-dist/compiler", - "@angular/compiler-cli": "file:../../../dist/packages-dist/compiler-cli", - "@angular/core": "file:../../../dist/packages-dist/core", - "@angular/http": "file:../../../dist/packages-dist/http", - "@angular/platform-browser": "file:../../../dist/packages-dist/platform-browser", - "@angular/platform-browser-dynamic": "file:../../../dist/packages-dist/platform-browser-dynamic", - "@angular/platform-server": "file:../../../dist/packages-dist/platform-server", + "@angular/animations": "file:../../dist/packages-dist/animations", + "@angular/common": "file:../../dist/packages-dist/common", + "@angular/compiler": "file:../../dist/packages-dist/compiler", + "@angular/compiler-cli": "file:../../dist/packages-dist/compiler-cli", + "@angular/core": "file:../../dist/packages-dist/core", + "@angular/http": "file:../../dist/packages-dist/http", + "@angular/platform-browser": "file:../../dist/packages-dist/platform-browser", + "@angular/platform-browser-dynamic": "file:../../dist/packages-dist/platform-browser-dynamic", + "@angular/platform-server": "file:../../dist/packages-dist/platform-server", "express": "^4.14.1", - "rxjs": "file:../../../node_modules/rxjs", - "typescript": "file:../../../node_modules/typescript", - "zone.js": "file:../../../node_modules/zone.js" + "rxjs": "file:../../node_modules/rxjs", + "typescript": "file:../../node_modules/typescript", + "zone.js": "file:../../node_modules/zone.js" }, "devDependencies": { "@types/jasmine": "2.5.41", @@ -28,7 +28,7 @@ "babel-loader": "^6.4.0", "babel-preset-es2015": "^6.22.0", "concurrently": "3.1.0", - "protractor": "file:../../../node_modules/protractor", + "protractor": "file:../../node_modules/protractor", "raw-loader": "^0.5.1", "webpack": "^2.2.1" }, diff --git a/packages/platform-server/integrationtest/src/helloworld/app.server.ts b/integration/platform-server/src/helloworld/app.server.ts similarity index 100% rename from packages/platform-server/integrationtest/src/helloworld/app.server.ts rename to integration/platform-server/src/helloworld/app.server.ts diff --git a/packages/platform-server/integrationtest/src/helloworld/app.ts b/integration/platform-server/src/helloworld/app.ts similarity index 100% rename from packages/platform-server/integrationtest/src/helloworld/app.ts rename to integration/platform-server/src/helloworld/app.ts diff --git a/packages/platform-server/integrationtest/src/helloworld/client.ts b/integration/platform-server/src/helloworld/client.ts similarity index 100% rename from packages/platform-server/integrationtest/src/helloworld/client.ts rename to integration/platform-server/src/helloworld/client.ts diff --git a/packages/platform-server/integrationtest/src/helloworld/hello-world.component.ts b/integration/platform-server/src/helloworld/hello-world.component.ts similarity index 100% rename from packages/platform-server/integrationtest/src/helloworld/hello-world.component.ts rename to integration/platform-server/src/helloworld/hello-world.component.ts diff --git a/packages/platform-server/integrationtest/src/helloworld/index.html b/integration/platform-server/src/helloworld/index.html similarity index 100% rename from packages/platform-server/integrationtest/src/helloworld/index.html rename to integration/platform-server/src/helloworld/index.html diff --git a/packages/platform-server/integrationtest/src/server.ts b/integration/platform-server/src/server.ts similarity index 100% rename from packages/platform-server/integrationtest/src/server.ts rename to integration/platform-server/src/server.ts diff --git a/packages/platform-server/integrationtest/src/transferstate/app.server.ts b/integration/platform-server/src/transferstate/app.server.ts similarity index 100% rename from packages/platform-server/integrationtest/src/transferstate/app.server.ts rename to integration/platform-server/src/transferstate/app.server.ts diff --git a/packages/platform-server/integrationtest/src/transferstate/app.ts b/integration/platform-server/src/transferstate/app.ts similarity index 100% rename from packages/platform-server/integrationtest/src/transferstate/app.ts rename to integration/platform-server/src/transferstate/app.ts diff --git a/packages/platform-server/integrationtest/src/transferstate/client.ts b/integration/platform-server/src/transferstate/client.ts similarity index 100% rename from packages/platform-server/integrationtest/src/transferstate/client.ts rename to integration/platform-server/src/transferstate/client.ts diff --git a/packages/platform-server/integrationtest/src/transferstate/index.html b/integration/platform-server/src/transferstate/index.html similarity index 100% rename from packages/platform-server/integrationtest/src/transferstate/index.html rename to integration/platform-server/src/transferstate/index.html diff --git a/packages/platform-server/integrationtest/src/transferstate/transfer-state.component.ts b/integration/platform-server/src/transferstate/transfer-state.component.ts similarity index 100% rename from packages/platform-server/integrationtest/src/transferstate/transfer-state.component.ts rename to integration/platform-server/src/transferstate/transfer-state.component.ts diff --git a/packages/platform-server/integrationtest/tsconfig.json b/integration/platform-server/tsconfig.json similarity index 100% rename from packages/platform-server/integrationtest/tsconfig.json rename to integration/platform-server/tsconfig.json diff --git a/packages/platform-server/integrationtest/webpack.client.config.js b/integration/platform-server/webpack.client.config.js similarity index 100% rename from packages/platform-server/integrationtest/webpack.client.config.js rename to integration/platform-server/webpack.client.config.js diff --git a/packages/platform-server/integrationtest/webpack.server.config.js b/integration/platform-server/webpack.server.config.js similarity index 100% rename from packages/platform-server/integrationtest/webpack.server.config.js rename to integration/platform-server/webpack.server.config.js diff --git a/packages/platform-server/integrationtest/.gitignore b/packages/platform-server/integrationtest/.gitignore deleted file mode 100644 index 372184be7d..0000000000 --- a/packages/platform-server/integrationtest/.gitignore +++ /dev/null @@ -1,6 +0,0 @@ -built/ -*/src/*.d.ts -*/src/*.js -**/*.ngfactory.ts -**/*.ngsummary.json -npm-debug.log \ No newline at end of file diff --git a/packages/platform-server/integrationtest/run_tests.sh b/packages/platform-server/integrationtest/run_tests.sh deleted file mode 100755 index 285a423e36..0000000000 --- a/packages/platform-server/integrationtest/run_tests.sh +++ /dev/null @@ -1,13 +0,0 @@ -#!/usr/bin/env bash - -set -eu -o pipefail - -cd `dirname $0` - -echo "#################################" -echo "Running platform-server end to end tests" -echo "#################################" - -yarn install - -npm run test