diff --git a/src/cli/argument-parser/index.ts b/src/cli/argument-parser/index.ts index 5c1f0e7266d..60c0a5f4231 100644 --- a/src/cli/argument-parser/index.ts +++ b/src/cli/argument-parser/index.ts @@ -44,8 +44,8 @@ const REMOTE_ALIAS_RE = /^remote(?::(\d*))?$/; const DESCRIPTION = dedent(` To select a browser, specify an alias ("ie", "chrome", etc.) or the path to the browser executable. You can select more than one browser. - - Use the "all" alias to run tests against all available browsers. + + Use the "all" alias to run tests against all available browsers. Use the "remote" alias to run tests on remote devices, like smartphones or tablets. Specify the number of remote browsers after the semicolon ("remote:3"). If you use a browser provider plugin, specify both the name of the plugin and the name of the browser. Separate the two with a semicolon ("saucelabs:chrome@51"). @@ -167,7 +167,7 @@ export default class CLIArgumentParser { .option('--test-meta ', 'filter tests by metadata') .option('--fixture-meta ', 'filter fixtures by metadata') .option('--debug-on-fail', 'pause tests on failure') - .option('--experimental-proxyless', 'enable proxyless mode: https://testcafe.io/documentation/404237/guides/experimental-capabilities/proxyless-mode') + .option('--proxyless', 'enable proxyless mode') .option('--app-init-delay ', 'specify your application`s initialization time') .option('--selector-timeout ', 'specify the maximum Selector resolution time') .option('--assertion-timeout ', 'specify the maximum Assertion resolution time') diff --git a/src/cli/cli.js b/src/cli/cli.js index 376efe52cce..2bfa8ab08e8 100644 --- a/src/cli/cli.js +++ b/src/cli/cli.js @@ -85,7 +85,6 @@ async function runTests (argParser) { cache, disableHttp2, v8Flags, - experimentalProxyless, disableCrossDomain, experimentalEsm, } = opts; @@ -104,7 +103,6 @@ async function runTests (argParser) { configFile, disableHttp2, v8Flags, - experimentalProxyless, disableCrossDomain, experimentalEsm, }); diff --git a/src/configuration/option-names.ts b/src/configuration/option-names.ts index b8c6852b83b..ae22e51a257 100644 --- a/src/configuration/option-names.ts +++ b/src/configuration/option-names.ts @@ -44,7 +44,7 @@ enum OptionNames { debugLogger = 'debugLogger', disableMultipleWindows = 'disableMultipleWindows', disableHttp2 = 'disableHttp2', - experimentalProxyless = 'experimentalProxyless', + proxyless = 'proxyless', experimentalDebug = 'experimentalDebug', compilerOptions = 'compilerOptions', pageRequestTimeout = 'pageRequestTimeout', diff --git a/src/configuration/run-option-names.ts b/src/configuration/run-option-names.ts index c887bc1f9e4..9ba92fa0e80 100644 --- a/src/configuration/run-option-names.ts +++ b/src/configuration/run-option-names.ts @@ -21,6 +21,6 @@ export default [ OPTION_NAMES.pageRequestTimeout, OPTION_NAMES.ajaxRequestTimeout, OPTION_NAMES.retryTestPages, - OPTION_NAMES.experimentalProxyless, + OPTION_NAMES.proxyless, OPTION_NAMES.baseUrl, ]; diff --git a/src/configuration/testcafe-configuration.ts b/src/configuration/testcafe-configuration.ts index 627b91f7190..c331e5529e4 100644 --- a/src/configuration/testcafe-configuration.ts +++ b/src/configuration/testcafe-configuration.ts @@ -68,7 +68,7 @@ const OPTION_INIT_FLAG_NAMES = [ OPTION_NAMES.retryTestPages, OPTION_NAMES.cache, OPTION_NAMES.disableHttp2, - OPTION_NAMES.experimentalProxyless, + OPTION_NAMES.proxyless, OPTION_NAMES.disableCrossDomain, ]; @@ -113,7 +113,7 @@ export default class TestCafeConfiguration extends Configuration { await this.asyncMergeOptions(options); - const proxyless = this.getOption(OPTION_NAMES.experimentalProxyless); + const proxyless = this.getOption(OPTION_NAMES.proxyless); if (proxyless) this._ensureOptionWithValue(OPTION_NAMES.hostname, LOCALHOST_NAMES.LOCALHOST, OptionSource.Input); @@ -168,14 +168,14 @@ export default class TestCafeConfiguration extends Configuration { cache: this.getOption(OPTION_NAMES.cache), disableHttp2: this.getOption(OPTION_NAMES.disableHttp2), disableCrossDomain: this.getOption(OPTION_NAMES.disableCrossDomain), - proxyless: this.getOption(OPTION_NAMES.experimentalProxyless), + proxyless: this.getOption(OPTION_NAMES.proxyless), }; } public get browserConnectionGatewayOptions (): BrowserConnectionGatewayOptions { return { retryTestPages: this.getOption(OPTION_NAMES.retryTestPages), - proxyless: this.getOption(OPTION_NAMES.experimentalProxyless), + proxyless: this.getOption(OPTION_NAMES.proxyless), }; } @@ -277,7 +277,7 @@ export default class TestCafeConfiguration extends Configuration { this._ensureOptionWithValue(OPTION_NAMES.developmentMode, DEFAULT_DEVELOPMENT_MODE, OptionSource.Configuration); this._ensureOptionWithValue(OPTION_NAMES.retryTestPages, DEFAULT_RETRY_TEST_PAGES, OptionSource.Configuration); this._ensureOptionWithValue(OPTION_NAMES.disableHttp2, DEFAULT_DISABLE_HTTP2, OptionSource.Configuration); - this._ensureOptionWithValue(OPTION_NAMES.experimentalProxyless, DEFAULT_PROXYLESS, OptionSource.Configuration); + this._ensureOptionWithValue(OPTION_NAMES.proxyless, DEFAULT_PROXYLESS, OptionSource.Configuration); this._ensureOptionWithValue(OPTION_NAMES.disableCrossDomain, DEFAULT_DISABLE_CROSS_DOMAIN, OptionSource.Configuration); this._ensureScreenshotOptions(); diff --git a/src/runner/bootstrapper.ts b/src/runner/bootstrapper.ts index aa548fde51a..4ff0cd3931f 100644 --- a/src/runner/bootstrapper.ts +++ b/src/runner/bootstrapper.ts @@ -210,7 +210,7 @@ export default class Bootstrapper { if (remotes && remotes.length % this.concurrency) throw new GeneralError(RUNTIME_ERRORS.cannotDivideRemotesCountByConcurrency); - this.proxyless = this.configuration.getOption(OPTION_NAMES.experimentalProxyless); + this.proxyless = this.configuration.getOption(OPTION_NAMES.proxyless); await this._setupProxy(); diff --git a/src/runner/task/index.ts b/src/runner/task/index.ts index 0e77dfd17d7..f9779876afa 100644 --- a/src/runner/task/index.ts +++ b/src/runner/task/index.ts @@ -81,7 +81,7 @@ export default class Task extends AsyncEventEmitter { this._pendingBrowserJobs = this._createBrowserJobs(proxy, this.opts); this.testStructure = this._prepareTestStructure(tests); - this.registerClientScriptRouting(!!this.opts.experimentalProxyless); + this.registerClientScriptRouting(!!this.opts.proxyless); if (this.opts.videoPath) { const { videoPath, videoOptions, videoEncodingOptions } = this.opts; diff --git a/src/test-run/index.ts b/src/test-run/index.ts index 5d267501541..4a921bc7b94 100644 --- a/src/test-run/index.ts +++ b/src/test-run/index.ts @@ -375,7 +375,7 @@ export default class TestRun extends AsyncEventEmitter { } public isProxyless (): boolean { - return !!this.opts.experimentalProxyless; + return !!this.opts.proxyless; } private _getRequestHookEventProvider (): RequestHookEventProvider { diff --git a/test/functional/fixtures/api/es-next/global-hooks/test.js b/test/functional/fixtures/api/es-next/global-hooks/test.js index 28314f5b7c7..beb316d3422 100644 --- a/test/functional/fixtures/api/es-next/global-hooks/test.js +++ b/test/functional/fixtures/api/es-next/global-hooks/test.js @@ -20,7 +20,7 @@ const runTestsLocal = (testName) => { .filter(test => { return testName ? test === testName : true; }) - .run({ experimentalProxyless: config.proxyless }) + .run({ proxyless: config.proxyless }) .then(failedCount => { const taskReport = JSON.parse(stream.data); const testReport = taskReport.fixtures.length === 1 ? diff --git a/test/functional/fixtures/browser-provider/browser-reconnect/run-log-error-on-disconnect-test.js b/test/functional/fixtures/browser-provider/browser-reconnect/run-log-error-on-disconnect-test.js index 08696a0675a..d9dcb952d5b 100644 --- a/test/functional/fixtures/browser-provider/browser-reconnect/run-log-error-on-disconnect-test.js +++ b/test/functional/fixtures/browser-provider/browser-reconnect/run-log-error-on-disconnect-test.js @@ -24,7 +24,7 @@ createTestCafe() return testName === 'Should log error on browser disconnect'; }) .reporter(shouldAttachReporter ? reporter : []) - .run({ experimentalProxyless: config.proxyless }); + .run({ proxyless: config.proxyless }); }) .catch(function () { return testcafe.close(); diff --git a/test/functional/fixtures/browser-provider/browser-reconnect/test.js b/test/functional/fixtures/browser-provider/browser-reconnect/test.js index feedd0e97e3..57a410e01fd 100644 --- a/test/functional/fixtures/browser-provider/browser-reconnect/test.js +++ b/test/functional/fixtures/browser-provider/browser-reconnect/test.js @@ -71,7 +71,7 @@ function run (pathToTest, filter, initializeConnection = initializeConnectionLow .filter(testName => testName === filter) .reporter(reporter) .browsers(connection) - .run({ experimentalProxyless: config.proxyless }); + .run({ proxyless: config.proxyless }); }); } diff --git a/test/functional/fixtures/browser-provider/chrome-emulation/test.js b/test/functional/fixtures/browser-provider/chrome-emulation/test.js index 6ae649de270..2927da04f7c 100644 --- a/test/functional/fixtures/browser-provider/chrome-emulation/test.js +++ b/test/functional/fixtures/browser-provider/chrome-emulation/test.js @@ -20,7 +20,7 @@ if (config.useLocalBrowsers && config.hasBrowser('chrome')) { .filter(fixtureName => fixtureName === 'Check presence of touch event handlers') .reporter('minimal', createNullStream()) .browsers(browserAlias) - .run({ experimentalProxyless: config.proxyless }); + .run({ proxyless: config.proxyless }); expect(failedCount).eql(0); } @@ -50,7 +50,7 @@ if (config.useLocalBrowsers && config.hasBrowser('chrome')) { .src(path.join(__dirname, './testcafe-fixtures/index-test.js')) .reporter(reporter) .browsers('chrome:headless:emulation:device=iphone X --no-sandbox') - .run({ experimentalProxyless: config.proxyless }); + .run({ proxyless: config.proxyless }); expect(prettyUserAgents.length).eql(1); expect(prettyUserAgents[0]).endsWith('(Emulating iPhone X)'); diff --git a/test/functional/fixtures/browser-provider/custom-profile/test.js b/test/functional/fixtures/browser-provider/custom-profile/test.js index 948aaf65400..7c7bbbbe85d 100644 --- a/test/functional/fixtures/browser-provider/custom-profile/test.js +++ b/test/functional/fixtures/browser-provider/custom-profile/test.js @@ -15,7 +15,7 @@ if (config.useLocalBrowsers && !config.useHeadlessBrowsers && !config.hasBrowser .src(path.join(__dirname, './testcafe-fixtures/index-test.js')) .reporter('minimal', createNullStream()) .browsers('chrome:userProfile', 'firefox:userProfile') - .run({ experimentalProxyless: config.proxyless }) + .run({ proxyless: config.proxyless }) .then(failedCount => { expect(failedCount).eql(0); }); @@ -30,7 +30,7 @@ if (config.useLocalBrowsers && !config.useHeadlessBrowsers && !config.hasBrowser .src(path.join(__dirname, './testcafe-fixtures/index-test.js')) .reporter('minimal', createNullStream()) .browsers(`chrome --user-data-dir=${chromeProfile.name}`, `firefox -profile ${firefoxProfile.name}`) - .run({ experimentalProxyless: config.proxyless }); + .run({ proxyless: config.proxyless }); }) .then(failedCount => { expect(failedCount).eql(0); diff --git a/test/functional/fixtures/browser-provider/job-reporting/test.js b/test/functional/fixtures/browser-provider/job-reporting/test.js index 9260cef001b..99b9d8d487e 100644 --- a/test/functional/fixtures/browser-provider/job-reporting/test.js +++ b/test/functional/fixtures/browser-provider/job-reporting/test.js @@ -78,7 +78,7 @@ if (config.useLocalBrowsers && !config.hasBrowser('ie')) { end: noop, }) .browsers(browsers) - .run({ experimentalProxyless: config.proxyless }); + .run({ proxyless: config.proxyless }); } before(function () { diff --git a/test/functional/fixtures/concurrency/test.js b/test/functional/fixtures/concurrency/test.js index d00f0044da7..98361ad68a6 100644 --- a/test/functional/fixtures/concurrency/test.js +++ b/test/functional/fixtures/concurrency/test.js @@ -42,7 +42,7 @@ if (config.useLocalBrowsers) { }) .browsers(browsers) .concurrency(concurrency) - .run({ experimentalProxyless: config.proxyless }); + .run({ proxyless: config.proxyless }); } function createConnections (count) { diff --git a/test/functional/fixtures/live/test.js b/test/functional/fixtures/live/test.js index 7ce475e06e4..2abc3ab7cda 100644 --- a/test/functional/fixtures/live/test.js +++ b/test/functional/fixtures/live/test.js @@ -96,7 +96,7 @@ if (config.useLocalBrowsers) { }, 1000); }); - return runner.run({ experimentalProxyless: config.proxyless }); + return runner.run({ proxyless: config.proxyless }); }) .then(() => { expect(helper.counter).eql(config.browsers.length * helper.testCount * runCount); @@ -117,8 +117,8 @@ if (config.useLocalBrowsers) { }); return runner.run({ - quarantineMode: true, - experimentalProxyless: config.proxyless, + quarantineMode: true, + proxyless: config.proxyless, }); }) .then(() => { @@ -145,7 +145,7 @@ if (config.useLocalBrowsers) { }, 1000); }); - return runner.run({ experimentalProxyless: config.proxyless }); + return runner.run({ proxyless: config.proxyless }); }) .then(() => { return cafe.close(); @@ -174,7 +174,7 @@ if (config.useLocalBrowsers) { return runner .browsers(config.browsers.map(browserInfo => browserInfo.browserName)) .src(path.join(__dirname, '/testcafe-fixtures/test-2.js')) - .run({ experimentalProxyless: config.proxyless }) + .run({ proxyless: config.proxyless }) .then(() => { return cafe.close(); }) @@ -185,7 +185,7 @@ if (config.useLocalBrowsers) { }, 10000); return runner - .run({ experimentalProxyless: config.proxyless }); + .run({ proxyless: config.proxyless }); }); return promise; @@ -234,7 +234,7 @@ if (config.useLocalBrowsers) { }); return runner - .run({ experimentalProxyless: config.proxyless }) + .run({ proxyless: config.proxyless }) .then(() => { return cafe.close(); }); @@ -252,7 +252,7 @@ if (config.useLocalBrowsers) { }, 1000); }); - await runner.run({ experimentalProxyless: config.proxyless }); + await runner.run({ proxyless: config.proxyless }); return cafe.close(); }); @@ -288,7 +288,7 @@ if (config.useLocalBrowsers) { expect(inTestProcessName).eql(ProcessTitle.service); }, 1000); - return runner.run({ experimentalProxyless: config.proxyless }); + return runner.run({ proxyless: config.proxyless }); }) .then(() => { if (fs.existsSync(markerFile)) diff --git a/test/functional/fixtures/proxyless/test.js b/test/functional/fixtures/proxyless/test.js index 089116a2183..47c249175ca 100644 --- a/test/functional/fixtures/proxyless/test.js +++ b/test/functional/fixtures/proxyless/test.js @@ -5,7 +5,7 @@ const config = require('../../config.js'); let testCafe = null; -async function runTest ({ browsers, test, experimentalProxyless }) { +async function runTest ({ browsers, test, proxyless }) { const runner = testCafe.createRunner(); const source = path.join(__dirname, './testcafe-fixtures/index.js'); @@ -14,7 +14,7 @@ async function runTest ({ browsers, test, experimentalProxyless }) { .filter(testName => { return testName ? test === testName : true; }) - .run({ experimentalProxyless }); + .run({ proxyless }); if (failedCount) throw new Error('Error has occurred.'); @@ -39,14 +39,14 @@ if (thereAreAllRequiredBrowsers) { return runTest({ browsers: 'chrome', test: 'Disabled' }); }); - it('Enabled with the "experimentalProxyless" option', function () { - return runTest({ browsers: 'chrome', test: 'Enabled', experimentalProxyless: true }); + it('Enabled with the "proxyless" option', function () { + return runTest({ browsers: 'chrome', test: 'Enabled', proxyless: true }); }); it('Should throw error on running with unsupported browser', function () { let errorIsRaised = false; - return runTest({ browsers: ['chrome', 'firefox'], test: 'Disabled', experimentalProxyless: true }) + return runTest({ browsers: ['chrome', 'firefox'], test: 'Disabled', proxyless: true }) .catch(err => { errorIsRaised = true; diff --git a/test/functional/fixtures/regression/gh-3049/test.js b/test/functional/fixtures/regression/gh-3049/test.js index 2e698838e3d..d0c21585c6e 100644 --- a/test/functional/fixtures/regression/gh-3049/test.js +++ b/test/functional/fixtures/regression/gh-3049/test.js @@ -19,7 +19,7 @@ if (isLocalChrome) { return testCafe.createRunner() .browsers(`chrome${headless} --window-size=1,1`) .src(path.join(__dirname, './testcafe-fixtures/index.js')) - .run({ experimentalProxyless: config.proxyless }); + .run({ proxyless: config.proxyless }); }) .then(failed => { failedCount = failed; diff --git a/test/functional/fixtures/regression/gh-3456/test.js b/test/functional/fixtures/regression/gh-3456/test.js index c06c7a04fc3..0d70551d196 100644 --- a/test/functional/fixtures/regression/gh-3456/test.js +++ b/test/functional/fixtures/regression/gh-3456/test.js @@ -27,7 +27,7 @@ if (config.useLocalBrowsers) { .src(fixturePath) .browsers(browsers) .screenshots(SCREENSHOTS_PATH) - .run({ experimentalProxyless: config.proxyless }); + .run({ proxyless: config.proxyless }); }) .then(failedCount => { expect(failedCount).eql(0); diff --git a/test/functional/fixtures/regression/gh-3929/test.js b/test/functional/fixtures/regression/gh-3929/test.js index df81328f4fa..32b2cb5033a 100644 --- a/test/functional/fixtures/regression/gh-3929/test.js +++ b/test/functional/fixtures/regression/gh-3929/test.js @@ -17,7 +17,7 @@ if (config.useLocalBrowsers && !config.useHeadlessBrowsers) { return testCafe.createRunner() .browsers(`chrome`) .src(path.join(__dirname, './testcafe-fixtures/index.js')) - .run({ experimentalProxyless: config.proxyless }); + .run({ proxyless: config.proxyless }); }) .then(failed => { failedCount = failed; diff --git a/test/functional/fixtures/regression/gh-4675/test.js b/test/functional/fixtures/regression/gh-4675/test.js index 030106cf496..73c51760271 100644 --- a/test/functional/fixtures/regression/gh-4675/test.js +++ b/test/functional/fixtures/regression/gh-4675/test.js @@ -29,7 +29,7 @@ if (config.useLocalBrowsers && !config.useHeadlessBrowsers) { .browsers(`chrome`) .src(path.join(__dirname, './testcafe-fixtures/index.js')) .reporter([customReporter('custom1'), customReporter('custom2')]) - .run({ experimentalProxyless: config.proxyless }); + .run({ proxyless: config.proxyless }); }) .catch(err => { error = err; diff --git a/test/functional/fixtures/regression/gh-4787/test.js b/test/functional/fixtures/regression/gh-4787/test.js index e402a0c149b..6c143ec92a4 100644 --- a/test/functional/fixtures/regression/gh-4787/test.js +++ b/test/functional/fixtures/regression/gh-4787/test.js @@ -53,7 +53,7 @@ if (config.useLocalBrowsers && !config.useHeadlessBrowsers) { .src(path.join(__dirname, './testcafe-fixtures/index.js')) .browsers(['chrome', 'firefox']) .reporter(reporter) - .run({ experimentalProxyless: config.proxyless }); + .run({ proxyless: config.proxyless }); }) .then(() => { return cafe.close(); diff --git a/test/functional/fixtures/regression/gh-5239/test.js b/test/functional/fixtures/regression/gh-5239/test.js index 4a9fba87e37..3ae754e27f8 100644 --- a/test/functional/fixtures/regression/gh-5239/test.js +++ b/test/functional/fixtures/regression/gh-5239/test.js @@ -50,7 +50,7 @@ async function run ({ src, browsers, retryTestPages, reporter }) { if (reporter) runner.reporter(reporter); - await runner.run({ experimentalProxyless: config.proxyless }); + await runner.run({ proxyless: config.proxyless }); await testcafe.close(); } diff --git a/test/functional/fixtures/regression/gh-5549/test.js b/test/functional/fixtures/regression/gh-5549/test.js index cbd3d4c034e..ec74e413c38 100644 --- a/test/functional/fixtures/regression/gh-5549/test.js +++ b/test/functional/fixtures/regression/gh-5549/test.js @@ -18,7 +18,7 @@ if (config.useLocalBrowsers) { .createRunner() .browsers('chrome:headless') .src(path.join(__dirname, './testcafe-fixtures/index.js')) - .run({ experimentalProxyless: config.proxyless }); + .run({ proxyless: config.proxyless }); }) .then(failed => { failedCount = failed; diff --git a/test/functional/fixtures/regression/hammerhead/gh-863/test.js b/test/functional/fixtures/regression/hammerhead/gh-863/test.js index 00621dbeae7..1364b78ab4d 100644 --- a/test/functional/fixtures/regression/hammerhead/gh-863/test.js +++ b/test/functional/fixtures/regression/hammerhead/gh-863/test.js @@ -79,7 +79,7 @@ async function run ({ src, browser }) { await testcafe.createRunner() .src(path.join(__dirname, src)) .browsers(browser) - .run({ experimentalProxyless: config.proxyless }); + .run({ proxyless: config.proxyless }); await testcafe.close(); } diff --git a/test/functional/fixtures/runner/test.js b/test/functional/fixtures/runner/test.js index b62c82a81e0..dd66b75aa1d 100644 --- a/test/functional/fixtures/runner/test.js +++ b/test/functional/fixtures/runner/test.js @@ -8,7 +8,7 @@ function run (browsers, testFile) { .createRunner() .src(path.join(__dirname, testFile)) .browsers(browsers) - .run({ experimentalProxyless: config.proxyless }); + .run({ proxyless: config.proxyless }); } describe('Runner', () => { diff --git a/test/functional/fixtures/video-recording/skip/ffmpeg-test.js b/test/functional/fixtures/video-recording/skip/ffmpeg-test.js index ad389edf971..05f7b3b8ab3 100644 --- a/test/functional/fixtures/video-recording/skip/ffmpeg-test.js +++ b/test/functional/fixtures/video-recording/skip/ffmpeg-test.js @@ -28,7 +28,7 @@ if (config.useLocalBrowsers) { .src('test/functional/fixtures/video-recording/skip/fixture.test.js') .browsers('chrome') .video('reports') - .run({ experimentalProxyless: config.proxyless }); + .run({ proxyless: config.proxyless }); }) .then(async () => { testcafe.close(); diff --git a/test/functional/setup.js b/test/functional/setup.js index f172dc1782e..a1c370bb98f 100644 --- a/test/functional/setup.js +++ b/test/functional/setup.js @@ -326,7 +326,7 @@ before(function () { runExecutionTimeout, baseUrl, customActions, - experimentalProxyless: config.proxyless, + proxyless: config.proxyless, }) .then(failedCount => { if (customReporters) diff --git a/test/functional/utils/run-tests-with-config.js b/test/functional/utils/run-tests-with-config.js index 5ff070b817a..53778e943e1 100644 --- a/test/functional/utils/run-tests-with-config.js +++ b/test/functional/utils/run-tests-with-config.js @@ -8,7 +8,7 @@ module.exports = async (testName, configPath) => { const cafe = await createTestCafe({ configFile: path.resolve(configPath) }); const runner = cafe.createRunner(); - const failedCount = await runner.run({ experimentalProxyless: config.proxyless }); + const failedCount = await runner.run({ proxyless: config.proxyless }); await cafe.close(); diff --git a/test/server/api-test.js b/test/server/api-test.js index 9a301853ccc..0b30df00003 100644 --- a/test/server/api-test.js +++ b/test/server/api-test.js @@ -1847,10 +1847,10 @@ describe('API', function () { test: 42, }, - developmentMode: true, - retryTestPages: true, - disableHttp2: true, - experimentalProxyless: true, + developmentMode: true, + retryTestPages: true, + disableHttp2: true, + proxyless: true, }); const configuration = TestCafe.firstCall.args[0]; @@ -1862,7 +1862,7 @@ describe('API', function () { expect(configuration.getOption(OPTION_NAMES.developmentMode)).be.true; expect(configuration.getOption(OPTION_NAMES.retryTestPages)).be.true; expect(configuration.getOption(OPTION_NAMES.disableHttp2)).be.true; - expect(configuration.getOption(OPTION_NAMES.experimentalProxyless)).be.true; + expect(configuration.getOption(OPTION_NAMES.proxyless)).be.true; }); }); }); diff --git a/test/server/cli-argument-parser-test.js b/test/server/cli-argument-parser-test.js index 0c87697b75f..66604cd59f5 100644 --- a/test/server/cli-argument-parser-test.js +++ b/test/server/cli-argument-parser-test.js @@ -753,7 +753,7 @@ describe('CLI argument parser', function () { }); it('Should parse command line arguments', function () { - return parse('-r list -S -q -e message=/testMessage/i,stack=testStack,pageUrl=testPageUrl --hostname myhost --base-url localhost:3000 --proxy localhost:1234 --proxy-bypass localhost:5678 --qr-code --app run-app --speed 0.5 --debug-on-fail --disable-page-reloads --retry-test-pages --dev --sf --disable-page-caching --disable-http2 --experimental-proxyless --disable-cross-domain ie test/server/data/file-list/file-1.js') + return parse('-r list -S -q -e message=/testMessage/i,stack=testStack,pageUrl=testPageUrl --hostname myhost --base-url localhost:3000 --proxy localhost:1234 --proxy-bypass localhost:5678 --qr-code --app run-app --speed 0.5 --debug-on-fail --disable-page-reloads --retry-test-pages --dev --sf --disable-page-caching --disable-http2 --proxyless --disable-cross-domain ie test/server/data/file-list/file-1.js') .then(parser => { expect(parser.opts.browsers).eql(['ie']); expect(parser.opts.src).eql(['test/server/data/file-list/file-1.js']); @@ -780,7 +780,7 @@ describe('CLI argument parser', function () { expect(parser.opts.retryTestPages).to.be.ok; expect(parser.opts.disableHttp2).to.be.ok; expect(parser.opts.disableCrossDomain).to.be.ok; - expect(parser.opts.experimentalProxyless).to.be.ok; + expect(parser.opts.proxyless).to.be.ok; expect(parser.opts.baseUrl).eql('localhost:3000'); }); }); @@ -856,7 +856,7 @@ describe('CLI argument parser', function () { { long: '--ajax-request-timeout' }, { long: '--cache' }, { long: '--disable-http2' }, - { long: '--experimental-proxyless' }, + { long: '--proxyless' }, { long: '--base-url' }, { long: '--disable-cross-domain' }, { long: '--experimental-esm' }, diff --git a/test/server/ipc-proxy-test.js b/test/server/ipc-proxy-test.js index 75a10ad26e2..c0ed6b776c7 100644 --- a/test/server/ipc-proxy-test.js +++ b/test/server/ipc-proxy-test.js @@ -5,7 +5,7 @@ const ServiceHost = require('./data/ipc-proxy/host'); describe('IPC Proxy', () => { let serviceHost = null; - afterEach(async () => { + afterEach(async function () { if (serviceHost) await serviceHost.close(); });