Merge pull request #1625 from fippo/fix-jest

Fix jest interop tests

Author: fippo

.github/workflows/interop-tests.yml

@@ -18,4 +18,4 @@ jobs:
     - run: BROWSER=${{matrix.browserA}} BVER=${{matrix.bver}} ./node_modules/travis-multirunner/setup.sh
     - run: BROWSER=${{matrix.browserB}} BVER=${{matrix.bver}} ./node_modules/travis-multirunner/setup.sh
     - run: Xvfb :99 &
-    - run: BROWSER_A=${{matrix.browserA}} BROWSER_B=${{matrix.browserB}} BVER=${{matrix.bver}} DISPLAY=:99.0 node_modules/.bin/jest --retries=3 test/interop/connection.js
+    - run: BROWSER_A=${{matrix.browserA}} BROWSER_B=${{matrix.browserB}} BVER=${{matrix.bver}} DISPLAY=:99.0 node_modules/.bin/jest --retries=3 test/interop/

test/interop/connection.js renamed to test/interop/connection.test.js

@@ -15,7 +15,7 @@ const browserB = process.env.BROWSER_B || 'chrome';
 describe(`basic interop test ${browserA} => ${browserB}`, function() {
     let drivers;
     let clients;
-    before(async () => {
+    beforeAll(async () => {
         const options = {
             version: process.env.BVER || 'stable',
             browserLogging: true,
@@ -31,7 +31,7 @@ describe(`basic interop test ${browserA} => ${browserB}`, function() {
             };
         });
     });
-    after(async () => {
+    afterAll(async () => {
         await drivers.map(driver => driver.close());
     });
 
@@ -52,5 +52,5 @@ describe(`basic interop test ${browserA} => ${browserB}`, function() {
 
         await steps.step(drivers, (d) => steps.waitNVideosExist(d, 1), 'Video elements exist');
         await steps.step(drivers, steps.waitAllVideosHaveEnoughData, 'Video elements have enough data');
-    }).timeout(30000);
-}).timeout(90000);;
+    }, 30000);
+}, 90000);

test/webdriver.js

@@ -19,7 +19,7 @@ if (os.platform() === 'win32') {
   process.env.PATH += ':node_modules/.bin';
 }
 
-function buildDriver(browser = process.env.BROWSER || 'chrome', options = {bver: process.env.BVER}) {
+function buildDriver(browser = process.env.BROWSER || 'chrome', options = {version: process.env.BVER}) {
   // Chrome options.
   const chromeOptions = new chrome.Options()
       .addArguments('allow-insecure-localhost')
@@ -66,7 +66,7 @@ function buildDriver(browser = process.env.BROWSER || 'chrome', options = {bver:
   }
 
   const safariOptions = new safari.Options();
-  safariOptions.setTechnologyPreview(options.bver === 'unstable');
+  safariOptions.setTechnologyPreview(options.version === 'unstable');
 
   // Firefox options.
   const firefoxOptions = new firefox.Options();