honeymoose
/
angular-cn
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

test(upgrade): run tests against AngularJS v1.8.x as well (#39972) 

We intend to run the `@angular/upgrade` tests against all supported
versions of AngularJS (v1.5+). Previously, we only ran them against
v1.5, v1.6 and v1.7.

Since AngularJS v1.8 was released recently, this commit adds it to the
list of AngularJS versions we test against.

PR Close #39972
This commit is contained in:
George Kalpakas 2020-12-04 16:53:12 +02:00 committed by Misko Hevery
parent 7954c8dfa3
commit a8aeb74714
5 changed files with 28 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
BUILD.bazel
View File

@ -42,9 +42,12 @@ filegroup(
"@npm//:node_modules/angular-1.5/angular.min.js", "@npm//:node_modules/angular-1.5/angular.min.js",
"@npm//:node_modules/angular-1.6/angular.js", "@npm//:node_modules/angular-1.6/angular.js",
"@npm//:node_modules/angular-1.6/angular.min.js", "@npm//:node_modules/angular-1.6/angular.min.js",
"@npm//:node_modules/angular-1.7/angular.js",
"@npm//:node_modules/angular-1.7/angular.min.js",
"@npm//:node_modules/angular-mocks/angular-mocks.js", "@npm//:node_modules/angular-mocks/angular-mocks.js",
"@npm//:node_modules/angular-mocks-1.5/angular-mocks.js", "@npm//:node_modules/angular-mocks-1.5/angular-mocks.js",
"@npm//:node_modules/angular-mocks-1.6/angular-mocks.js", "@npm//:node_modules/angular-mocks-1.6/angular-mocks.js",
"@npm//:node_modules/angular-mocks-1.7/angular-mocks.js",
], ],
) )

2
karma-js.conf.js
View File

@ -32,6 +32,8 @@ module.exports = function(config) {
{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?(.min).js', included: false, watched: false}, {pattern: 'node_modules/angular-1.6/angular?(.min).js', included: false, watched: false},
{pattern: 'node_modules/angular-mocks-1.6/angular-mocks.js', included: false, watched: false}, {pattern: 'node_modules/angular-mocks-1.6/angular-mocks.js', included: false, watched: false},
{pattern: 'node_modules/angular-1.7/angular?(.min).js', included: false, watched: false},
{pattern: 'node_modules/angular-mocks-1.7/angular-mocks.js', included: false, watched: false},
{pattern: 'node_modules/angular/angular?(.min).js', included: false, watched: false}, {pattern: 'node_modules/angular/angular?(.min).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

@ -90,12 +90,14 @@
"@types/yaml": "^1.9.7", "@types/yaml": "^1.9.7",
"@types/yargs": "^15.0.5", "@types/yargs": "^15.0.5",
"@webcomponents/custom-elements": "^1.1.0", "@webcomponents/custom-elements": "^1.1.0",
"angular": "npm:angular@1.7", "angular": "npm:angular@1.8",
"angular-1.5": "npm:angular@1.5", "angular-1.5": "npm:angular@1.5",
"angular-1.6": "npm:angular@1.6", "angular-1.6": "npm:angular@1.6",
"angular-mocks": "npm:angular-mocks@1.7", "angular-1.7": "npm:angular@1.7",
"angular-mocks": "npm:angular-mocks@1.8",
"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", "angular-mocks-1.6": "npm:angular-mocks@1.6",
"angular-mocks-1.7": "npm:angular-mocks@1.7",
"base64-js": "1.2.1", "base64-js": "1.2.1",
"bluebird": "^3.5.5", "bluebird": "^3.5.5",
"brotli": "^1.3.2", "brotli": "^1.3.2",

4
packages/upgrade/src/common/test/helpers/common_test_helpers.ts
View File

@ -23,6 +23,10 @@ const ng1Versions = [
}, },
{ {
label: '1.7', label: '1.7',
files: [`angular-1.7/${ANGULARJS_FILENAME}`, 'angular-mocks-1.7/angular-mocks.js'],
},
{
label: '1.8',
files: [`angular/${ANGULARJS_FILENAME}`, 'angular-mocks/angular-mocks.js'], files: [`angular/${ANGULARJS_FILENAME}`, 'angular-mocks/angular-mocks.js'],
}, },
]; ];

20
yarn.lock
View File

@ -3035,6 +3035,11 @@ alphanum-sort@^1.0.0:
resolved "https://registry.yarnpkg.com/angular/-/angular-1.6.10.tgz#eed3080a34d29d0f681ff119b18ce294e3f74826" resolved "https://registry.yarnpkg.com/angular/-/angular-1.6.10.tgz#eed3080a34d29d0f681ff119b18ce294e3f74826"
integrity sha512-PCZ5/hVdvPQiYyH0VwsPjrErPHRcITnaXxhksceOXgtJeesKHLA7KDu4X/yvcAi+1zdGgGF+9pDxkJvghXI9Wg== integrity sha512-PCZ5/hVdvPQiYyH0VwsPjrErPHRcITnaXxhksceOXgtJeesKHLA7KDu4X/yvcAi+1zdGgGF+9pDxkJvghXI9Wg==
"angular-1.7@npm:angular@1.7":
version "1.7.9"
resolved "https://registry.yarnpkg.com/angular/-/angular-1.7.9.tgz#e52616e8701c17724c3c238cfe4f9446fd570bc4"
integrity sha512-5se7ZpcOtu0MBFlzGv5dsM1quQDoDeUTwZrWjGtTNA7O88cD8TEk5IEKCTDa3uECV9XnvKREVUr7du1ACiWGFQ==
"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"
@ -3045,15 +3050,20 @@ alphanum-sort@^1.0.0:
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"
integrity sha512-1865/NmqHNogibNoglY1MGBjx882iu2hI46BBhYDWyz0C4TDM5ER8H8SnYwQKUUG4RXMDsJizszEQ2BEoYKV9w== integrity sha512-1865/NmqHNogibNoglY1MGBjx882iu2hI46BBhYDWyz0C4TDM5ER8H8SnYwQKUUG4RXMDsJizszEQ2BEoYKV9w==
"angular-mocks@npm:angular-mocks@1.7": "angular-mocks-1.7@npm:angular-mocks@1.7":
version "1.7.9" version "1.7.9"
resolved "https://registry.yarnpkg.com/angular-mocks/-/angular-mocks-1.7.9.tgz#0a3b7e28b9a493b4e3010ed2b0f69a68e9b4f79b" resolved "https://registry.yarnpkg.com/angular-mocks/-/angular-mocks-1.7.9.tgz#0a3b7e28b9a493b4e3010ed2b0f69a68e9b4f79b"
integrity sha512-LQRqqiV3sZ7NTHBnNmLT0bXtE5e81t97+hkJ56oU0k3dqKv1s6F+nBWRlOVzqHWPGFOiPS8ZJVdrS8DFzHyNIA== integrity sha512-LQRqqiV3sZ7NTHBnNmLT0bXtE5e81t97+hkJ56oU0k3dqKv1s6F+nBWRlOVzqHWPGFOiPS8ZJVdrS8DFzHyNIA==
"angular@npm:angular@1.7": "angular-mocks@npm:angular-mocks@1.8":
version "1.7.9" version "1.8.2"
resolved "https://registry.yarnpkg.com/angular/-/angular-1.7.9.tgz#e52616e8701c17724c3c238cfe4f9446fd570bc4" resolved "https://registry.yarnpkg.com/angular-mocks/-/angular-mocks-1.8.2.tgz#dc022420b86978cf317a8447c116c0be73a853bf"
integrity sha512-5se7ZpcOtu0MBFlzGv5dsM1quQDoDeUTwZrWjGtTNA7O88cD8TEk5IEKCTDa3uECV9XnvKREVUr7du1ACiWGFQ== integrity sha512-I5L3P0l21HPdVsP4A4qWmENt4ePjjbkDFdAzOaM7QiibFySbt14DptPbt2IjeG4vFBr4vSLbhIz8Fk03DISl8Q==
"angular@npm:angular@1.8":
version "1.8.2"
resolved "https://registry.yarnpkg.com/angular/-/angular-1.8.2.tgz#5983bbb5a9fa63e213cb7749199e0d352de3a2f1"
integrity sha512-IauMOej2xEe7/7Ennahkbb5qd/HFADiNuLSESz9Q27inmi32zB0lnAsFeLEWcox3Gd1F6YhNd1CP7/9IukJ0Gw==
ansi-align@^2.0.0: ansi-align@^2.0.0:
version "2.0.0" version "2.0.0"