chore(testing): update protractor to version 2.1.0

This commit is contained in:
Julie Ralph 2015-05-20 14:17:09 -07:00
parent e61d82b9be
commit dd9b08cce8
4 changed files with 108 additions and 1500 deletions

View File

@ -7037,175 +7037,6 @@
}
}
},
"chokidar": {
"version": "1.0.1",
"dependencies": {
"anymatch": {
"version": "1.3.0",
"dependencies": {
"micromatch": {
"version": "2.1.6",
"dependencies": {
"arr-diff": {
"version": "1.0.1",
"dependencies": {
"array-slice": {
"version": "0.2.3"
}
}
},
"braces": {
"version": "1.8.0",
"dependencies": {
"expand-range": {
"version": "1.8.1",
"dependencies": {
"fill-range": {
"version": "2.2.2",
"dependencies": {
"is-number": {
"version": "1.1.2"
},
"isobject": {
"version": "1.0.0"
},
"randomatic": {
"version": "1.1.0"
},
"repeat-string": {
"version": "1.5.2"
}
}
}
}
},
"preserve": {
"version": "0.2.0"
},
"repeat-element": {
"version": "1.1.2"
}
}
},
"debug": {
"version": "2.1.3",
"dependencies": {
"ms": {
"version": "0.7.0"
}
}
},
"expand-brackets": {
"version": "0.1.1"
},
"filename-regex": {
"version": "2.0.0"
},
"kind-of": {
"version": "1.1.0"
},
"object.omit": {
"version": "0.2.1",
"dependencies": {
"for-own": {
"version": "0.1.3",
"dependencies": {
"for-in": {
"version": "0.1.4"
}
}
},
"isobject": {
"version": "0.2.0"
}
}
},
"parse-glob": {
"version": "3.0.2",
"dependencies": {
"glob-base": {
"version": "0.2.0"
},
"is-dotfile": {
"version": "1.0.0"
},
"is-extglob": {
"version": "1.0.0"
}
}
},
"regex-cache": {
"version": "0.4.2",
"dependencies": {
"is-equal-shallow": {
"version": "0.1.2",
"dependencies": {
"is-primitive": {
"version": "1.0.0"
}
}
},
"is-primitive": {
"version": "2.0.0"
}
}
}
}
}
}
},
"arrify": {
"version": "1.0.0"
},
"async-each": {
"version": "0.1.6"
},
"glob-parent": {
"version": "1.2.0"
},
"is-binary-path": {
"version": "1.0.0",
"dependencies": {
"binary-extensions": {
"version": "1.3.0"
}
}
},
"is-glob": {
"version": "1.1.3"
},
"readdirp": {
"version": "1.3.0",
"dependencies": {
"readable-stream": {
"version": "1.0.33",
"dependencies": {
"core-util-is": {
"version": "1.0.1"
},
"isarray": {
"version": "0.0.1"
},
"string_decoder": {
"version": "0.10.31"
},
"inherits": {
"version": "2.0.1"
}
}
}
}
},
"fsevents": {
"version": "0.3.6",
"dependencies": {
"nan": {
"version": "1.8.4"
}
}
}
}
},
"glob": {
"version": "3.2.11",
"dependencies": {
@ -7988,7 +7819,7 @@
"version": "1.3.2"
},
"protractor": {
"version": "2.0.0",
"version": "2.1.0",
"dependencies": {
"request": {
"version": "2.36.0",
@ -7997,7 +7828,7 @@
"version": "0.6.6"
},
"json-stringify-safe": {
"version": "5.0.0"
"version": "5.0.1"
},
"mime": {
"version": "1.2.11"
@ -8020,7 +7851,7 @@
}
},
"async": {
"version": "0.9.0"
"version": "0.9.2"
}
}
},
@ -8073,13 +7904,16 @@
"version": "1.1.0"
},
"jasminewd2": {
"version": "0.0.3"
"version": "0.0.5"
},
"jasmine": {
"version": "2.1.1",
"version": "2.3.1",
"dependencies": {
"exit": {
"version": "0.1.2"
},
"jasmine-core": {
"version": "2.1.3"
"version": "2.3.4"
}
}
},
@ -8096,10 +7930,10 @@
"version": "0.3.0",
"dependencies": {
"lru-cache": {
"version": "2.6.2"
"version": "2.6.4"
},
"sigmund": {
"version": "1.0.0"
"version": "1.0.1"
}
}
}
@ -8606,392 +8440,6 @@
}
}
},
"tsd": {
"version": "0.5.7",
"dependencies": {
"q": {
"version": "0.9.7"
},
"q-io": {
"version": "1.9.4",
"dependencies": {
"qs": {
"version": "0.1.0"
},
"url2": {
"version": "0.0.0"
},
"mime": {
"version": "1.2.11"
},
"mimeparse": {
"version": "0.1.4"
},
"collections": {
"version": "0.1.24",
"dependencies": {
"weak-map": {
"version": "1.0.0"
}
}
}
}
},
"open": {
"version": "0.0.5"
},
"exit": {
"version": "0.1.2"
},
"mkdirp": {
"version": "0.3.5"
},
"semver": {
"version": "2.2.1"
},
"tv4": {
"version": "1.0.18"
},
"tv4-reporter": {
"version": "0.0.4",
"dependencies": {
"jsonpointer.js": {
"version": "0.3.0"
}
}
},
"uri-templates": {
"version": "0.1.2"
},
"minimist": {
"version": "0.0.7"
},
"assertion-error": {
"version": "1.0.0"
},
"jsesc": {
"version": "0.4.3"
},
"js-yaml": {
"version": "3.0.2",
"dependencies": {
"argparse": {
"version": "0.1.16",
"dependencies": {
"underscore": {
"version": "1.7.0"
},
"underscore.string": {
"version": "2.4.0"
}
}
},
"esprima": {
"version": "1.0.4"
}
}
},
"json-pointer": {
"version": "0.1.0",
"dependencies": {
"foreach": {
"version": "2.0.5"
}
}
},
"ministyle": {
"version": "0.1.4"
},
"miniwrite": {
"version": "0.1.4"
},
"minitable": {
"version": "0.0.3",
"dependencies": {
"minichain": {
"version": "0.0.1"
}
}
},
"es6-shim": {
"version": "0.9.1"
},
"request": {
"version": "2.33.0",
"dependencies": {
"qs": {
"version": "0.6.6"
},
"json-stringify-safe": {
"version": "5.0.1"
},
"forever-agent": {
"version": "0.5.2"
},
"node-uuid": {
"version": "1.4.3"
},
"mime": {
"version": "1.2.11"
},
"tough-cookie": {
"version": "1.1.0"
},
"form-data": {
"version": "0.1.4",
"dependencies": {
"combined-stream": {
"version": "0.0.7",
"dependencies": {
"delayed-stream": {
"version": "0.0.5"
}
}
},
"async": {
"version": "0.9.2"
}
}
},
"tunnel-agent": {
"version": "0.3.0"
},
"http-signature": {
"version": "0.10.1",
"dependencies": {
"assert-plus": {
"version": "0.1.5"
},
"asn1": {
"version": "0.1.11"
},
"ctype": {
"version": "0.5.3"
}
}
},
"oauth-sign": {
"version": "0.3.0"
},
"hawk": {
"version": "1.0.0",
"dependencies": {
"hoek": {
"version": "0.9.1"
},
"boom": {
"version": "0.4.2"
},
"cryptiles": {
"version": "0.2.2"
},
"sntp": {
"version": "0.2.4"
}
}
},
"aws-sign2": {
"version": "0.5.0"
}
}
},
"event-stream": {
"version": "3.1.7",
"dependencies": {
"through": {
"version": "2.3.7"
},
"duplexer": {
"version": "0.1.1"
},
"from": {
"version": "0.1.3"
},
"map-stream": {
"version": "0.1.0"
},
"pause-stream": {
"version": "0.0.11"
},
"split": {
"version": "0.2.10"
},
"stream-combiner": {
"version": "0.0.4"
}
}
},
"bufferstream": {
"version": "0.6.2",
"dependencies": {
"bufferjs": {
"version": "2.0.0"
},
"buffertools": {
"version": "2.1.2"
}
}
},
"update-notifier": {
"version": "0.1.7",
"resolved": "git://github.com/Bartvds/update-notifier/#0706121db6a6b6c47faeec87b18090cc9a10b6a7",
"dependencies": {
"request": {
"version": "2.27.0",
"dependencies": {
"qs": {
"version": "0.6.6"
},
"json-stringify-safe": {
"version": "5.0.1"
},
"forever-agent": {
"version": "0.5.2"
},
"tunnel-agent": {
"version": "0.3.0"
},
"http-signature": {
"version": "0.10.1",
"dependencies": {
"assert-plus": {
"version": "0.1.5"
},
"asn1": {
"version": "0.1.11"
},
"ctype": {
"version": "0.5.3"
}
}
},
"hawk": {
"version": "1.0.0",
"dependencies": {
"hoek": {
"version": "0.9.1"
},
"boom": {
"version": "0.4.2"
},
"cryptiles": {
"version": "0.2.2"
},
"sntp": {
"version": "0.2.4"
}
}
},
"aws-sign": {
"version": "0.3.0"
},
"oauth-sign": {
"version": "0.3.0"
},
"cookie-jar": {
"version": "0.3.0"
},
"node-uuid": {
"version": "1.4.3"
},
"mime": {
"version": "1.2.11"
},
"form-data": {
"version": "0.1.4",
"dependencies": {
"combined-stream": {
"version": "0.0.7",
"dependencies": {
"delayed-stream": {
"version": "0.0.5"
}
}
},
"async": {
"version": "0.9.2"
}
}
}
}
},
"configstore": {
"version": "0.1.7",
"dependencies": {
"lodash": {
"version": "2.4.2"
},
"js-yaml": {
"version": "2.1.3",
"dependencies": {
"argparse": {
"version": "0.1.16",
"dependencies": {
"underscore": {
"version": "1.7.0"
},
"underscore.string": {
"version": "2.4.0"
}
}
},
"esprima": {
"version": "1.0.4"
}
}
},
"osenv": {
"version": "0.0.3"
},
"graceful-fs": {
"version": "2.0.3"
}
}
},
"semver": {
"version": "2.1.0"
},
"chalk": {
"version": "0.4.0",
"dependencies": {
"has-color": {
"version": "0.1.7"
},
"ansi-styles": {
"version": "1.0.0"
},
"strip-ansi": {
"version": "0.1.1"
}
}
}
}
},
"universal-analytics": {
"version": "0.3.8",
"dependencies": {
"underscore": {
"version": "1.8.3"
},
"node-uuid": {
"version": "1.4.3"
},
"async": {
"version": "0.2.10"
}
}
},
"uuid": {
"version": "1.4.2"
},
"weak-map": {
"version": "1.0.5"
},
"detect-indent": {
"version": "0.1.4"
}
}
},
"typescript": {
"version": "1.5.0-beta"
}
@ -9408,5 +8856,5 @@
}
},
"name": "angular",
"version": "2.0.0-alpha.23"
"version": "2.0.0-alpha.24"
}

1005
npm-shrinkwrap.json generated

File diff suppressed because it is too large Load Diff

View File

@ -20,7 +20,7 @@
"url": "https://github.com/angular/angular.git"
},
"scripts": {
"postinstall": "webdriver-manager update && bower install && gulp pubget.dart && tsd reinstall --config modules/angular2/tsd.json && tsd reinstall --config tools/tsd.json",
"postinstall": "node tools/chromedriverpatch.js && webdriver-manager update && bower install && gulp pubget.dart && tsd reinstall --config modules/angular2/tsd.json && tsd reinstall --config tools/tsd.json",
"test": "gulp test.all.js && gulp test.all.dart"
},
"dependencies": {
@ -96,7 +96,7 @@
"mock-fs": "^2.5.0",
"node-html-encoder": "0.0.2",
"parse5": "1.3.2",
"protractor": "2.0.0",
"protractor": "2.1.0",
"q": "^1.0.1",
"react": "^0.13.2",
"rewire": "^2.3.3",

View File

@ -0,0 +1,23 @@
/**
* Patch Protractor so that it uses ChromeDriver 2.14 instead of 2.15.
*
* This is necessary because as of v2.1.0, Protractor by default uses
* chromedriver 2.15. However, angular need to test against Dartium, which
* is an old version of Chromium which is incompatible with Chromedriver > 2.14.
*
* TODO(juliemr): Remove this script once Dartium has been updated.
*/
var fs = require('fs');
var path = require('path');
var protractorConfigFile = path.resolve(require.resolve('protractor'), '../../config.json');
var newConfig = {
"webdriverVersions": {
"selenium": "2.45.0",
"chromedriver": "2.14",
"iedriver": "2.45.0"
}
}
fs.writeFile(protractorConfigFile, JSON.stringify(newConfig));