diff --git a/azure-pipelines.yml b/azure-pipelines.yml index c86f483380f..ba9f05456b1 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -2,22 +2,19 @@ pool: 'BrowserStack agents' steps: - bash: | - if [[ $BUILD_SOURCEVERSIONMESSAGE =~ ^\[docs\] ]] || [[ ! -f "appveyor.yml" ]]; then + if [[ $BUILD_SOURCEVERSIONMESSAGE =~ ^\[docs\] ]] || [[ ! -f "appveyor.yml" ]]; then echo '##vso[task.setvariable variable=isDocCommit]true' fi displayName: 'Check commit type' - + - task: NodeTool@0 displayName: 'Install Node.js' condition: not(variables['isDocCommit']) inputs: versionSpec: '11.x' - + - bash: | - npm install + npm install || npm install || npm install npm test displayName: 'Run tests' condition: not(variables['isDocCommit']) - env: - BROWSER_STACK_USERNAME: $(BROWSER_STACK_USERNAME) - BROWSER_STACK_ACCESS_KEY: $(BROWSER_STACK_ACCESS_KEY) diff --git a/test/functional/config.js b/test/functional/config.js index 085f4eb627f..3e4d48185a6 100644 --- a/test/functional/config.js +++ b/test/functional/config.js @@ -49,12 +49,6 @@ testingEnvironments[testingEnvironmentNames.osXDesktopAndMSEdgeBrowsers] = { osVersion: 'High Sierra', name: 'firefox', alias: 'firefox-osx' - }, - { - os: 'Windows', - osVersion: '10', - name: 'edge', - alias: 'edge', } ] }; @@ -70,14 +64,6 @@ testingEnvironments[testingEnvironmentNames.mobileBrowsers] = { retryTestPages: true, browsers: [ - { - realMobile: true, - os: 'android', - osVersion: '8.0', - device: 'Google Pixel 2', - name: 'Android', - alias: 'android' - }, { realMobile: true, os: 'ios', diff --git a/test/functional/fixtures/api/es-next/generic-errors/test.js b/test/functional/fixtures/api/es-next/generic-errors/test.js index af02022f265..a5d7c9ac862 100644 --- a/test/functional/fixtures/api/es-next/generic-errors/test.js +++ b/test/functional/fixtures/api/es-next/generic-errors/test.js @@ -51,7 +51,7 @@ describe('[API] Generic errors', function () { describe('External assertion library error', function () { it('Should handle Node built-in assertion lib error', function () { const NODE_11_ASSERTION_MESSAGE = [ - 'AssertionError [ERR_ASSERTION]: Input A expected to strictly equal input B:', + 'AssertionError [ERR_ASSERTION]: Expected values to be strictly equal:', '+ actual - expected', '', '+ \'answer\'', diff --git a/test/functional/fixtures/api/es-next/page-load-timeout/pages/window-load-long.html b/test/functional/fixtures/api/es-next/page-load-timeout/pages/window-load-long.html index 8eee77a202c..44d15ab1ac9 100644 --- a/test/functional/fixtures/api/es-next/page-load-timeout/pages/window-load-long.html +++ b/test/functional/fixtures/api/es-next/page-load-timeout/pages/window-load-long.html @@ -4,13 +4,14 @@ PageLoadTimeout (window load long) - + + diff --git a/test/functional/fixtures/api/es-next/page-load-timeout/pages/window-load.html b/test/functional/fixtures/api/es-next/page-load-timeout/pages/window-load.html index 716a41f3cb1..cd57a56c916 100644 --- a/test/functional/fixtures/api/es-next/page-load-timeout/pages/window-load.html +++ b/test/functional/fixtures/api/es-next/page-load-timeout/pages/window-load.html @@ -4,11 +4,11 @@ PageLoadTimeout (window load) - + diff --git a/test/functional/fixtures/api/es-next/page-load-timeout/test.js b/test/functional/fixtures/api/es-next/page-load-timeout/test.js index da33c37c605..5bf18f0dff9 100644 --- a/test/functional/fixtures/api/es-next/page-load-timeout/test.js +++ b/test/functional/fixtures/api/es-next/page-load-timeout/test.js @@ -1,6 +1,6 @@ describe('Should wait for the window.load event if necessary', function () { it('Should wait for the window.load event if there are user event handlers for it (set timeout via an option)', function () { - return runTests('testcafe-fixtures/index-test.js', 'Wait for window.load (set timeout via an option)', { pageLoadTimeout: 5000 }); + return runTests('testcafe-fixtures/index-test.js', 'Wait for window.load (set timeout via an option)', { pageLoadTimeout: 10000 }); }); it('Should wait for the window.load event if there are user event handlers for it (set timeout via `t`)', function () { diff --git a/test/functional/fixtures/api/es-next/page-load-timeout/testcafe-fixtures/index-test.js b/test/functional/fixtures/api/es-next/page-load-timeout/testcafe-fixtures/index-test.js index fbbc84f7c9f..f7dd50e8100 100644 --- a/test/functional/fixtures/api/es-next/page-load-timeout/testcafe-fixtures/index-test.js +++ b/test/functional/fixtures/api/es-next/page-load-timeout/testcafe-fixtures/index-test.js @@ -11,7 +11,7 @@ test test ('Wait for window.load (set timeout via `t`)', async t => { await t - .setPageLoadTimeout(5000) + .setPageLoadTimeout(10000) .navigateTo('http://localhost:3000/fixtures/api/es-next/page-load-timeout/pages/window-load.html') .expect(ClientFunction(() => window.loadEventRaised)()).ok('Test started before window.load', { timeout: 0 }); }); @@ -19,7 +19,7 @@ test test ('Wait for window.load in iframe', async t => { await t - .setPageLoadTimeout(5000) + .setPageLoadTimeout(10000) .navigateTo('http://localhost:3000/fixtures/api/es-next/page-load-timeout/pages/with-iframe.html') .switchToIframe('#iframe') .expect(ClientFunction(() => window.loadEventRaised)()).ok('Test started before window.load', { timeout: 0 });