Try to fix

DevExpress · Oct 24, 2018 · 1179838 · 1179838
1 parent fd42bf3
commit 1179838
Show file tree

Hide file tree

Showing 7 changed files with 13 additions and 29 deletions.
diff --git 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
@@ -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
@@ -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
@@ -4,13 +4,14 @@
     <title>PageLoadTimeout (window load long)</title>
 </head>
 <body>
-<img src="./img.png?delay=10000" />
 <script>
-    window.pageOpenedTime = Date.now();
-
     window.addEventListener('load', function () {
         window.loadEventRaised = true;
     });
 </script>
+<img src="./img.png?delay=10000" />
+<script>
+    window.pageOpenedTime = Date.now();
+</script>
 </body>
 </html>
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
@@ -4,11 +4,11 @@
     <title>PageLoadTimeout (window load)</title>
 </head>
 <body>
-<img src="./img.png?delay=1000" />
 <script>
     window.addEventListener('load', function () {
         window.loadEventRaised = true;
     });
 </script>
+<img src="./img.png?delay=1000" />
 </body>
 </html>
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
@@ -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
@@ -11,15 +11,15 @@ 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 });
 });
 
 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 });