cargdev/angular
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

test(upgrade): run tests against AngularJS v1.7.x as well (#25231)

Browse Source 
PR Close #25231
This commit is contained in:
George Kalpakas 2018-07-31 15:10:13 +03:00 committed by Igor Minar
parent fa70a2a650
commit 06af7943a4
6 changed files with 27 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
BUILD.bazel
View File

@ -36,7 +36,9 @@ filegroup(
name = "angularjs_scripts", name = "angularjs_scripts",
srcs = [ srcs = [
"@angular_deps//:node_modules/angular-1.5/angular.js", "@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.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-mocks/angular-mocks.js",
"@angular_deps//:node_modules/angular/angular.js", "@angular_deps//:node_modules/angular/angular.js",
], ],

2
karma-js.conf.js
View File

@ -31,6 +31,8 @@ module.exports = function(config) {
// Serve AngularJS for `ngUpgrade` testing. // Serve AngularJS for `ngUpgrade` testing.
{pattern: 'node_modules/angular-1.5/angular.js', included: false, watched: false}, {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-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/angular.js', included: false, watched: false},
{pattern: 'node_modules/angular-mocks/angular-mocks.js', included: false, watched: false}, {pattern: 'node_modules/angular-mocks/angular-mocks.js', included: false, watched: false},

6
package.json
View File

@ -60,10 +60,12 @@
"@types/source-map": "^0.5.1", "@types/source-map": "^0.5.1",
"@types/systemjs": "0.19.32", "@types/systemjs": "0.19.32",
"@webcomponents/custom-elements": "^1.0.4", "@webcomponents/custom-elements": "^1.0.4",
"angular": "npm:angular@1.6", "angular": "npm:angular@1.7",
"angular-1.5": "npm:angular@1.5", "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.5": "npm:angular-mocks@1.5",
"angular-mocks-1.6": "npm:angular-mocks@1.6",
"base64-js": "1.2.1", "base64-js": "1.2.1",
"bower": "1.8.2", "bower": "1.8.2",
"browserstacktunnel-wrapper": "2.0.1", "browserstacktunnel-wrapper": "2.0.1",

6
packages/upgrade/test/common/test_helpers.ts
View File

@ -15,6 +15,10 @@ const ng1Versions = [
}, },
{ {
label: '1.6', 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'], 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. // 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 // AngularJS leaves an "expandoId" property on `document`, which can trick subsequent
// `window.angular` instances into believing an app is already bootstrapped. // `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. // Remove AngularJS to leave a clean state for subsequent tests.
setNg1(undefined); setNg1(undefined);

2
tools/ng_setup_workspace.bzl
View File

@ -32,8 +32,10 @@ filegroup(
"ajv", "ajv",
"angular", "angular",
"angular-1.5", "angular-1.5",
"angular-1.6",
"angular-mocks", "angular-mocks",
"angular-mocks-1.5", "angular-mocks-1.5",
"angular-mocks-1.6",
"anymatch", "anymatch",
"arr-diff", "arr-diff",
"arr-flatten", "arr-flatten",

16
yarn.lock
View File

@ -278,17 +278,25 @@ amqplib@^0.5.2:
version "1.5.11" version "1.5.11"
resolved "https://registry.yarnpkg.com/angular/-/angular-1.5.11.tgz#8c5ba7386f15965c9acf3429f6881553aada30d6" 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": "angular-mocks-1.5@npm:angular-mocks@1.5":
version "1.5.11" version "1.5.11"
resolved "https://registry.yarnpkg.com/angular-mocks/-/angular-mocks-1.5.11.tgz#a0e1dd0ea55fd77ee7a757d75536c5e964c86f81" 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" version "1.6.10"
resolved "https://registry.yarnpkg.com/angular-mocks/-/angular-mocks-1.6.10.tgz#6a139e43c461d0c9a5a1acebc91e63db16031176" resolved "https://registry.yarnpkg.com/angular-mocks/-/angular-mocks-1.6.10.tgz#6a139e43c461d0c9a5a1acebc91e63db16031176"
"angular@npm:angular@1.6": "angular-mocks@npm:angular-mocks@1.7":
version "1.6.10" version "1.7.2"
resolved "https://registry.yarnpkg.com/angular/-/angular-1.6.10.tgz#eed3080a34d29d0f681ff119b18ce294e3f74826" 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: ansi-gray@^0.1.1:
version "0.1.1" version "0.1.1"