@appium/base-driver 8.1.2 → 8.2.3

package/build/test/protocol/routes-specs.js

@@ -0,0 +1,82 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+
+require("source-map-support/register");
+
+var _lodash = require("lodash");
+
+var _protocol = require("../../lib/protocol");
+
+var _crypto = _interopRequireDefault(require("crypto"));
+
+describe('Protocol', function () {
+  describe('ensure protocol consistency', function () {
+    it('should not change protocol between patch versions', function () {
+      let shasum = _crypto.default.createHash('sha1');
+
+      for (let [url, urlMapping] of _lodash._.toPairs(_protocol.METHOD_MAP)) {
+        shasum.update(url);
+
+        for (let [method, methodMapping] of _lodash._.toPairs(urlMapping)) {
+          shasum.update(method);
+
+          if (methodMapping.command) {
+            shasum.update(methodMapping.command);
+          }
+
+          if (methodMapping.payloadParams) {
+            let allParams = _lodash._.flatten(methodMapping.payloadParams.required);
+
+            if (methodMapping.payloadParams.optional) {
+              allParams = allParams.concat(_lodash._.flatten(methodMapping.payloadParams.optional));
+            }
+
+            for (let param of allParams) {
+              shasum.update(param);
+            }
+
+            if (methodMapping.payloadParams.wrap) {
+              shasum.update('skip');
+              shasum.update(methodMapping.payloadParams.wrap);
+            }
+          }
+        }
+      }
+
+      let hash = shasum.digest('hex').substring(0, 8);
+      hash.should.equal('ccbdbf87');
+    });
+  });
+  describe('check route to command name conversion', function () {
+    it('should properly lookup correct command name for endpoint with session', function () {
+      const cmdName = (0, _protocol.routeToCommandName)('/timeouts', 'POST');
+      cmdName.should.equal('timeouts');
+    });
+    it('should properly lookup correct command name for endpoint with session', function () {
+      const cmdName = (0, _protocol.routeToCommandName)('/timeouts/implicit_wait', 'POST');
+      cmdName.should.equal('implicitWait');
+    });
+    it('should properly lookup correct command name for endpoint without session', function () {
+      const cmdName = (0, _protocol.routeToCommandName)('/status', 'GET');
+      cmdName.should.equal('getStatus');
+    });
+    it('should properly lookup correct command name for endpoint without leading slash', function () {
+      const cmdName = (0, _protocol.routeToCommandName)('status', 'GET');
+      cmdName.should.equal('getStatus');
+    });
+    it('should properly lookup correct command name for fully specified endpoint', function () {
+      const cmdName = (0, _protocol.routeToCommandName)('/status', 'GET');
+      cmdName.should.equal('getStatus');
+    });
+    it('should not find command name if incorrect input data has been specified', function () {
+      for (let [route, method] of [['/status', 'POST'], ['/xstatus', 'GET'], ['status', 'POST']]) {
+        const cmdName = (0, _protocol.routeToCommandName)(route, method);
+        chai.should().equal(cmdName, undefined);
+      }
+    });
+  });
+});require('source-map-support').install();
+
+
+//# sourceMappingURL=data:application/json;charset=utf8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbInRlc3QvcHJvdG9jb2wvcm91dGVzLXNwZWNzLmpzIl0sIm5hbWVzIjpbImRlc2NyaWJlIiwiaXQiLCJzaGFzdW0iLCJjcnlwdG8iLCJjcmVhdGVIYXNoIiwidXJsIiwidXJsTWFwcGluZyIsIl8iLCJ0b1BhaXJzIiwiTUVUSE9EX01BUCIsInVwZGF0ZSIsIm1ldGhvZCIsIm1ldGhvZE1hcHBpbmciLCJjb21tYW5kIiwicGF5bG9hZFBhcmFtcyIsImFsbFBhcmFtcyIsImZsYXR0ZW4iLCJyZXF1aXJlZCIsIm9wdGlvbmFsIiwiY29uY2F0IiwicGFyYW0iLCJ3cmFwIiwiaGFzaCIsImRpZ2VzdCIsInN1YnN0cmluZyIsInNob3VsZCIsImVxdWFsIiwiY21kTmFtZSIsInJvdXRlIiwiY2hhaSIsInVuZGVmaW5lZCJdLCJtYXBwaW5ncyI6Ijs7Ozs7O0FBRUE7O0FBQ0E7O0FBQ0E7O0FBSUFBLFFBQVEsQ0FBQyxVQUFELEVBQWEsWUFBWTtBQUsvQkEsRUFBQUEsUUFBUSxDQUFDLDZCQUFELEVBQWdDLFlBQVk7QUFDbERDLElBQUFBLEVBQUUsQ0FBQyxtREFBRCxFQUFzRCxZQUFZO0FBQ2xFLFVBQUlDLE1BQU0sR0FBR0MsZ0JBQU9DLFVBQVAsQ0FBa0IsTUFBbEIsQ0FBYjs7QUFDQSxXQUFLLElBQUksQ0FBQ0MsR0FBRCxFQUFNQyxVQUFOLENBQVQsSUFBOEJDLFVBQUVDLE9BQUYsQ0FBVUMsb0JBQVYsQ0FBOUIsRUFBcUQ7QUFDbkRQLFFBQUFBLE1BQU0sQ0FBQ1EsTUFBUCxDQUFjTCxHQUFkOztBQUNBLGFBQUssSUFBSSxDQUFDTSxNQUFELEVBQVNDLGFBQVQsQ0FBVCxJQUFvQ0wsVUFBRUMsT0FBRixDQUFVRixVQUFWLENBQXBDLEVBQTJEO0FBQ3pESixVQUFBQSxNQUFNLENBQUNRLE1BQVAsQ0FBY0MsTUFBZDs7QUFDQSxjQUFJQyxhQUFhLENBQUNDLE9BQWxCLEVBQTJCO0FBQ3pCWCxZQUFBQSxNQUFNLENBQUNRLE1BQVAsQ0FBY0UsYUFBYSxDQUFDQyxP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MUIsQ0FBaEI7QUFDQWtCLFFBQUFBLElBQUksQ0FBQ0osTUFBTCxHQUFjQyxLQUFkLENBQW9CQyxPQUFwQixFQUE2QkcsU0FBN0I7QUFDRDtBQUNGLEtBTEMsQ0FBRjtBQU1ELEdBaENPLENBQVI7QUFrQ0QsQ0F0RU8sQ0FBUiIsInNvdXJjZXNDb250ZW50IjpbIi8vIHRyYW5zcGlsZTptb2NoYVxuXG5pbXBvcnQgeyBfIH0gZnJvbSAnbG9kYXNoJztcbmltcG9ydCB7IE1FVEhPRF9NQVAsIHJvdXRlVG9Db21tYW5kTmFtZSB9IGZyb20gJy4uLy4uL2xpYi9wcm90b2NvbCc7XG5pbXBvcnQgY3J5cHRvIGZyb20gJ2NyeXB0byc7XG5cblxuXG5kZXNjcmliZSgnUHJvdG9jb2wnLCBmdW5jdGlvbiAoKSB7XG5cbiAgLy8gVE9ETyB0ZXN0IGFnYWluc3QgYW4gZXhwbGljaXQgcHJvdG9jb2wgcmF0aGVyIHRoYW4gYSBoYXNoIG9mIGEgcHJldmlvdXNcbiAgLy8gcHJvdG9jb2xcblxuICBkZXNjcmliZSgnZW5zdXJlIHByb3RvY29sIGNvbnNpc3RlbmN5JywgZnVuY3Rpb24gKCkge1xuICAgIGl0KCdzaG91bGQgbm90IGNoYW5nZSBwcm90b2NvbCBiZXR3ZWVuIHBhdGNoIHZlcnNpb25zJywgZnVuY3Rpb24gKCkge1xuICAgICAgbGV0IHNoYXN1bSA9IGNyeXB0by5jcmVhdGVIYXNoKCdzaGExJyk7XG4gICAgICBmb3IgKGxldCBbdXJsLCB1cmxNYXBwaW5nXSBvZiBfLnRvUGFpcnMoTUVUSE9EX01BUCkpIHtcbiAgICAgICAgc2hhc3VtLnVwZGF0ZSh1cmwpO1xuICAgICAgICBmb3IgKGxldCBbbWV0aG9kLCBtZXRob2RNYXBwaW5nXSBvZiBfLnRvUGFpcnModXJsTWFwcGluZykpIHtcbiAgICAgICAgICBzaGFzdW0udXBkYXRlKG1ldGhvZCk7XG4gICAgICAgICAgaWYgKG1ldGhvZE1hcHBpbmcuY29tbWFuZCkge1xuICAgICAgICAgICAgc2hhc3VtLnVwZGF0ZShtZXRob2RNYXBwaW5nLmNvbW1hbmQpO1xuICAgICAgICAgIH1cbiAgICAgICAgICBpZiAobWV0aG9kTWFwcGluZy5wYXlsb2FkUGFyYW1zKSB7XG4gICAgICAgICAgICBsZXQgYWxsUGFyYW1zID0gXy5mbGF0dGVuKG1ldGhvZE1hcHBpbmcucGF5bG9hZFBhcmFtcy5yZXF1aXJlZCk7XG4gICAgICAgICAgICBpZiAobWV0aG9kTWFwcGluZy5wYXlsb2FkUGFyYW1zLm9wdGlvbmFsKSB7XG4gICAgICAgICAgICAgIGFsbFBhcmFtcyA9IGFsbFBhcmFtcy5jb25jYXQoXy5mbGF0dGVuKG1ldGhvZE1hcHBpbmcucGF5bG9hZFBhcmFtcy5vcHRpb25hbCkpO1xuICAgICAgICAgICAgfVxuICAgICAgICAgICAgZm9yIChsZXQgcGFyYW0gb2YgYWxsUGFyYW1zKSB7XG4gICAgICAgICAgICAgIHNoYXN1bS51cGRhdGUocGFyYW0pO1xuICAgICAgICAgICAgfVxuICAgICAgICAgICAgaWYgKG1ldGhvZE1hcHBpbmcucGF5bG9hZFBhcmFtcy53cmFwKSB7XG4gICAgICAgICAgICAgIHNoYXN1bS51cGRhdGUoJ3NraXAnKTtcbiAgICAgICAgICAgICAgc2hhc3VtLnVwZGF0ZShtZXRob2RNYXBwaW5nLnBheWxvYWRQYXJhbXMud3JhcCk7XG4gICAgICAgICAgICB9XG4gICAgICAgICAgfVxuICAgICAgICB9XG4gICAgICB9XG4gICAgICBsZXQgaGFzaCA9IHNoYXN1bS5kaWdlc3QoJ2hleCcpLnN1YnN0cmluZygwLCA4KTtcbiAgICAgIC8vIE1vZGlmeSB0aGUgaGFzaCB3aGVuZXZlciB0aGUgcHJvdG9jb2wgaGFzIGludGVudGlvbmFsbHkgYmVlbiBtb2RpZmllZC5cbiAgICAgIGhhc2guc2hvdWxkLmVxdWFsKCdjY2JkYmY4NycpO1xuICAgIH0pO1xuICB9KTtcblxuICBkZXNjcmliZSgnY2hlY2sgcm91dGUgdG8gY29tbWFuZCBuYW1lIGNvbnZlcnNpb24nLCBmdW5jdGlvbiAoKSB7XG4gICAgaXQoJ3Nob3VsZCBwcm9wZXJseSBsb29rdXAgY29ycmVjdCBjb21tYW5kIG5hbWUgZm9yIGVuZHBvaW50IHdpdGggc2Vzc2lvbicsIGZ1bmN0aW9uICgpIHtcbiAgICAgIGNvbnN0IGNtZE5hbWUgPSByb3V0ZVRvQ29tbWFuZE5hbWUoJy90aW1lb3V0cycsICdQT1NUJyk7XG4gICAgICBjbWROYW1lLnNob3VsZC5lcXVhbCgndGltZW91dHMnKTtcbiAgICB9KTtcblxuICAgIGl0KCdzaG91bGQgcHJvcGVybHkgbG9va3VwIGNvcnJlY3QgY29tbWFuZCBuYW1lIGZvciBlbmRwb2ludCB3aXRoIHNlc3Npb24nLCBmdW5jdGlvbiAoKSB7XG4gICAgICBjb25zdCBjbWROYW1lID0gcm91dGVUb0NvbW1hbmROYW1lKCcvdGltZW91dHMvaW1wbGljaXRfd2FpdCcsICdQT1NUJyk7XG4gICAgICBjbWROYW1lLnNob3VsZC5lcXVhbCgnaW1wbGljaXRXYWl0Jyk7XG4gICAgfSk7XG5cbiAgICBpdCgnc2hvdWxkIHByb3Blcmx5IGxvb2t1cCBjb3JyZWN0IGNvbW1hbmQgbmFtZSBmb3IgZW5kcG9pbnQgd2l0aG91dCBzZXNzaW9uJywgZnVuY3Rpb24gKCkge1xuICAgICAgY29uc3QgY21kTmFtZSA9IHJvdXRlVG9Db21tYW5kTmFtZSgnL3N0YXR1cycsICdHRVQnKTtcbiAgICAgIGNtZE5hbWUuc2hvdWxkLmVxdWFsKCdnZXRTdGF0dXMnKTtcbiAgICB9KTtcblxuICAgIGl0KCdzaG91bGQgcHJvcGVybHkgbG9va3VwIGNvcnJlY3QgY29tbWFuZCBuYW1lIGZvciBlbmRwb2ludCB3aXRob3V0IGxlYWRpbmcgc2xhc2gnLCBmdW5jdGlvbiAoKSB7XG4gICAgICBjb25zdCBjbWROYW1lID0gcm91dGVUb0NvbW1hbmROYW1lKCdzdGF0dXMnLCAnR0VUJyk7XG4gICAgICBjbWROYW1lLnNob3VsZC5lcXVhbCgnZ2V0U3RhdHVzJyk7XG4gICAgfSk7XG5cbiAgICBpdCgnc2hvdWxkIHByb3Blcmx5IGxvb2t1cCBjb3JyZWN0IGNvbW1hbmQgbmFtZSBmb3IgZnVsbHkgc3BlY2lmaWVkIGVuZHBvaW50JywgZnVuY3Rpb24gKCkge1xuICAgICAgY29uc3QgY21kTmFtZSA9IHJvdXRlVG9Db21tYW5kTmFtZSgnL3N0YXR1cycsICdHRVQnKTtcbiAgICAgIGNtZE5hbWUuc2hvdWxkLmVxdWFsKCdnZXRTdGF0dXMnKTtcbiAgICB9KTtcblxuICAgIGl0KCdzaG91bGQgbm90IGZpbmQgY29tbWFuZCBuYW1lIGlmIGluY29ycmVjdCBpbnB1dCBkYXRhIGhhcyBiZWVuIHNwZWNpZmllZCcsIGZ1bmN0aW9uICgpIHtcbiAgICAgIGZvciAobGV0IFtyb3V0ZSwgbWV0aG9kXSBvZiBbWycvc3RhdHVzJywgJ1BPU1QnXSwgWycveHN0YXR1cycsICdHRVQnXSwgWydzdGF0dXMnLCAnUE9TVCddXSkge1xuICAgICAgICBjb25zdCBjbWROYW1lID0gcm91dGVUb0NvbW1hbmROYW1lKHJvdXRlLCBtZXRob2QpO1xuICAgICAgICBjaGFpLnNob3VsZCgpLmVxdWFsKGNtZE5hbWUsIHVuZGVmaW5lZCk7XG4gICAgICB9XG4gICAgfSk7XG4gIH0pO1xuXG59KTtcbiJdLCJmaWxlIjoidGVzdC9wcm90b2NvbC9yb3V0ZXMtc3BlY3MuanMiLCJzb3VyY2VSb290IjoiLi4vLi4vLi4ifQ==

package/build/test/protocol/validator-specs.js

@@ -0,0 +1,151 @@
+"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();
+      });
+    });
+  });
+});require('source-map-support').install();
+
+
+//# sourceMappingURL=data:application/json;charset=utf8;base64,{"version":3,"sources":["test/protocol/validator-specs.js"],"names":["describe","it","validators","setUrl","should","throw","not","implicitWait","asyncScriptTimeout","clickCurrent","setNetworkConnection"],"mappings":";;;;AAEA;;AAIAA,QAAQ,CAAC,UAAD,EAAa,YAAY;AAC/BA,EAAAA,QAAQ,CAAC,kBAAD,EAAqB,YAAY;AAEvCA,IAAAA,QAAQ,CAAC,QAAD,EAAW,YAAY;AAC7BC,MAAAA,EAAE,CAAC,gCAAD,EAAmC,YAAY;AAC/C,SAAC,MAAM;AAACC,iCAAWC,MAAX;AAAqB,SAA7B,EAA+BC,MAA/B,CAAsCC,KAAtC,CAA4C,MAA5C;AACD,OAFC,CAAF;AAGAJ,MAAAA,EAAE,CAAC,oCAAD,EAAuC,YAAY;AACnD,SAAC,MAAM;AAACC,iCAAWC,MAAX,CAAkB,KAAlB;AAA0B,SAAlC,EAAoCC,MAApC,CAA2CC,KAA3C,CAAiD,MAAjD;AACD,OAFC,CAAF;AAGAJ,MAAAA,EAAE,CAAC,kDAAD,EAAqD,YAAY;AACjE,SAAC,MAAM;AAACC,iCAAWC,MAAX,CAAkB,kBAAlB;AAAuC,SAA/C,EAAiDC,MAAjD,CAAwDE,GAAxD,CAA4DD,KAA5D;AACD,OAFC,CAAF;AAGAJ,MAAAA,EAAE,CAAC,kDAAD,EAAqD,YAAY;AACjE,SAAC,MAAM;AAACC,iCAAWC,MAAX,CAAkB,6BAAlB;AAAkD,SAA1D,EAA4DC,MAA5D,CAAmEE,GAAnE,CAAuED,KAAvE;AACD,OAFC,CAAF;AAGAJ,MAAAA,EAAE,CAAC,+DAAD,EAAkE,YAAY;AAC9E,SAAC,MAAM;AAACC,iCAAWC,MAAX,CAAkB,oBAAlB;AAAyC,SAAjD,EAAmDC,MAAnD,CAA0DE,GAA1D,CAA8DD,KAA9D;AACD,OAFC,CAAF;AAGAJ,MAAAA,EAAE,CAAC,2CAAD,EAA8C,YAAY;AAC1D,SAAC,MAAM;AAACC,iCAAWC,MAAX,CAAkB,aAAlB;AAAkC,SAA1C,EAA4CC,MAA5C,CAAmDE,GAAnD,CAAuDD,KAAvD;AACD,OAFC,CAAF;AAGAJ,MAAAA,EAAE,CAAC,yCAAD,EAA4C,YAAY;AACxD,SAAC,MAAM;AAACC,iCAAWC,MAAX,CAAkB,8BAAlB;AAAmD,SAA3D,EAA6DC,MAA7D,CAAoEE,GAApE,CAAwED,KAAxE;AACD,OAFC,CAAF;AAGD,KAtBO,CAAR;AAuBAL,IAAAA,QAAQ,CAAC,cAAD,EAAiB,YAAY;AACnCC,MAAAA,EAAE,CAAC,8BAAD,EAAiC,YAAY;AAC7C,SAAC,MAAM;AAACC,iCAAWK,YAAX;AAA2B,SAAnC,EAAqCH,MAArC,CAA4CC,KAA5C,CAAkD,KAAlD;AACD,OAFC,CAAF;AAGAJ,MAAAA,EAAE,CAAC,yCAAD,EAA4C,YAAY;AACxD,SAAC,MAAM;AAACC,iCAAWK,YAAX,CAAwB,MAAxB;AAAiC,SAAzC,EAA2CH,MAA3C,CAAkDC,KAAlD,CAAwD,KAAxD;AACD,OAFC,CAAF;AAGAJ,MAAAA,EAAE,CAAC,sCAAD,EAAyC,YAAY;AACrD,SAAC,MAAM;AAACC,iCAAWK,YAAX,CAAwB,CAAC,CAAzB;AAA6B,SAArC,EAAuCH,MAAvC,CAA8CC,KAA9C,CAAoD,KAApD;AACD,OAFC,CAAF;AAGAJ,MAAAA,EAAE,CAAC,sCAAD,EAAyC,YAAY;AACrD,SAAC,MAAM;AAACC,iCAAWK,YAAX,CAAwB,CAAxB;AAA4B,SAApC,EAAsCH,MAAtC,CAA6CE,GAA7C,CAAiDD,KAAjD;AACD,OAFC,CAAF;AAGAJ,MAAAA,EAAE,CAAC,gDAAD,EAAmD,YAAY;AAC/D,SAAC,MAAM;AAACC,iCAAWK,YAAX,CAAwB,GAAxB;AAA8B,SAAtC,EAAwCH,MAAxC,CAA+CE,GAA/C,CAAmDD,KAAnD;AACD,OAFC,CAAF;AAGD,KAhBO,CAAR;AAiBAL,IAAAA,QAAQ,CAAC,oBAAD,EAAuB,YAAY;AACzCC,MAAAA,EAAE,CAAC,8BAAD,EAAiC,YAAY;AAC7C,SAAC,MAAM;AAACC,iCAAWM,kBAAX;AAAiC,SAAzC,EAA2CJ,MAA3C,CAAkDC,KAAlD,CAAwD,KAAxD;AACD,OAFC,CAAF;AAGAJ,MAAAA,EAAE,CAAC,yCAAD,EAA4C,YAAY;AACxD,SAAC,MAAM;AAACC,iCAAWM,kBAAX,CAA8B,MAA9B;AAAuC,SAA/C,EAAiDJ,MAAjD,CAAwDC,KAAxD,CAA8D,KAA9D;AACD,OAFC,CAAF;AAGAJ,MAAAA,EAAE,CAAC,sCAAD,EAAyC,YAAY;AACrD,SAAC,MAAM;AAACC,iCAAWM,kBAAX,CAA8B,CAAC,CAA/B;AAAmC,SAA3C,EAA6CJ,MAA7C,CAAoDC,KAApD,CAA0D,KAA1D;AACD,OAFC,CAAF;AAGAJ,MAAAA,EAAE,CAAC,sCAAD,EAAyC,YAAY;AACrD,SAAC,MAAM;AAACC,iCAAWM,kBAAX,CAA8B,CAA9B;AAAkC,SAA1C,EAA4CJ,MAA5C,CAAmDE,GAAnD,CAAuDD,KAAvD;AACD,OAFC,CAAF;AAGAJ,MAAAA,EAAE,CAAC,gDAAD,EAAmD,YAAY;AAC/D,SAAC,MAAM;AAACC,iCAAWM,kBAAX,CAA8B,GAA9B;AAAoC,SAA5C,EAA8CJ,MAA9C,CAAqDE,GAArD,CAAyDD,KAAzD;AACD,OAFC,CAAF;AAGD,KAhBO,CAAR;AAiBAL,IAAAA,QAAQ,CAAC,cAAD,EAAiB,YAAY;AACnCC,MAAAA,EAAE,CAAC,0CAAD,EAA6C,YAAY;AACzD,SAAC,MAAM;AAACC,iCAAWO,YAAX,CAAwB,CAAxB;AAA4B,SAApC,EAAsCL,MAAtC,CAA6CC,KAA7C,CAAmD,aAAnD;AACD,OAFC,CAAF;AAGAJ,MAAAA,EAAE,CAAC,0CAAD,EAA6C,YAAY;AACzD,SAAC,MAAM;AAACC,iCAAWO,YAAX,CAAwB,CAAxB;AAA4B,SAApC,EAAsCL,MAAtC,CAA6CE,GAA7C,CAAiDD,KAAjD;AACA,SAAC,MAAM;AAACH,iCAAWO,YAAX,CAAwB,CAAxB;AAA4B,SAApC,EAAsCL,MAAtC,CAA6CE,GAA7C,CAAiDD,KAAjD;AACA,SAAC,MAAM;AAACH,iCAAWO,YAAX,CAAwB,CAAxB;AAA4B,SAApC,EAAsCL,MAAtC,CAA6CE,GAA7C,CAAiDD,KAAjD;AACD,OAJC,CAAF;AAKD,KATO,CAAR;AAUAL,IAAAA,QAAQ,CAAC,sBAAD,EAAyB,YAAY;AAC3CC,MAAAA,EAAE,CAAC,gCAAD,EAAmC,YAAY;AAC/C,SAAC,MAAM;AAACC,iCAAWQ,oBAAX;AAAmC,SAA3C,EAA6CN,MAA7C,CAAoDC,KAApD,CAA0D,gBAA1D;AACD,OAFC,CAAF;AAGAJ,MAAAA,EAAE,CAAC,wCAAD,EAA2C,YAAY;AACvD,SAAC,MAAM;AAACC,iCAAWQ,oBAAX,CAAgC,CAAhC;AAAoC,SAA5C,EAA8CN,MAA9C,CAAqDC,KAArD,CAA2D,gBAA3D;AACD,OAFC,CAAF;AAGAJ,MAAAA,EAAE,CAAC,wCAAD,EAA2C,YAAY;AACvD,SAAC,MAAM;AAACC,iCAAWQ,oBAAX,CAAgC,CAAhC;AAAoC,SAA5C,EAA8CN,MAA9C,CAAqDE,GAArD,CAAyDD,KAAzD;AACA,SAAC,MAAM;AAACH,iCAAWQ,oBAAX,CAAgC,CAAhC;AAAoC,SAA5C,EAA8CN,MAA9C,CAAqDE,GAArD,CAAyDD,KAAzD;AACA,SAAC,MAAM;AAACH,iCAAWQ,oBAAX,CAAgC,CAAhC;AAAoC,SAA5C,EAA8CN,MAA9C,CAAqDE,GAArD,CAAyDD,KAAzD;AACA,SAAC,MAAM;AAACH,iCAAWQ,oBAAX,CAAgC,CAAhC;AAAoC,SAA5C,EAA8CN,MAA9C,CAAqDE,GAArD,CAAyDD,KAAzD;AACA,SAAC,MAAM;AAACH,iCAAWQ,oBAAX,CAAgC,CAAhC;AAAoC,SAA5C,EAA8CN,MAA9C,CAAqDE,GAArD,CAAyDD,KAAzD;AACD,OANC,CAAF;AAOD,KAdO,CAAR;AAeD,GApFO,CAAR;AAqFD,CAtFO,CAAR","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"],"file":"test/protocol/validator-specs.js","sourceRoot":"../../.."}

package/index.d.ts

@@ -2,7 +2,6 @@ declare class BaseDriver {
     // class variables
     static baseVersion: string;
     static newMethodMap?: MethodMap;
-    static get argsConstraints(): Constraints;
 
     constructor(opts?: {}, shouldValidateCaps?: boolean);
 
@@ -174,7 +173,6 @@ declare class BaseDriver {
     updateSettings(newSettings: Record<string, unknown>): Promise<void>;
     getSettings(): Promise<Record<string, unknown>>;
     receiveAsyncResponse?(response: unknown): Promise<void>;
-    executeDriverScript(script: string, scriptType?: string, timeout?: number): Promise<unknown>;
     getLogEvents(type?: string | string[]): {};
     logCustomEvent(vendor: string, event: string): void;
     setClipboard?(content: string, contentType?: string, label?: string): Promise<void>;
@@ -281,7 +279,11 @@ declare interface DriverHelpers {
     parseCapsArray: (cap: string | string[]) => string[];
 }
 
-declare type SettingsUpdater = (prop: string, newValue: {}, curValue: {}) => Promise<void>;
+declare type SettingsUpdater = (
+  prop: string,
+  newValue: {},
+  curValue: {},
+) => Promise<void>;
 
 declare class DeviceSettings {
     constructor(defaultSettings: {}, onSettingsUpdate: SettingsUpdater);

package/index.js

@@ -1,62 +1 @@
-// transpile:main
-
-// BaseDriver exports
-import * as driver from './lib/basedriver/driver';
-import * as deviceSettings from './lib/basedriver/device-settings';
-
-const { BaseDriver } = driver;
-const { DeviceSettings, BASEDRIVER_HANDLED_SETTINGS } = deviceSettings;
-
-export { BaseDriver, DeviceSettings, BASEDRIVER_HANDLED_SETTINGS };
-export default BaseDriver;
-
-
-// MJSONWP exports
-import * as protocol from './lib/protocol';
-import {
-  DEFAULT_BASE_PATH, PROTOCOLS
-} from './lib/constants';
-
-const {
-  Protocol, routeConfiguringFunction, errors, isErrorType,
-  errorFromMJSONWPStatusCode, errorFromW3CJsonCode, ALL_COMMANDS, METHOD_MAP,
-  routeToCommandName, NO_SESSION_ID_COMMANDS, isSessionCommand,
-  normalizeBasePath, determineProtocol
-} = protocol;
-
-export {
-  Protocol, routeConfiguringFunction, errors, isErrorType, PROTOCOLS,
-  errorFromMJSONWPStatusCode, errorFromW3CJsonCode, determineProtocol,
-  errorFromMJSONWPStatusCode as errorFromCode, ALL_COMMANDS, METHOD_MAP,
-  routeToCommandName, NO_SESSION_ID_COMMANDS, isSessionCommand,
-  DEFAULT_BASE_PATH, normalizeBasePath
-};
-
-// Express exports
-import * as staticIndex from './lib/express/static';
-const { STATIC_DIR } = staticIndex;
-export { STATIC_DIR };
-
-import * as serverIndex from './lib/express/server';
-const { server } = serverIndex;
-export { server };
-
-// jsonwp-proxy exports
-import * as proxyIndex from './lib/jsonwp-proxy/proxy';
-const { JWProxy } = proxyIndex;
-export { JWProxy };
-
-// jsonwp-status exports
-import * as statusIndex from './lib/jsonwp-status/status';
-const { codes: statusCodes, getSummaryByCode } = statusIndex;
-export { statusCodes, getSummaryByCode };
-
-// W3C capabilities parser
-import * as caps from './lib/basedriver/capabilities';
-const { processCapabilities, isStandardCap, validateCaps } = caps;
-export { processCapabilities, isStandardCap, validateCaps };
-
-// Web socket helpers
-import * as ws from './lib/express/websocket';
-const { DEFAULT_WS_PATHNAME_PREFIX } = ws;
-export { DEFAULT_WS_PATHNAME_PREFIX };
+module.exports = require('./build/lib');

package/lib/basedriver/capabilities.js

@@ -145,7 +145,10 @@ function parseCaps (caps, constraints = {}, shouldValidateCaps = true) {
   }
 
   // If an empty array as provided, we'll be forgiving and make it an array of one empty object
+  // In the future, reject 'firstMatch' argument if its array did not have one or more entries (#3.2)
   if (allFirstMatchCaps.length === 0) {
+    log.warn(`The firstMatch array in the given capabilities has no entries. Adding an empty entry fo rnow, ` +
+      `but it will require one or more entries as W3C spec.`);
     allFirstMatchCaps.push({});
   }
 

package/lib/basedriver/commands/index.js

@@ -3,7 +3,6 @@ import settingsCmds from './settings';
 import timeoutCmds from './timeout';
 import findCmds from './find';
 import logCmds from './log';
-import executeCmds from './execute';
 import eventCmds from './event';
 
 
@@ -16,7 +15,6 @@ Object.assign(
   timeoutCmds,
   findCmds,
   logCmds,
-  executeCmds,
   eventCmds,
   // add other command types here
 );

package/lib/basedriver/driver.js

@@ -1,5 +1,5 @@
 import {
-  Protocol, errors, determineProtocol
+  Protocol, errors, determineProtocol, DELETE_SESSION_COMMAND,
 } from '../protocol';
 import { fs } from '@appium/support';
 import { PROTOCOLS, DEFAULT_BASE_PATH } from '../constants';
@@ -38,27 +38,6 @@ class BaseDriver extends Protocol {
    */
   static baseVersion = BASEDRIVER_VER;
 
-  /**
-   * Override this getter in child driver classes
-   * if you'd like to expose any command line arguments.
-   * These arguments take precedence over any opts.
-   *
-   * @returns {Object} The map which represents constraints over
-   * supported command line arguments. The map should look similar
-   * to the desired capabilities constraints one, for example:
-   * {
-   *   webkitDebugProxyPort: {
-   *     isNumber: true
-   *   },
-   *   wdaLocalPort: {
-   *     isNumber: true
-   *   },
-   * }
-   */
-  static get argsConstraints () {
-    return {};
-  }
-
   constructor (opts = {}, shouldValidateCaps = true) {
     super();
 
@@ -327,11 +306,12 @@ class BaseDriver extends Protocol {
   async executeCommand (cmd, ...args) {
     // get start time for this command, and log in special cases
     let startTime = Date.now();
+
     if (cmd === 'createSession') {
       // If creating a session determine if W3C or MJSONWP protocol was requested and remember the choice
       this.protocol = determineProtocol(...args);
       this.logEvent(EVENT_SESSION_INIT);
-    } else if (cmd === 'deleteSession') {
+    } else if (cmd === DELETE_SESSION_COMMAND) {
       this.logEvent(EVENT_SESSION_QUIT_START);
     }
 
@@ -362,7 +342,7 @@ class BaseDriver extends Protocol {
         unexpectedShutdownListener = null;
       }
     });
-    const res = this.isCommandsQueueEnabled && cmd !== 'executeDriverScript'
+    const res = this.isCommandsQueueEnabled
       ? await this.commandsQueueGuard.acquire(BaseDriver.name, commandExecutor)
       : await commandExecutor();
 
@@ -372,7 +352,7 @@ class BaseDriver extends Protocol {
     // automatic session deletion in this.onCommandTimeout. Of course we don't
     // want to trigger the timer when the user is shutting down the session
     // intentionally
-    if (this.isCommandsQueueEnabled && cmd !== 'deleteSession') {
+    if (this.isCommandsQueueEnabled && cmd !== DELETE_SESSION_COMMAND) {
       // resetting existing timeout
       this.startNewCommandTimeout();
     }
@@ -382,7 +362,7 @@ class BaseDriver extends Protocol {
     this._eventHistory.commands.push({cmd, startTime, endTime});
     if (cmd === 'createSession') {
       this.logEvent(EVENT_SESSION_START);
-    } else if (cmd === 'deleteSession') {
+    } else if (cmd === DELETE_SESSION_COMMAND) {
       this.logEvent(EVENT_SESSION_QUIT_DONE);
     }