From 06af7943a42abdd55933993a1b67296660ba3547 Mon Sep 17 00:00:00 2001 From: George Kalpakas Date: Tue, 31 Jul 2018 15:10:13 +0300 Subject: [PATCH] test(upgrade): run tests against AngularJS v1.7.x as well (#25231) PR Close #25231 --- BUILD.bazel | 2 ++ karma-js.conf.js | 2 ++ package.json | 6 ++++-- packages/upgrade/test/common/test_helpers.ts | 6 +++++- tools/ng_setup_workspace.bzl | 2 ++ yarn.lock | 16 ++++++++++++---- 6 files changed, 27 insertions(+), 7 deletions(-) diff --git a/BUILD.bazel b/BUILD.bazel index 74ef2eb41f..ed2e3b7975 100644 --- a/BUILD.bazel +++ b/BUILD.bazel @@ -36,7 +36,9 @@ filegroup( name = "angularjs_scripts", srcs = [ "@angular_deps//:node_modules/angular-1.5/angular.js", + "@angular_deps//:node_modules/angular-1.6/angular.js", "@angular_deps//:node_modules/angular-mocks-1.5/angular-mocks.js", + "@angular_deps//:node_modules/angular-mocks-1.6/angular-mocks.js", "@angular_deps//:node_modules/angular-mocks/angular-mocks.js", "@angular_deps//:node_modules/angular/angular.js", ], diff --git a/karma-js.conf.js b/karma-js.conf.js index a6adca6057..255efd856b 100644 --- a/karma-js.conf.js +++ b/karma-js.conf.js @@ -31,6 +31,8 @@ module.exports = function(config) { // Serve AngularJS for `ngUpgrade` testing. {pattern: 'node_modules/angular-1.5/angular.js', included: false, watched: false}, {pattern: 'node_modules/angular-mocks-1.5/angular-mocks.js', included: false, watched: false}, + {pattern: 'node_modules/angular-1.6/angular.js', included: false, watched: false}, + {pattern: 'node_modules/angular-mocks-1.6/angular-mocks.js', included: false, watched: false}, {pattern: 'node_modules/angular/angular.js', included: false, watched: false}, {pattern: 'node_modules/angular-mocks/angular-mocks.js', included: false, watched: false}, diff --git a/package.json b/package.json index 89ba1afb8a..56ba1296e1 100644 --- a/package.json +++ b/package.json @@ -60,10 +60,12 @@ "@types/source-map": "^0.5.1", "@types/systemjs": "0.19.32", "@webcomponents/custom-elements": "^1.0.4", - "angular": "npm:angular@1.6", + "angular": "npm:angular@1.7", "angular-1.5": "npm:angular@1.5", - "angular-mocks": "npm:angular-mocks@1.6", + "angular-1.6": "npm:angular@1.6", + "angular-mocks": "npm:angular-mocks@1.7", "angular-mocks-1.5": "npm:angular-mocks@1.5", + "angular-mocks-1.6": "npm:angular-mocks@1.6", "base64-js": "1.2.1", "bower": "1.8.2", "browserstacktunnel-wrapper": "2.0.1", diff --git a/packages/upgrade/test/common/test_helpers.ts b/packages/upgrade/test/common/test_helpers.ts index ced3860b0e..2818a4e055 100644 --- a/packages/upgrade/test/common/test_helpers.ts +++ b/packages/upgrade/test/common/test_helpers.ts @@ -15,6 +15,10 @@ const ng1Versions = [ }, { label: '1.6', + files: ['angular-1.6/angular.js', 'angular-mocks-1.6/angular-mocks.js'], + }, + { + label: '1.7', files: ['angular/angular.js', 'angular-mocks/angular-mocks.js'], }, ]; @@ -73,7 +77,7 @@ export function createWithEachNg1VersionFn(setNg1: typeof setAngularJSGlobal) { // In these tests we are loading different versions of AngularJS on the same window. // AngularJS leaves an "expandoId" property on `document`, which can trick subsequent // `window.angular` instances into believing an app is already bootstrapped. - win.angular.element(document).removeData(); + win.angular.element.cleanData([document]); // Remove AngularJS to leave a clean state for subsequent tests. setNg1(undefined); diff --git a/tools/ng_setup_workspace.bzl b/tools/ng_setup_workspace.bzl index e4f7209004..af2392fe00 100644 --- a/tools/ng_setup_workspace.bzl +++ b/tools/ng_setup_workspace.bzl @@ -32,8 +32,10 @@ filegroup( "ajv", "angular", "angular-1.5", + "angular-1.6", "angular-mocks", "angular-mocks-1.5", + "angular-mocks-1.6", "anymatch", "arr-diff", "arr-flatten", diff --git a/yarn.lock b/yarn.lock index abadcdb24f..6a2fdc8d53 100644 --- a/yarn.lock +++ b/yarn.lock @@ -278,17 +278,25 @@ amqplib@^0.5.2: version "1.5.11" resolved "https://registry.yarnpkg.com/angular/-/angular-1.5.11.tgz#8c5ba7386f15965c9acf3429f6881553aada30d6" +"angular-1.6@npm:angular@1.6": + version "1.6.10" + resolved "https://registry.yarnpkg.com/angular/-/angular-1.6.10.tgz#eed3080a34d29d0f681ff119b18ce294e3f74826" + "angular-mocks-1.5@npm:angular-mocks@1.5": version "1.5.11" resolved "https://registry.yarnpkg.com/angular-mocks/-/angular-mocks-1.5.11.tgz#a0e1dd0ea55fd77ee7a757d75536c5e964c86f81" -"angular-mocks@npm:angular-mocks@1.6": +"angular-mocks-1.6@npm:angular-mocks@1.6": version "1.6.10" resolved "https://registry.yarnpkg.com/angular-mocks/-/angular-mocks-1.6.10.tgz#6a139e43c461d0c9a5a1acebc91e63db16031176" -"angular@npm:angular@1.6": - version "1.6.10" - resolved "https://registry.yarnpkg.com/angular/-/angular-1.6.10.tgz#eed3080a34d29d0f681ff119b18ce294e3f74826" +"angular-mocks@npm:angular-mocks@1.7": + version "1.7.2" + resolved "https://registry.yarnpkg.com/angular-mocks/-/angular-mocks-1.7.2.tgz#8a2bc7a7ce355697a48ab00e548b88e78f71fa52" + +"angular@npm:angular@1.7": + version "1.7.2" + resolved "https://registry.yarnpkg.com/angular/-/angular-1.7.2.tgz#687b955dbe5c533f8d73460461707af00360251f" ansi-gray@^0.1.1: version "0.1.1"