chore: Bump chai and chai-as-promised (#2414)

* bump chai * ignoer ts lint * update tests and remove unnecessary dependencies
appium · Jun 27, 2024 · 6ba1b5e · 6ba1b5e
1 parent 345604a
commit 6ba1b5e
Show file tree

Hide file tree

Showing 49 changed files with 620 additions and 424 deletions.
diff --git a/package.json b/package.json
@@ -143,19 +143,14 @@
     "@semantic-release/changelog": "^6.0.3",
     "@semantic-release/git": "^10.0.1",
     "@types/bluebird": "^3.5.38",
-    "@types/chai": "^4.3.5",
-    "@types/chai-as-promised": "^7.1.5",
     "@types/lodash": "^4.14.196",
     "@types/mocha": "^10.0.1",
     "@types/node": "^20.4.7",
     "@types/portscanner": "^2.1.1",
-    "@types/sinon": "^17.0.0",
-    "@types/sinon-chai": "^3.2.9",
     "@types/teen_process": "^2.0.1",
     "axios": "^1.4.0",
-    "chai": "^4.3.7",
-    "chai-as-promised": "^7.1.1",
-    "chai-subset": "^1.6.0",
+    "chai": "^5.1.1",
+    "chai-as-promised": "^8.0.0",
     "conventional-changelog-conventionalcommits": "^8.0.0",
     "mocha": "^10.2.0",
     "mocha-junit-reporter": "^2.2.1",
@@ -166,7 +161,6 @@
     "semantic-release": "^24.0.0",
     "sharp": "^0.x",
     "sinon": "^18.0.0",
-    "sinon-chai": "^3.7.0",
     "ts-node": "^10.9.1",
     "type-fest": "^4.1.0",
     "typescript": "^5.4.2",

diff --git a/test/functional/basic/alert-e2e-specs.js b/test/functional/basic/alert-e2e-specs.js
@@ -1,18 +1,22 @@
-import chai from 'chai';
-import chaiAsPromised from 'chai-as-promised';
 import B from 'bluebird';
 import {retryInterval} from 'asyncbox';
 import {amendCapabilities, UICATALOG_CAPS} from '../desired';
 import {initSession, deleteSession, hasDefaultPrebuiltWDA, MOCHA_TIMEOUT} from '../helpers/session';
 
-chai.should();
-chai.use(chaiAsPromised);
 
 describe('XCUITestDriver - alerts -', function () {
   this.timeout(MOCHA_TIMEOUT);
 
   let driver;
+  let chai;
+
   before(async function () {
+    chai = await import('chai');
+    const chaiAsPromised = await import('chai-as-promised');
+
+    chai.should();
+    chai.use(chaiAsPromised.default);
+
     const caps = amendCapabilities(UICATALOG_CAPS, {
       'appium:usePrebuiltWDA': hasDefaultPrebuiltWDA(),
     });

diff --git a/test/functional/basic/basic-e2e-specs.js b/test/functional/basic/basic-e2e-specs.js
@@ -1,6 +1,3 @@
-import chai from 'chai';
-import chaiAsPromised from 'chai-as-promised';
-import chaiSubset from 'chai-subset';
 import B from 'bluebird';
 import util from 'util';
 import {retryInterval} from 'asyncbox';
@@ -9,15 +6,20 @@ import {initSession, deleteSession, hasDefaultPrebuiltWDA, MOCHA_TIMEOUT} from '
 import {GUINEA_PIG_PAGE} from '../web/helpers';
 import sharp from 'sharp';
 
-chai.should();
-chai.use(chaiAsPromised);
-chai.use(chaiSubset);
 
 describe('XCUITestDriver - basics -', function () {
   this.timeout(MOCHA_TIMEOUT);
 
   let driver;
+  let chai;
+
   before(async function () {
+    chai = await import('chai');
+    const chaiAsPromised = await import('chai-as-promised');
+
+    chai.should();
+    chai.use(chaiAsPromised.default);
+
     const caps = amendCapabilities(UICATALOG_CAPS, {
       'appium:usePrebuiltWDA': hasDefaultPrebuiltWDA(),
     });
@@ -144,7 +146,9 @@ describe('XCUITestDriver - basics -', function () {
       it('should get the list of available logs', async function () {
         const expectedTypes = ['syslog', 'crashlog', 'performance', 'server', 'safariConsole'];
         const actualTypes = await driver.getLogTypes();
-        actualTypes.should.containSubset(expectedTypes);
+        for (const actualType of actualTypes) {
+          expectedTypes.includes(actualType).should.be.true;
+        }
       });
     });
 

diff --git a/test/functional/basic/element-e2e-specs.js b/test/functional/basic/element-e2e-specs.js
@@ -1,20 +1,24 @@
-import chai from 'chai';
-import chaiAsPromised from 'chai-as-promised';
 import _ from 'lodash';
 import B from 'bluebird';
 import {retryInterval} from 'asyncbox';
 import {extractCapabilityValue, amendCapabilities, UICATALOG_CAPS} from '../desired';
 import {initSession, deleteSession, hasDefaultPrebuiltWDA, MOCHA_TIMEOUT} from '../helpers/session';
 import {util} from 'appium/support';
 
-chai.should();
-chai.use(chaiAsPromised);
 
 describe('XCUITestDriver - elements -', function () {
   this.timeout(MOCHA_TIMEOUT);
 
   let driver;
+  let chai;
+
   before(async function () {
+    chai = await import('chai');
+    const chaiAsPromised = await import('chai-as-promised');
+
+    chai.should();
+    chai.use(chaiAsPromised.default);
+
     const caps = amendCapabilities(UICATALOG_CAPS, {
       'appium:usePrebuiltWDA': hasDefaultPrebuiltWDA(),
     });

diff --git a/test/functional/basic/face-id-e2e-specs.js b/test/functional/basic/face-id-e2e-specs.js
@@ -1,15 +1,10 @@
-import chai from 'chai';
-import chaiAsPromised from 'chai-as-promised';
 import {amendCapabilities, FACEIDAPP_CAPS} from '../desired';
 import {initSession, deleteSession, hasDefaultPrebuiltWDA, MOCHA_TIMEOUT} from '../helpers/session';
 import B from 'bluebird';
 import {killAllSimulators} from '../helpers/simulator';
 import {CLASS_CHAIN_SEARCH} from '../helpers/element';
 import {waitForCondition} from 'asyncbox';
 
-chai.should();
-chai.use(chaiAsPromised);
-const expect = chai.expect;
 
 const DEFAULT_IMPLICIT_TIMEOUT_MS = 1000;
 const FACE_ID_SELECTOR = '**/XCUIElementTypeStaticText[`label == "Face ID"`]';
@@ -26,6 +21,17 @@ if (!process.env.CI) {
     this.timeout(MOCHA_TIMEOUT * 2);
     this.retries(MOCHA_RETRIES);
     let driver;
+    let chai;
+    let expect;
+
+    before(async function () {
+      chai = await import('chai');
+      const chaiAsPromised = await import('chai-as-promised');
+
+      chai.should();
+      chai.use(chaiAsPromised.default);
+      expect = chai.expect;
+    });
 
     beforeEach(async function () {
       await killAllSimulators();

diff --git a/test/functional/basic/find-e2e-specs.js b/test/functional/basic/find-e2e-specs.js
@@ -1,5 +1,3 @@
-import chai from 'chai';
-import chaiAsPromised from 'chai-as-promised';
 import B from 'bluebird';
 import _ from 'lodash';
 import {retryInterval} from 'asyncbox';
@@ -13,8 +11,6 @@ import {PREDICATE_SEARCH, CLASS_CHAIN_SEARCH} from '../helpers/element';
 import {initSession, deleteSession, hasDefaultPrebuiltWDA, MOCHA_TIMEOUT} from '../helpers/session';
 import {util} from 'appium/support';
 
-chai.should();
-chai.use(chaiAsPromised);
 
 const TEST_PAUSE_DURATION = 500;
 
@@ -28,7 +24,16 @@ describe('XCUITestDriver - find -', function () {
   this.timeout(MOCHA_TIMEOUT);
 
   let driver;
+  let chai;
+
   before(async function () {
+
+    chai = await import('chai');
+    const chaiAsPromised = await import('chai-as-promised');
+
+    chai.should();
+    chai.use(chaiAsPromised.default);
+
     const caps = amendCapabilities(UICATALOG_CAPS, {
       'appium:usePrebuiltWDA': hasDefaultPrebuiltWDA(),
     });

diff --git a/test/functional/basic/gesture-e2e-specs.js b/test/functional/basic/gesture-e2e-specs.js
@@ -1,21 +1,26 @@
-import chai from 'chai';
-import chaiAsPromised from 'chai-as-promised';
 import B from 'bluebird';
 import {retryInterval} from 'asyncbox';
 import {UICATALOG_CAPS, amendCapabilities} from '../desired';
 import {PREDICATE_SEARCH} from '../helpers/element';
 import {initSession, deleteSession, hasDefaultPrebuiltWDA, MOCHA_TIMEOUT} from '../helpers/session';
 import {APPIUM_IMAGE} from '../web/helpers';
 
-chai.should();
-chai.use(chaiAsPromised);
 
 const BTN_OK_CNCL = 'Okay / Cancel';
 
 describe('XCUITestDriver - gestures', function () {
   this.timeout(MOCHA_TIMEOUT);
 
   let driver;
+  let chai;
+
+  before(async function () {
+    chai = await import('chai');
+    const chaiAsPromised = await import('chai-as-promised');
+
+    chai.should();
+    chai.use(chaiAsPromised.default);
+  });
 
   describe('dynamic gestures', function () {
     before(async function () {

diff --git a/test/functional/basic/touch-id-e2e-specs.js b/test/functional/basic/touch-id-e2e-specs.js
@@ -1,15 +1,10 @@
-import chai from 'chai';
-import chaiAsPromised from 'chai-as-promised';
 import {amendCapabilities, TOUCHIDAPP_CAPS} from '../desired';
 import {initSession, deleteSession, hasDefaultPrebuiltWDA, MOCHA_TIMEOUT} from '../helpers/session';
 import B from 'bluebird';
 import {killAllSimulators} from '../helpers/simulator';
 import {CLASS_CHAIN_SEARCH} from '../helpers/element';
 import {waitForCondition} from 'asyncbox';
 
-chai.should();
-chai.use(chaiAsPromised);
-const expect = chai.expect;
 
 const DEFAULT_IMPLICIT_TIMEOUT_MS = 1000;
 const TOUCH_ID_SELECTOR = '**/XCUIElementTypeStaticText[`label == "Touch ID for “biometric”"`]';
@@ -23,6 +18,18 @@ if (!process.env.CI) {
     this.timeout(MOCHA_TIMEOUT * 2);
     this.retries(MOCHA_RETRIES);
     let driver;
+    let chai;
+    let expect;
+
+    before(async function () {
+      chai = await import('chai');
+      const chaiAsPromised = await import('chai-as-promised');
+
+      chai.should();
+      chai.use(chaiAsPromised.default);
+
+      expect = chai.expect;
+    });
 
     beforeEach(async function () {
       await killAllSimulators();

diff --git a/test/functional/device/accessibility-e2e-specs.js b/test/functional/device/accessibility-e2e-specs.js
@@ -1,17 +1,23 @@
-import chai from 'chai';
-import chaiAsPromised from 'chai-as-promised';
 import {PREDICATE_SEARCH} from '../helpers/element';
 import {MOCHA_TIMEOUT, initSession, deleteSession, hasDefaultPrebuiltWDA} from '../helpers/session';
 import {SETTINGS_CAPS, amendCapabilities} from '../desired';
 
-chai.should();
-chai.use(chaiAsPromised);
 
 describe('Accessibility', function () {
   this.timeout(MOCHA_TIMEOUT);
 
   let driver, caps;
 
+  let chai;
+
+  before(async function () {
+    chai = await import('chai');
+    const chaiAsPromised = await import('chai-as-promised');
+
+    chai.should();
+    chai.use(chaiAsPromised.default);
+  });
+
   beforeEach(function () {
     caps = amendCapabilities(SETTINGS_CAPS, {
       'appium:usePrebuiltWDA': hasDefaultPrebuiltWDA(),

diff --git a/test/functional/device/file-movement-e2e-specs.js b/test/functional/device/file-movement-e2e-specs.js
@@ -1,12 +1,8 @@
-import chai from 'chai';
-import chaiAsPromised from 'chai-as-promised';
 import {amendCapabilities, UICATALOG_CAPS} from '../desired';
 import {initSession, deleteSession, hasDefaultPrebuiltWDA, MOCHA_TIMEOUT} from '../helpers/session';
 import {fs, tempDir, zip} from 'appium/support';
 import path from 'path';
 
-chai.should();
-chai.use(chaiAsPromised);
 
 const UICAT_CONTAINER = `@com.example.apple-samplecode.UICatalog`;
 
@@ -19,7 +15,15 @@ describe('XCUITestDriver - file movement', function () {
   this.timeout(MOCHA_TIMEOUT);
 
   let driver;
+  let chai;
+
   before(async function () {
+    chai = await import('chai');
+    const chaiAsPromised = await import('chai-as-promised');
+
+    chai.should();
+    chai.use(chaiAsPromised.default);
+
     const caps = amendCapabilities(UICATALOG_CAPS, {
       'appium:usePrebuiltWDA': hasDefaultPrebuiltWDA(),
     });

diff --git a/test/functional/device/otherApps-e2e-specs.js b/test/functional/device/otherApps-e2e-specs.js
@@ -1,18 +1,22 @@
-import chai from 'chai';
-import chaiAsPromised from 'chai-as-promised';
 import {MOCHA_TIMEOUT, initSession, deleteSession, hasDefaultPrebuiltWDA} from '../helpers/session';
 import {MULTIPLE_APPS, amendCapabilities} from '../desired';
 
-chai.should();
-chai.use(chaiAsPromised);
 
 describe('OtherApps', function () {
   this.timeout(MOCHA_TIMEOUT);
 
   let caps;
 
   let driver;
-  before(function () {
+  let chai;
+
+  before(async function () {
+    chai = await import('chai');
+    const chaiAsPromised = await import('chai-as-promised');
+
+    chai.should();
+    chai.use(chaiAsPromised.default);
+
     caps = amendCapabilities(MULTIPLE_APPS, {
       'appium:usePrebuiltWDA': hasDefaultPrebuiltWDA(),
       'appium:wdaStartupRetries': 0,

diff --git a/test/functional/device/passwords-e2e-specs.js b/test/functional/device/passwords-e2e-specs.js
@@ -1,17 +1,23 @@
-import chai from 'chai';
-import chaiAsPromised from 'chai-as-promised';
 import {MOCHA_TIMEOUT, initSession, deleteSession, hasDefaultPrebuiltWDA} from '../helpers/session';
 import {UICATALOG_CAPS, amendCapabilities, extractCapabilityValue} from '../desired';
 import {util} from 'appium/support';
 
-chai.should();
-chai.use(chaiAsPromised);
 
 describe('Passwords', function () {
   this.timeout(MOCHA_TIMEOUT);
 
   let driver, caps;
 
+  let chai;
+
+  before(async function () {
+    chai = await import('chai');
+    const chaiAsPromised = await import('chai-as-promised');
+
+    chai.should();
+    chai.use(chaiAsPromised.default);
+  });
+
   beforeEach(function () {
     caps = amendCapabilities(UICATALOG_CAPS, {
       'appium:usePrebuiltWDA': hasDefaultPrebuiltWDA(),

diff --git a/test/functional/device/performance-e2e-specs.js b/test/functional/device/performance-e2e-specs.js
@@ -1,17 +1,22 @@
-import chai from 'chai';
-import chaiAsPromised from 'chai-as-promised';
 import B from 'bluebird';
 import {amendCapabilities, UICATALOG_CAPS} from '../desired';
 import {initSession, deleteSession, hasDefaultPrebuiltWDA, MOCHA_TIMEOUT} from '../helpers/session';
 
-chai.should();
-chai.use(chaiAsPromised);
 
 describe('XCUITestDriver - performance', function () {
   this.timeout(MOCHA_TIMEOUT);
   const profileName = 'Time Profiler';
 
   let driver;
+  let chai;
+
+  before(async function () {
+    chai = await import('chai');
+    const chaiAsPromised = await import('chai-as-promised');
+
+    chai.should();
+    chai.use(chaiAsPromised.default);
+  });
 
   describe('record performance metrics', function () {
     before(async function () {