Skip to content
This repository has been archived by the owner on Jul 29, 2024. It is now read-only.

Update to the latest blocking proxy #4546

Merged
merged 2 commits into from
Oct 18, 2017
Merged

Update to the latest blocking proxy #4546

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fc1402a
deps(bp): Update blocking proxy to 1.0.0
heathkit Oct 18, 2017
e324930
chore(tests): Re-enable blocking proxy tests.
heathkit Oct 18, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
"@types/node": "^6.0.46",
"@types/q": "^0.0.32",
"@types/selenium-webdriver": "~2.53.39",
"blocking-proxy": "0.0.5",
"blocking-proxy": "^1.0.0",
"chalk": "^1.1.3",
"glob": "^7.0.3",
"jasmine": "^2.5.3",
Expand Down
6 changes: 3 additions & 3 deletions scripts/test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ var Executor = require('./test/test_util').Executor;

var passingTests = [
'node built/cli.js spec/basicConf.js',
//'node built/cli.js spec/basicConf.js --useBlockingProxy',
'node built/cli.js spec/basicConf.js --useBlockingProxy',
'node built/cli.js spec/multiConf.js',
'node built/cli.js spec/altRootConf.js',
'node built/cli.js spec/inferRootConf.js',
Expand All @@ -32,15 +32,15 @@ var passingTests = [
'node built/cli.js spec/directConnectConf.js',
'node built/cli.js spec/restartBrowserBetweenTestsConf.js',
'node built/cli.js spec/driverProviderLocalConf.js',
//'node built/cli.js spec/driverProviderLocalConf.js --useBlockingProxy',
'node built/cli.js spec/driverProviderLocalConf.js --useBlockingProxy',
'node built/cli.js spec/getCapabilitiesConf.js',
'node built/cli.js spec/controlLockConf.js',
'node built/cli.js spec/customFramework.js',
'node built/cli.js spec/noGlobalsConf.js',
'node built/cli.js spec/angular2Conf.js',
'node built/cli.js spec/hybridConf.js',
'node built/cli.js spec/built/noCFBasicConf.js',
//'node built/cli.js spec/built/noCFBasicConf.js --useBlockingProxy',
'node built/cli.js spec/built/noCFBasicConf.js --useBlockingProxy',
'node built/cli.js spec/built/noCFPluginConf.js',
//'node scripts/driverProviderAttachSession.js',
'node scripts/errorTest.js',
Expand Down