npm - @appium/base-driver - Versions diffs - 8.3.0 → 8.3.1 - Mend

@appium/base-driver 8.3.0 → 8.3.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (110) hide show

package/build/lib/basedriver/capabilities.js +2 -4
package/build/lib/basedriver/commands/event.js +2 -4
package/build/lib/basedriver/commands/find.js +2 -4
package/build/lib/basedriver/commands/index.js +2 -4
package/build/lib/basedriver/commands/log.js +2 -4
package/build/lib/basedriver/commands/session.js +2 -4
package/build/lib/basedriver/commands/settings.js +2 -4
package/build/lib/basedriver/commands/timeout.js +2 -4
package/build/lib/basedriver/desired-caps.js +2 -4
package/build/lib/basedriver/device-settings.js +2 -4
package/build/lib/basedriver/driver.js +17 -6
package/build/lib/basedriver/helpers.js +2 -4
package/build/lib/basedriver/logger.js +2 -4
package/build/lib/constants.js +2 -4
package/build/lib/express/crash.js +2 -4
package/build/lib/express/express-logging.js +2 -4
package/build/lib/express/idempotency.js +2 -4
package/build/lib/express/logger.js +2 -4
package/build/lib/express/middleware.js +2 -4
package/build/lib/express/server.js +2 -4
package/build/lib/express/static.js +2 -4
package/build/lib/express/websocket.js +2 -4
package/build/lib/helpers/capabilities.js +2 -4
package/build/lib/index.js +2 -4
package/build/lib/jsonwp-proxy/protocol-converter.js +2 -4
package/build/lib/jsonwp-proxy/proxy.js +2 -4
package/build/lib/jsonwp-status/status.js +2 -4
package/build/lib/protocol/errors.js +2 -4
package/build/lib/protocol/helpers.js +2 -4
package/build/lib/protocol/index.js +2 -4
package/build/lib/protocol/protocol.js +2 -4
package/build/lib/protocol/routes.js +2 -4
package/build/lib/protocol/validators.js +2 -4
package/build/test/basedriver/README.md +5 -0
package/build/test/basedriver/driver-e2e-tests.js +2 -4
package/build/test/basedriver/driver-tests.js +2 -4
package/build/test/basedriver/index.js +2 -4
package/build/test/e2e/basedriver/driver.e2e.spec.js +15 -0
package/build/test/e2e/basedriver/helpers.e2e.spec.js +192 -0
package/build/test/e2e/basedriver/websockets.e2e.spec.js +82 -0
package/build/test/e2e/express/server.e2e.spec.js +159 -0
package/build/test/e2e/jsonwp-proxy/proxy.e2e.spec.js +59 -0
package/build/test/e2e/protocol/fake-driver.js +163 -0
package/build/test/e2e/protocol/helpers.js +25 -0
package/build/test/e2e/protocol/protocol.e2e.spec.js +1186 -0
package/build/test/helpers.js +2 -4
package/build/test/unit/basedriver/capabilities.spec.js +672 -0
package/build/test/unit/basedriver/capability.spec.js +353 -0
package/build/test/unit/basedriver/commands/event.spec.js +110 -0
package/build/test/unit/basedriver/commands/log.spec.js +85 -0
package/build/test/unit/basedriver/driver.spec.js +15 -0
package/build/test/unit/basedriver/helpers.spec.js +151 -0
package/build/test/unit/basedriver/timeout.spec.js +135 -0
package/build/test/unit/express/server.spec.js +155 -0
package/build/test/unit/express/static.spec.js +26 -0
package/build/test/unit/jsonwp-proxy/mock-request.js +91 -0
package/build/test/unit/jsonwp-proxy/protocol-converter.spec.js +171 -0
package/build/test/unit/jsonwp-proxy/proxy.spec.js +292 -0
package/build/test/unit/jsonwp-proxy/url.spec.js +165 -0
package/build/test/unit/jsonwp-status/status.spec.js +34 -0
package/build/test/unit/protocol/errors.spec.js +390 -0
package/build/test/unit/protocol/routes.spec.js +80 -0
package/build/test/unit/protocol/validator.spec.js +149 -0
package/lib/basedriver/driver.js +15 -4
package/package.json +14 -9
package/test/basedriver/README.md +5 -0
package/test/basedriver/driver-e2e-tests.js +1 -1
package/build/test/basedriver/capabilities-specs.js +0 -674
package/build/test/basedriver/capability-specs.js +0 -355
package/build/test/basedriver/commands/event-specs.js +0 -112
package/build/test/basedriver/commands/log-specs.js +0 -87
package/build/test/basedriver/driver-e2e-specs.js +0 -17
package/build/test/basedriver/driver-specs.js +0 -17
package/build/test/basedriver/helpers-e2e-specs.js +0 -194
package/build/test/basedriver/helpers-specs.js +0 -153
package/build/test/basedriver/timeout-specs.js +0 -137
package/build/test/basedriver/websockets-e2e-specs.js +0 -84
package/build/test/express/server-e2e-specs.js +0 -161
package/build/test/express/server-specs.js +0 -157
package/build/test/express/static-specs.js +0 -28
package/build/test/jsonwp-proxy/mock-request.js +0 -93
package/build/test/jsonwp-proxy/protocol-converter-specs.js +0 -173
package/build/test/jsonwp-proxy/proxy-e2e-specs.js +0 -61
package/build/test/jsonwp-proxy/proxy-specs.js +0 -294
package/build/test/jsonwp-proxy/url-specs.js +0 -167
package/build/test/jsonwp-status/status-specs.js +0 -36
package/build/test/protocol/errors-specs.js +0 -388
package/build/test/protocol/fake-driver.js +0 -165
package/build/test/protocol/helpers.js +0 -27
package/build/test/protocol/protocol-e2e-specs.js +0 -1188
package/build/test/protocol/routes-specs.js +0 -82
package/build/test/protocol/validator-specs.js +0 -151
package/test/basedriver/capabilities-specs.js +0 -537
package/test/basedriver/capability-specs.js +0 -383
package/test/basedriver/commands/event-specs.js +0 -74
package/test/basedriver/commands/log-specs.js +0 -79
package/test/basedriver/driver-e2e-specs.js +0 -8
package/test/basedriver/driver-specs.js +0 -8
package/test/basedriver/fixtures/BadZippedApp.zip +0 -1
package/test/basedriver/fixtures/FakeAndroidApp.apk +0 -1
package/test/basedriver/fixtures/FakeAndroidApp.asd +0 -0
package/test/basedriver/fixtures/FakeIOSApp.app +0 -1
package/test/basedriver/fixtures/FakeIOSApp.app.zip +0 -0
package/test/basedriver/fixtures/FakeIOSApp.ipa +0 -0
package/test/basedriver/fixtures/custom-element-finder-bad.js +0 -5
package/test/basedriver/fixtures/custom-element-finder.js +0 -29
package/test/basedriver/helpers-e2e-specs.js +0 -187
package/test/basedriver/helpers-specs.js +0 -137
package/test/basedriver/timeout-specs.js +0 -128
package/test/basedriver/websockets-e2e-specs.js +0 -75

package/build/test/unit/protocol/validator.spec.js ADDED Viewed

@@ -0,0 +1,149 @@
+"use strict";
+require("source-map-support/register");
+var _validators = require("../../../lib/protocol/validators");
+describe('Protocol', function () {
+  describe('direct to driver', function () {
+    describe('setUrl', function () {
+      it('should fail when no url passed', function () {
+        (() => {
+          _validators.validators.setUrl();
+        }).should.throw(/url/i);
+      });
+      it('should fail when given invalid url', function () {
+        (() => {
+          _validators.validators.setUrl('foo');
+        }).should.throw(/url/i);
+      });
+      it('should succeed when given url starting with http', function () {
+        (() => {
+          _validators.validators.setUrl('http://appium.io');
+        }).should.not.throw();
+      });
+      it('should succeed when given an android-like scheme', function () {
+        (() => {
+          _validators.validators.setUrl('content://contacts/people/1');
+        }).should.not.throw();
+      });
+      it('should succeed with hyphens dots and plus chars in the scheme', function () {
+        (() => {
+          _validators.validators.setUrl('my-app.a+b://login');
+        }).should.not.throw();
+      });
+      it('should succeed when given an about scheme', function () {
+        (() => {
+          _validators.validators.setUrl('about:blank');
+        }).should.not.throw();
+      });
+      it('should succeed when given a data scheme', function () {
+        (() => {
+          _validators.validators.setUrl('data:text/html,<html></html>');
+        }).should.not.throw();
+      });
+    });
+    describe('implicitWait', function () {
+      it('should fail when given no ms', function () {
+        (() => {
+          _validators.validators.implicitWait();
+        }).should.throw(/ms/i);
+      });
+      it('should fail when given a non-numeric ms', function () {
+        (() => {
+          _validators.validators.implicitWait('five');
+        }).should.throw(/ms/i);
+      });
+      it('should fail when given a negative ms', function () {
+        (() => {
+          _validators.validators.implicitWait(-1);
+        }).should.throw(/ms/i);
+      });
+      it('should succeed when given an ms of 0', function () {
+        (() => {
+          _validators.validators.implicitWait(0);
+        }).should.not.throw();
+      });
+      it('should succeed when given an ms greater than 0', function () {
+        (() => {
+          _validators.validators.implicitWait(100);
+        }).should.not.throw();
+      });
+    });
+    describe('asyncScriptTimeout', function () {
+      it('should fail when given no ms', function () {
+        (() => {
+          _validators.validators.asyncScriptTimeout();
+        }).should.throw(/ms/i);
+      });
+      it('should fail when given a non-numeric ms', function () {
+        (() => {
+          _validators.validators.asyncScriptTimeout('five');
+        }).should.throw(/ms/i);
+      });
+      it('should fail when given a negative ms', function () {
+        (() => {
+          _validators.validators.asyncScriptTimeout(-1);
+        }).should.throw(/ms/i);
+      });
+      it('should succeed when given an ms of 0', function () {
+        (() => {
+          _validators.validators.asyncScriptTimeout(0);
+        }).should.not.throw();
+      });
+      it('should succeed when given an ms greater than 0', function () {
+        (() => {
+          _validators.validators.asyncScriptTimeout(100);
+        }).should.not.throw();
+      });
+    });
+    describe('clickCurrent', function () {
+      it('should fail when given an invalid button', function () {
+        (() => {
+          _validators.validators.clickCurrent(4);
+        }).should.throw(/0, 1, or 2/i);
+      });
+      it('should succeed when given a valid button', function () {
+        (() => {
+          _validators.validators.clickCurrent(0);
+        }).should.not.throw();
+        (() => {
+          _validators.validators.clickCurrent(1);
+        }).should.not.throw();
+        (() => {
+          _validators.validators.clickCurrent(2);
+        }).should.not.throw();
+      });
+    });
+    describe('setNetworkConnection', function () {
+      it('should fail when given no type', function () {
+        (() => {
+          _validators.validators.setNetworkConnection();
+        }).should.throw(/0, 1, 2, 4, 6/i);
+      });
+      it('should fail when given an invalid type', function () {
+        (() => {
+          _validators.validators.setNetworkConnection(8);
+        }).should.throw(/0, 1, 2, 4, 6/i);
+      });
+      it('should succeed when given a valid type', function () {
+        (() => {
+          _validators.validators.setNetworkConnection(0);
+        }).should.not.throw();
+        (() => {
+          _validators.validators.setNetworkConnection(1);
+        }).should.not.throw();
+        (() => {
+          _validators.validators.setNetworkConnection(2);
+        }).should.not.throw();
+        (() => {
+          _validators.validators.setNetworkConnection(4);
+        }).should.not.throw();
+        (() => {
+          _validators.validators.setNetworkConnection(6);
+        }).should.not.throw();
+      });
+    });
+  });
+});
+//# sourceMappingURL=data:application/json;charset=utf-8;base64,{"version":3,"sources":["../../../../test/unit/protocol/validator.spec.js"],"names":["describe","it","validators","setUrl","should","throw","not","implicitWait","asyncScriptTimeout","clickCurrent","setNetworkConnection"],"mappings":"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","sourcesContent":["// transpile:mocha\n\nimport { validators } from '../../../lib/protocol/validators';\n\n\n\ndescribe('Protocol', function () {\n  describe('direct to driver', function () {\n\n    describe('setUrl', function () {\n      it('should fail when no url passed', function () {\n        (() => {validators.setUrl();}).should.throw(/url/i);\n      });\n      it('should fail when given invalid url', function () {\n        (() => {validators.setUrl('foo');}).should.throw(/url/i);\n      });\n      it('should succeed when given url starting with http', function () {\n        (() => {validators.setUrl('http://appium.io');}).should.not.throw();\n      });\n      it('should succeed when given an android-like scheme', function () {\n        (() => {validators.setUrl('content://contacts/people/1');}).should.not.throw();\n      });\n      it('should succeed with hyphens dots and plus chars in the scheme', function () {\n        (() => {validators.setUrl('my-app.a+b://login');}).should.not.throw();\n      });\n      it('should succeed when given an about scheme', function () {\n        (() => {validators.setUrl('about:blank');}).should.not.throw();\n      });\n      it('should succeed when given a data scheme', function () {\n        (() => {validators.setUrl('data:text/html,<html></html>');}).should.not.throw();\n      });\n    });\n    describe('implicitWait', function () {\n      it('should fail when given no ms', function () {\n        (() => {validators.implicitWait();}).should.throw(/ms/i);\n      });\n      it('should fail when given a non-numeric ms', function () {\n        (() => {validators.implicitWait('five');}).should.throw(/ms/i);\n      });\n      it('should fail when given a negative ms', function () {\n        (() => {validators.implicitWait(-1);}).should.throw(/ms/i);\n      });\n      it('should succeed when given an ms of 0', function () {\n        (() => {validators.implicitWait(0);}).should.not.throw();\n      });\n      it('should succeed when given an ms greater than 0', function () {\n        (() => {validators.implicitWait(100);}).should.not.throw();\n      });\n    });\n    describe('asyncScriptTimeout', function () {\n      it('should fail when given no ms', function () {\n        (() => {validators.asyncScriptTimeout();}).should.throw(/ms/i);\n      });\n      it('should fail when given a non-numeric ms', function () {\n        (() => {validators.asyncScriptTimeout('five');}).should.throw(/ms/i);\n      });\n      it('should fail when given a negative ms', function () {\n        (() => {validators.asyncScriptTimeout(-1);}).should.throw(/ms/i);\n      });\n      it('should succeed when given an ms of 0', function () {\n        (() => {validators.asyncScriptTimeout(0);}).should.not.throw();\n      });\n      it('should succeed when given an ms greater than 0', function () {\n        (() => {validators.asyncScriptTimeout(100);}).should.not.throw();\n      });\n    });\n    describe('clickCurrent', function () {\n      it('should fail when given an invalid button', function () {\n        (() => {validators.clickCurrent(4);}).should.throw(/0, 1, or 2/i);\n      });\n      it('should succeed when given a valid button', function () {\n        (() => {validators.clickCurrent(0);}).should.not.throw();\n        (() => {validators.clickCurrent(1);}).should.not.throw();\n        (() => {validators.clickCurrent(2);}).should.not.throw();\n      });\n    });\n    describe('setNetworkConnection', function () {\n      it('should fail when given no type', function () {\n        (() => {validators.setNetworkConnection();}).should.throw(/0, 1, 2, 4, 6/i);\n      });\n      it('should fail when given an invalid type', function () {\n        (() => {validators.setNetworkConnection(8);}).should.throw(/0, 1, 2, 4, 6/i);\n      });\n      it('should succeed when given a valid type', function () {\n        (() => {validators.setNetworkConnection(0);}).should.not.throw();\n        (() => {validators.setNetworkConnection(1);}).should.not.throw();\n        (() => {validators.setNetworkConnection(2);}).should.not.throw();\n        (() => {validators.setNetworkConnection(4);}).should.not.throw();\n        (() => {validators.setNetworkConnection(6);}).should.not.throw();\n      });\n    });\n  });\n});\n"]}

package/lib/basedriver/driver.js CHANGED Viewed

@@ -108,10 +108,21 @@ class BaseDriver extends Protocol {
   get log () {
     if (!this._log) {
-      const instanceName = `${this.constructor.name}@${node.getObjectId(this).substring(0, 8)}`;
-      this._log = logger.getLogger(() =>
-        this.sessionId ? `${instanceName} (${this.sessionId.substring(0, 8)})` : instanceName
-      );
+      const instanceName = `${this.constructor.name}@${node.getObjectId(this).substring(0, 4)}`;
+      // We don't want the self reference to be captured inside the below closure
+      // to avoid possible memory leaks,
+      // but NodeJS started supporting WeakRef only since v. 14.6
+      const self = global.WeakRef ? new global.WeakRef(this) : this;
+      this._log = logger.getLogger(() => {
+        let sessionId = self?.sessionId;
+        if (!sessionId && _.isFunction(self.deref)) {
+          const ref = self.deref();
+          if (ref?.sessionId) {
+            sessionId = ref.sessionId;
+          }
+        }
+        return sessionId ? `${instanceName} (${sessionId.substring(0, 8)})` : instanceName;
+      });
     }
     return this._log;

package/package.json CHANGED Viewed

@@ -1,6 +1,6 @@
 {
   "name": "@appium/base-driver",
-  "version": "8.3.0",
+  "version": "8.3.1",
   "description": "Base driver class for Appium drivers",
   "keywords": [
     "automation",
@@ -32,18 +32,23 @@
     "lib",
     "static",
     "test/basedriver",
-    "!test/basedriver/fixtures",
+    "!test/e2e/fixtures",
     "build",
-    "!build/test/basedriver/fixtures"
+    "!build/test/e2e/fixtures"
   ],
   "scripts": {
-    "dev": "gulp dev --no-notif",
-    "build": "gulp transpile",
-    "test": "gulp unit-test:run",
-    "test:e2e": "gulp e2e-test:run"
+    "build": "npm run build:sources && npm run build:test",
+    "build:sources": "babel lib --root-mode=upward --out-dir=build/lib",
+    "build:test": "babel test --root-mode=upward --out-dir=build/test --copy-files",
+    "dev": "npm run build -- --watch",
+    "fix": "npm run lint -- --fix",
+    "lint": "eslint -c ../../.eslintrc --ignore-path ../../.eslintignore .",
+    "test": "npm run test:unit",
+    "test:e2e": "mocha --require ../../test/setup-babel.js --timeout 20s --slow 10s \"./test/e2e/**/*.spec.js\"",
+    "test:unit": "mocha --require ../../test/setup-babel.js \"./test/unit/**/*.spec.js\""
   },
   "dependencies": {
-    "@appium/support": "^2.56.0",
+    "@appium/support": "^2.56.1",
     "@babel/runtime": "7.17.8",
     "@colors/colors": "1.5.0",
     "async-lock": "1.3.1",
@@ -70,5 +75,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "f5cce0f29d31699decea63ed94c4506f7af469df"
+  "gitHead": "6d35def9ed754121fee691cdaf7b30e3a7ac3e8b"
 }

package/test/basedriver/README.md ADDED Viewed

@@ -0,0 +1,5 @@
+# Driver Test Helpers
+This directory contains modules which expose test suites that an external driver can use to test against the base implementation.  They are published in the `@appium/base-driver` package.
+Drivers wanting to leverage these suites will want to add `@appium/base-driver` to their `devDependencies`.

package/test/basedriver/driver-e2e-tests.js CHANGED Viewed

@@ -2,7 +2,7 @@ import _ from 'lodash';
 import { BaseDriver, server, routeConfiguringFunction, DeviceSettings } from '../../lib';
 import axios from 'axios';
 import B from 'bluebird';
-import {TEST_HOST, getTestPort, createAppiumURL, METHODS} from '../helpers';
+import { TEST_HOST, getTestPort, createAppiumURL, METHODS } from '../helpers';
 import { PREFIXED_APPIUM_OPTS_CAP } from '../../lib/basedriver/capabilities';
 const {POST, DELETE} = METHODS;