@appium/base-driver 8.2.3 → 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 (128) hide show
  1. package/build/lib/basedriver/capabilities.js +2 -4
  2. package/build/lib/basedriver/commands/event.js +2 -4
  3. package/build/lib/basedriver/commands/find.js +5 -14
  4. package/build/lib/basedriver/commands/index.js +2 -4
  5. package/build/lib/basedriver/commands/log.js +4 -9
  6. package/build/lib/basedriver/commands/session.js +19 -30
  7. package/build/lib/basedriver/commands/settings.js +5 -11
  8. package/build/lib/basedriver/commands/timeout.js +11 -18
  9. package/build/lib/basedriver/desired-caps.js +2 -4
  10. package/build/lib/basedriver/device-settings.js +15 -5
  11. package/build/lib/basedriver/driver.js +36 -23
  12. package/build/lib/basedriver/helpers.js +10 -12
  13. package/build/lib/basedriver/logger.js +2 -4
  14. package/build/lib/constants.js +2 -4
  15. package/build/lib/express/crash.js +2 -4
  16. package/build/lib/express/express-logging.js +3 -5
  17. package/build/lib/express/idempotency.js +3 -5
  18. package/build/lib/express/logger.js +2 -4
  19. package/build/lib/express/middleware.js +2 -4
  20. package/build/lib/express/server.js +2 -4
  21. package/build/lib/express/static.js +2 -4
  22. package/build/lib/express/websocket.js +2 -4
  23. package/build/lib/helpers/capabilities.js +37 -0
  24. package/build/lib/index.js +4 -8
  25. package/build/lib/jsonwp-proxy/protocol-converter.js +19 -15
  26. package/build/lib/jsonwp-proxy/proxy.js +20 -15
  27. package/build/lib/jsonwp-status/status.js +2 -4
  28. package/build/lib/protocol/errors.js +2 -4
  29. package/build/lib/protocol/helpers.js +2 -4
  30. package/build/lib/protocol/index.js +2 -4
  31. package/build/lib/protocol/protocol.js +37 -30
  32. package/build/lib/protocol/routes.js +68 -4
  33. package/build/lib/protocol/validators.js +2 -4
  34. package/build/test/basedriver/README.md +5 -0
  35. package/build/test/basedriver/driver-e2e-tests.js +2 -4
  36. package/build/test/basedriver/driver-tests.js +12 -17
  37. package/build/test/basedriver/index.js +2 -4
  38. package/build/test/e2e/basedriver/driver.e2e.spec.js +15 -0
  39. package/build/test/e2e/basedriver/helpers.e2e.spec.js +192 -0
  40. package/build/test/e2e/basedriver/websockets.e2e.spec.js +82 -0
  41. package/build/test/e2e/express/server.e2e.spec.js +159 -0
  42. package/build/test/e2e/jsonwp-proxy/proxy.e2e.spec.js +59 -0
  43. package/build/test/e2e/protocol/fake-driver.js +163 -0
  44. package/build/test/e2e/protocol/helpers.js +25 -0
  45. package/build/test/e2e/protocol/protocol.e2e.spec.js +1186 -0
  46. package/build/test/helpers.js +2 -4
  47. package/build/test/unit/basedriver/capabilities.spec.js +672 -0
  48. package/build/test/unit/basedriver/capability.spec.js +353 -0
  49. package/build/test/unit/basedriver/commands/event.spec.js +110 -0
  50. package/build/test/unit/basedriver/commands/log.spec.js +85 -0
  51. package/build/test/unit/basedriver/driver.spec.js +15 -0
  52. package/build/test/unit/basedriver/helpers.spec.js +151 -0
  53. package/build/test/unit/basedriver/timeout.spec.js +135 -0
  54. package/build/test/unit/express/server.spec.js +155 -0
  55. package/build/test/unit/express/static.spec.js +26 -0
  56. package/build/test/unit/jsonwp-proxy/mock-request.js +91 -0
  57. package/build/test/unit/jsonwp-proxy/protocol-converter.spec.js +171 -0
  58. package/build/test/unit/jsonwp-proxy/proxy.spec.js +292 -0
  59. package/build/test/unit/jsonwp-proxy/url.spec.js +165 -0
  60. package/build/test/unit/jsonwp-status/status.spec.js +34 -0
  61. package/build/test/unit/protocol/errors.spec.js +390 -0
  62. package/build/test/unit/protocol/routes.spec.js +80 -0
  63. package/build/test/unit/protocol/validator.spec.js +149 -0
  64. package/lib/basedriver/commands/find.js +3 -6
  65. package/lib/basedriver/commands/log.js +2 -4
  66. package/lib/basedriver/commands/session.js +21 -22
  67. package/lib/basedriver/commands/settings.js +3 -5
  68. package/lib/basedriver/commands/timeout.js +9 -10
  69. package/lib/basedriver/device-settings.js +10 -1
  70. package/lib/basedriver/driver.js +36 -12
  71. package/lib/basedriver/helpers.js +13 -11
  72. package/lib/express/express-logging.js +1 -1
  73. package/lib/express/idempotency.js +1 -1
  74. package/lib/helpers/capabilities.js +25 -0
  75. package/lib/index.js +2 -2
  76. package/lib/jsonwp-proxy/protocol-converter.js +14 -13
  77. package/lib/jsonwp-proxy/proxy.js +16 -12
  78. package/lib/protocol/protocol.js +34 -29
  79. package/lib/protocol/routes.js +60 -1
  80. package/package.json +36 -24
  81. package/test/basedriver/README.md +5 -0
  82. package/test/basedriver/driver-e2e-tests.js +1 -1
  83. package/test/basedriver/driver-tests.js +12 -7
  84. package/build/lib/protocol/sessions-cache.js +0 -88
  85. package/build/test/basedriver/capabilities-specs.js +0 -632
  86. package/build/test/basedriver/capability-specs.js +0 -396
  87. package/build/test/basedriver/commands/event-specs.js +0 -112
  88. package/build/test/basedriver/commands/log-specs.js +0 -80
  89. package/build/test/basedriver/driver-e2e-specs.js +0 -17
  90. package/build/test/basedriver/driver-specs.js +0 -17
  91. package/build/test/basedriver/helpers-e2e-specs.js +0 -194
  92. package/build/test/basedriver/helpers-specs.js +0 -153
  93. package/build/test/basedriver/timeout-specs.js +0 -139
  94. package/build/test/basedriver/websockets-e2e-specs.js +0 -84
  95. package/build/test/express/server-e2e-specs.js +0 -156
  96. package/build/test/express/server-specs.js +0 -151
  97. package/build/test/express/static-specs.js +0 -23
  98. package/build/test/jsonwp-proxy/mock-request.js +0 -93
  99. package/build/test/jsonwp-proxy/protocol-converter-specs.js +0 -173
  100. package/build/test/jsonwp-proxy/proxy-e2e-specs.js +0 -61
  101. package/build/test/jsonwp-proxy/proxy-specs.js +0 -294
  102. package/build/test/jsonwp-proxy/url-specs.js +0 -167
  103. package/build/test/jsonwp-status/status-specs.js +0 -36
  104. package/build/test/protocol/errors-specs.js +0 -388
  105. package/build/test/protocol/fake-driver.js +0 -168
  106. package/build/test/protocol/helpers.js +0 -27
  107. package/build/test/protocol/protocol-e2e-specs.js +0 -1182
  108. package/build/test/protocol/routes-specs.js +0 -82
  109. package/build/test/protocol/validator-specs.js +0 -151
  110. package/lib/protocol/sessions-cache.js +0 -74
  111. package/test/basedriver/capabilities-specs.js +0 -505
  112. package/test/basedriver/capability-specs.js +0 -409
  113. package/test/basedriver/commands/event-specs.js +0 -74
  114. package/test/basedriver/commands/log-specs.js +0 -70
  115. package/test/basedriver/driver-e2e-specs.js +0 -8
  116. package/test/basedriver/driver-specs.js +0 -8
  117. package/test/basedriver/fixtures/BadZippedApp.zip +0 -1
  118. package/test/basedriver/fixtures/FakeAndroidApp.apk +0 -1
  119. package/test/basedriver/fixtures/FakeAndroidApp.asd +0 -0
  120. package/test/basedriver/fixtures/FakeIOSApp.app +0 -1
  121. package/test/basedriver/fixtures/FakeIOSApp.app.zip +0 -0
  122. package/test/basedriver/fixtures/FakeIOSApp.ipa +0 -0
  123. package/test/basedriver/fixtures/custom-element-finder-bad.js +0 -5
  124. package/test/basedriver/fixtures/custom-element-finder.js +0 -29
  125. package/test/basedriver/helpers-e2e-specs.js +0 -187
  126. package/test/basedriver/helpers-specs.js +0 -137
  127. package/test/basedriver/timeout-specs.js +0 -133
  128. package/test/basedriver/websockets-e2e-specs.js +0 -75
@@ -1,82 +0,0 @@
1
- "use strict";
2
-
3
- var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
4
-
5
- require("source-map-support/register");
6
-
7
- var _lodash = require("lodash");
8
-
9
- var _protocol = require("../../lib/protocol");
10
-
11
- var _crypto = _interopRequireDefault(require("crypto"));
12
-
13
- describe('Protocol', function () {
14
- describe('ensure protocol consistency', function () {
15
- it('should not change protocol between patch versions', function () {
16
- let shasum = _crypto.default.createHash('sha1');
17
-
18
- for (let [url, urlMapping] of _lodash._.toPairs(_protocol.METHOD_MAP)) {
19
- shasum.update(url);
20
-
21
- for (let [method, methodMapping] of _lodash._.toPairs(urlMapping)) {
22
- shasum.update(method);
23
-
24
- if (methodMapping.command) {
25
- shasum.update(methodMapping.command);
26
- }
27
-
28
- if (methodMapping.payloadParams) {
29
- let allParams = _lodash._.flatten(methodMapping.payloadParams.required);
30
-
31
- if (methodMapping.payloadParams.optional) {
32
- allParams = allParams.concat(_lodash._.flatten(methodMapping.payloadParams.optional));
33
- }
34
-
35
- for (let param of allParams) {
36
- shasum.update(param);
37
- }
38
-
39
- if (methodMapping.payloadParams.wrap) {
40
- shasum.update('skip');
41
- shasum.update(methodMapping.payloadParams.wrap);
42
- }
43
- }
44
- }
45
- }
46
-
47
- let hash = shasum.digest('hex').substring(0, 8);
48
- hash.should.equal('ccbdbf87');
49
- });
50
- });
51
- describe('check route to command name conversion', function () {
52
- it('should properly lookup correct command name for endpoint with session', function () {
53
- const cmdName = (0, _protocol.routeToCommandName)('/timeouts', 'POST');
54
- cmdName.should.equal('timeouts');
55
- });
56
- it('should properly lookup correct command name for endpoint with session', function () {
57
- const cmdName = (0, _protocol.routeToCommandName)('/timeouts/implicit_wait', 'POST');
58
- cmdName.should.equal('implicitWait');
59
- });
60
- it('should properly lookup correct command name for endpoint without session', function () {
61
- const cmdName = (0, _protocol.routeToCommandName)('/status', 'GET');
62
- cmdName.should.equal('getStatus');
63
- });
64
- it('should properly lookup correct command name for endpoint without leading slash', function () {
65
- const cmdName = (0, _protocol.routeToCommandName)('status', 'GET');
66
- cmdName.should.equal('getStatus');
67
- });
68
- it('should properly lookup correct command name for fully specified endpoint', function () {
69
- const cmdName = (0, _protocol.routeToCommandName)('/status', 'GET');
70
- cmdName.should.equal('getStatus');
71
- });
72
- it('should not find command name if incorrect input data has been specified', function () {
73
- for (let [route, method] of [['/status', 'POST'], ['/xstatus', 'GET'], ['status', 'POST']]) {
74
- const cmdName = (0, _protocol.routeToCommandName)(route, method);
75
- chai.should().equal(cmdName, undefined);
76
- }
77
- });
78
- });
79
- });require('source-map-support').install();
80
-
81
-
82
- //# sourceMappingURL=data:application/json;charset=utf8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbInRlc3QvcHJvdG9jb2wvcm91dGVzLXNwZWNzLmpzIl0sIm5hbWVzIjpbImRlc2NyaWJlIiwiaXQiLCJzaGFzdW0iLCJjcnlwdG8iLCJjcmVhdGVIYXNoIiwidXJsIiwidXJsTWFwcGluZyIsIl8iLCJ0b1BhaXJzIiwiTUVUSE9EX01BUCIsInVwZGF0ZSIsIm1ldGhvZCIsIm1ldGhvZE1hcHBpbmciLCJjb21tYW5kIiwicGF5bG9hZFBhcmFtcyIsImFsbFBhcmFtcyIsImZsYXR0ZW4iLCJyZXF1aXJlZCIsIm9wdGlvbmFsIiwiY29uY2F0IiwicGFyYW0iLCJ3cmFwIiwiaGFzaCIsImRpZ2VzdCIsInN1YnN0cmluZyIsInNob3VsZCIsImVxdWFsIiwiY21kTmFtZSIsInJvdXRlIiwiY2hhaSIsInVuZGVmaW5lZCJdLCJtYXBwaW5ncyI6Ijs7Ozs7O0FBRUE7O0FBQ0E7O0FBQ0E7O0FBSUFBLFFBQVEsQ0FBQyxVQUFELEVBQWEsWUFBWTtBQUsvQkEsRUFBQUEsUUFBUSxDQUFDLDZCQUFELEVBQWdDLFlBQVk7QUFDbERDLElBQUFBLEVBQUUsQ0FBQyxtREFBRCxFQUFzRCxZQUFZO0FBQ2xFLFVBQUlDLE1BQU0sR0FBR0MsZ0JBQU9DLFVBQVAsQ0FBa0IsTUFBbEIsQ0FBYjs7QUFDQSxXQUFLLElBQUksQ0FBQ0MsR0FBRCxFQUFNQyxVQUFOLENBQVQsSUFBOEJDLFVBQUVDLE9BQUYsQ0FBVUMsb0JBQVYsQ0FBOUIsRUFBcUQ7QUFDbkRQLFFBQUFBLE1BQU0sQ0FBQ1EsTUFBUCxDQUFjTCxHQUFkOztBQUNBLGFBQUssSUFBSSxDQUFDTSxNQUFELEVBQVNDLGFBQVQsQ0FBVCxJQUFvQ0wsVUFBRUMsT0FBRixDQUFVRixVQUFWLENBQXBDLEVBQTJEO0FBQ3pESixVQUFBQSxNQUFNLENBQUNRLE1BQVAsQ0FBY0MsTUFBZDs7QUFDQSxjQUFJQyxhQUFhLENBQUNDLE9BQWxCLEVBQTJCO0FBQ3pCWCxZQUFBQSxNQUFNLENBQUNRLE1BQVAsQ0FBY0UsYUFBYSxDQUFDQyxP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MUIsQ0FBaEI7QUFDQWtCLFFBQUFBLElBQUksQ0FBQ0osTUFBTCxHQUFjQyxLQUFkLENBQW9CQyxPQUFwQixFQUE2QkcsU0FBN0I7QUFDRDtBQUNGLEtBTEMsQ0FBRjtBQU1ELEdBaENPLENBQVI7QUFrQ0QsQ0F0RU8sQ0FBUiIsInNvdXJjZXNDb250ZW50IjpbIi8vIHRyYW5zcGlsZTptb2NoYVxuXG5pbXBvcnQgeyBfIH0gZnJvbSAnbG9kYXNoJztcbmltcG9ydCB7IE1FVEhPRF9NQVAsIHJvdXRlVG9Db21tYW5kTmFtZSB9IGZyb20gJy4uLy4uL2xpYi9wcm90b2NvbCc7XG5pbXBvcnQgY3J5cHRvIGZyb20gJ2NyeXB0byc7XG5cblxuXG5kZXNjcmliZSgnUHJvdG9jb2wnLCBmdW5jdGlvbiAoKSB7XG5cbiAgLy8gVE9ETyB0ZXN0IGFnYWluc3QgYW4gZXhwbGljaXQgcHJvdG9jb2wgcmF0aGVyIHRoYW4gYSBoYXNoIG9mIGEgcHJldmlvdXNcbiAgLy8gcHJvdG9jb2xcblxuICBkZXNjcmliZSgnZW5zdXJlIHByb3RvY29sIGNvbnNpc3RlbmN5JywgZnVuY3Rpb24gKCkge1xuICAgIGl0KCdzaG91bGQgbm90IGNoYW5nZSBwcm90b2NvbCBiZXR3ZWVuIHBhdGNoIHZlcnNpb25zJywgZnVuY3Rpb24gKCkge1xuICAgICAgbGV0IHNoYXN1bSA9IGNyeXB0by5jcmVhdGVIYXNoKCdzaGExJyk7XG4gICAgICBmb3IgKGxldCBbdXJsLCB1cmxNYXBwaW5nXSBvZiBfLnRvUGFpcnMoTUVUSE9EX01BUCkpIHtcbiAgICAgICAgc2hhc3VtLnVwZGF0ZSh1cmwpO1xuICAgICAgICBmb3IgKGxldCBbbWV0aG9kLCBtZXRob2RNYXBwaW5nXSBvZiBfLnRvUGFpcnModXJsTWFwcGluZykpIHtcbiAgICAgICAgICBzaGFzdW0udXBkYXRlKG1ldGhvZCk7XG4gICAgICAgICAgaWYgKG1ldGhvZE1hcHBpbmcuY29tbWFuZCkge1xuICAgICAgICAgICAgc2hhc3VtLnVwZGF0ZShtZXRob2RNYXBwaW5nLmNvbW1hbmQpO1xuICAgICAgICAgIH1cbiAgICAgICAgICBpZiAobWV0aG9kTWFwcGluZy5wYXlsb2FkUGFyYW1zKSB7XG4gICAgICAgICAgICBsZXQgYWxsUGFyYW1zID0gXy5mbGF0dGVuKG1ldGhvZE1hcHBpbmcucGF5bG9hZFBhcmFtcy5yZXF1aXJlZCk7XG4gICAgICAgICAgICBpZiAobWV0aG9kTWFwcGluZy5wYXlsb2FkUGFyYW1zLm9wdGlvbmFsKSB7XG4gICAgICAgICAgICAgIGFsbFBhcmFtcyA9IGFsbFBhcmFtcy5jb25jYXQoXy5mbGF0dGVuKG1ldGhvZE1hcHBpbmcucGF5bG9hZFBhcmFtcy5vcHRpb25hbCkpO1xuICAgICAgICAgICAgfVxuICAgICAgICAgICAgZm9yIChsZXQgcGFyYW0gb2YgYWxsUGFyYW1zKSB7XG4gICAgICAgICAgICAgIHNoYXN1bS51cGRhdGUocGFyYW0pO1xuICAgICAgICAgICAgfVxuICAgICAgICAgICAgaWYgKG1ldGhvZE1hcHBpbmcucGF5bG9hZFBhcmFtcy53cmFwKSB7XG4gICAgICAgICAgICAgIHNoYXN1bS51cGRhdGUoJ3NraXAnKTtcbiAgICAgICAgICAgICAgc2hhc3VtLnVwZGF0ZShtZXRob2RNYXBwaW5nLnBheWxvYWRQYXJhbXMud3JhcCk7XG4gICAgICAgICAgICB9XG4gICAgICAgICAgfVxuICAgICAgICB9XG4gICAgICB9XG4gICAgICBsZXQgaGFzaCA9IHNoYXN1bS5kaWdlc3QoJ2hleCcpLnN1YnN0cmluZygwLCA4KTtcbiAgICAgIC8vIE1vZGlmeSB0aGUgaGFzaCB3aGVuZXZlciB0aGUgcHJvdG9jb2wgaGFzIGludGVudGlvbmFsbHkgYmVlbiBtb2RpZmllZC5cbiAgICAgIGhhc2guc2hvdWxkLmVxdWFsKCdjY2JkYmY4NycpO1xuICAgIH0pO1xuICB9KTtcblxuICBkZXNjcmliZSgnY2hlY2sgcm91dGUgdG8gY29tbWFuZCBuYW1lIGNvbnZlcnNpb24nLCBmdW5jdGlvbiAoKSB7XG4gICAgaXQoJ3Nob3VsZCBwcm9wZXJseSBsb29rdXAgY29ycmVjdCBjb21tYW5kIG5hbWUgZm9yIGVuZHBvaW50IHdpdGggc2Vzc2lvbicsIGZ1bmN0aW9uICgpIHtcbiAgICAgIGNvbnN0IGNtZE5hbWUgPSByb3V0ZVRvQ29tbWFuZE5hbWUoJy90aW1lb3V0cycsICdQT1NUJyk7XG4gICAgICBjbWROYW1lLnNob3VsZC5lcXVhbCgndGltZW91dHMnKTtcbiAgICB9KTtcblxuICAgIGl0KCdzaG91bGQgcHJvcGVybHkgbG9va3VwIGNvcnJlY3QgY29tbWFuZCBuYW1lIGZvciBlbmRwb2ludCB3aXRoIHNlc3Npb24nLCBmdW5jdGlvbiAoKSB7XG4gICAgICBjb25zdCBjbWROYW1lID0gcm91dGVUb0NvbW1hbmROYW1lKCcvdGltZW91dHMvaW1wbGljaXRfd2FpdCcsICdQT1NUJyk7XG4gICAgICBjbWROYW1lLnNob3VsZC5lcXVhbCgnaW1wbGljaXRXYWl0Jyk7XG4gICAgfSk7XG5cbiAgICBpdCgnc2hvdWxkIHByb3Blcmx5IGxvb2t1cCBjb3JyZWN0IGNvbW1hbmQgbmFtZSBmb3IgZW5kcG9pbnQgd2l0aG91dCBzZXNzaW9uJywgZnVuY3Rpb24gKCkge1xuICAgICAgY29uc3QgY21kTmFtZSA9IHJvdXRlVG9Db21tYW5kTmFtZSgnL3N0YXR1cycsICdHRVQnKTtcbiAgICAgIGNtZE5hbWUuc2hvdWxkLmVxdWFsKCdnZXRTdGF0dXMnKTtcbiAgICB9KTtcblxuICAgIGl0KCdzaG91bGQgcHJvcGVybHkgbG9va3VwIGNvcnJlY3QgY29tbWFuZCBuYW1lIGZvciBlbmRwb2ludCB3aXRob3V0IGxlYWRpbmcgc2xhc2gnLCBmdW5jdGlvbiAoKSB7XG4gICAgICBjb25zdCBjbWROYW1lID0gcm91dGVUb0NvbW1hbmROYW1lKCdzdGF0dXMnLCAnR0VUJyk7XG4gICAgICBjbWROYW1lLnNob3VsZC5lcXVhbCgnZ2V0U3RhdHVzJyk7XG4gICAgfSk7XG5cbiAgICBpdCgnc2hvdWxkIHByb3Blcmx5IGxvb2t1cCBjb3JyZWN0IGNvbW1hbmQgbmFtZSBmb3IgZnVsbHkgc3BlY2lmaWVkIGVuZHBvaW50JywgZnVuY3Rpb24gKCkge1xuICAgICAgY29uc3QgY21kTmFtZSA9IHJvdXRlVG9Db21tYW5kTmFtZSgnL3N0YXR1cycsICdHRVQnKTtcbiAgICAgIGNtZE5hbWUuc2hvdWxkLmVxdWFsKCdnZXRTdGF0dXMnKTtcbiAgICB9KTtcblxuICAgIGl0KCdzaG91bGQgbm90IGZpbmQgY29tbWFuZCBuYW1lIGlmIGluY29ycmVjdCBpbnB1dCBkYXRhIGhhcyBiZWVuIHNwZWNpZmllZCcsIGZ1bmN0aW9uICgpIHtcbiAgICAgIGZvciAobGV0IFtyb3V0ZSwgbWV0aG9kXSBvZiBbWycvc3RhdHVzJywgJ1BPU1QnXSwgWycveHN0YXR1cycsICdHRVQnXSwgWydzdGF0dXMnLCAnUE9TVCddXSkge1xuICAgICAgICBjb25zdCBjbWROYW1lID0gcm91dGVUb0NvbW1hbmROYW1lKHJvdXRlLCBtZXRob2QpO1xuICAgICAgICBjaGFpLnNob3VsZCgpLmVxdWFsKGNtZE5hbWUsIHVuZGVmaW5lZCk7XG4gICAgICB9XG4gICAgfSk7XG4gIH0pO1xuXG59KTtcbiJdLCJmaWxlIjoidGVzdC9wcm90b2NvbC9yb3V0ZXMtc3BlY3MuanMiLCJzb3VyY2VSb290IjoiLi4vLi4vLi4ifQ==
@@ -1,151 +0,0 @@
1
- "use strict";
2
-
3
- require("source-map-support/register");
4
-
5
- var _validators = require("../../lib/protocol/validators");
6
-
7
- describe('Protocol', function () {
8
- describe('direct to driver', function () {
9
- describe('setUrl', function () {
10
- it('should fail when no url passed', function () {
11
- (() => {
12
- _validators.validators.setUrl();
13
- }).should.throw(/url/i);
14
- });
15
- it('should fail when given invalid url', function () {
16
- (() => {
17
- _validators.validators.setUrl('foo');
18
- }).should.throw(/url/i);
19
- });
20
- it('should succeed when given url starting with http', function () {
21
- (() => {
22
- _validators.validators.setUrl('http://appium.io');
23
- }).should.not.throw();
24
- });
25
- it('should succeed when given an android-like scheme', function () {
26
- (() => {
27
- _validators.validators.setUrl('content://contacts/people/1');
28
- }).should.not.throw();
29
- });
30
- it('should succeed with hyphens dots and plus chars in the scheme', function () {
31
- (() => {
32
- _validators.validators.setUrl('my-app.a+b://login');
33
- }).should.not.throw();
34
- });
35
- it('should succeed when given an about scheme', function () {
36
- (() => {
37
- _validators.validators.setUrl('about:blank');
38
- }).should.not.throw();
39
- });
40
- it('should succeed when given a data scheme', function () {
41
- (() => {
42
- _validators.validators.setUrl('data:text/html,<html></html>');
43
- }).should.not.throw();
44
- });
45
- });
46
- describe('implicitWait', function () {
47
- it('should fail when given no ms', function () {
48
- (() => {
49
- _validators.validators.implicitWait();
50
- }).should.throw(/ms/i);
51
- });
52
- it('should fail when given a non-numeric ms', function () {
53
- (() => {
54
- _validators.validators.implicitWait('five');
55
- }).should.throw(/ms/i);
56
- });
57
- it('should fail when given a negative ms', function () {
58
- (() => {
59
- _validators.validators.implicitWait(-1);
60
- }).should.throw(/ms/i);
61
- });
62
- it('should succeed when given an ms of 0', function () {
63
- (() => {
64
- _validators.validators.implicitWait(0);
65
- }).should.not.throw();
66
- });
67
- it('should succeed when given an ms greater than 0', function () {
68
- (() => {
69
- _validators.validators.implicitWait(100);
70
- }).should.not.throw();
71
- });
72
- });
73
- describe('asyncScriptTimeout', function () {
74
- it('should fail when given no ms', function () {
75
- (() => {
76
- _validators.validators.asyncScriptTimeout();
77
- }).should.throw(/ms/i);
78
- });
79
- it('should fail when given a non-numeric ms', function () {
80
- (() => {
81
- _validators.validators.asyncScriptTimeout('five');
82
- }).should.throw(/ms/i);
83
- });
84
- it('should fail when given a negative ms', function () {
85
- (() => {
86
- _validators.validators.asyncScriptTimeout(-1);
87
- }).should.throw(/ms/i);
88
- });
89
- it('should succeed when given an ms of 0', function () {
90
- (() => {
91
- _validators.validators.asyncScriptTimeout(0);
92
- }).should.not.throw();
93
- });
94
- it('should succeed when given an ms greater than 0', function () {
95
- (() => {
96
- _validators.validators.asyncScriptTimeout(100);
97
- }).should.not.throw();
98
- });
99
- });
100
- describe('clickCurrent', function () {
101
- it('should fail when given an invalid button', function () {
102
- (() => {
103
- _validators.validators.clickCurrent(4);
104
- }).should.throw(/0, 1, or 2/i);
105
- });
106
- it('should succeed when given a valid button', function () {
107
- (() => {
108
- _validators.validators.clickCurrent(0);
109
- }).should.not.throw();
110
- (() => {
111
- _validators.validators.clickCurrent(1);
112
- }).should.not.throw();
113
- (() => {
114
- _validators.validators.clickCurrent(2);
115
- }).should.not.throw();
116
- });
117
- });
118
- describe('setNetworkConnection', function () {
119
- it('should fail when given no type', function () {
120
- (() => {
121
- _validators.validators.setNetworkConnection();
122
- }).should.throw(/0, 1, 2, 4, 6/i);
123
- });
124
- it('should fail when given an invalid type', function () {
125
- (() => {
126
- _validators.validators.setNetworkConnection(8);
127
- }).should.throw(/0, 1, 2, 4, 6/i);
128
- });
129
- it('should succeed when given a valid type', function () {
130
- (() => {
131
- _validators.validators.setNetworkConnection(0);
132
- }).should.not.throw();
133
- (() => {
134
- _validators.validators.setNetworkConnection(1);
135
- }).should.not.throw();
136
- (() => {
137
- _validators.validators.setNetworkConnection(2);
138
- }).should.not.throw();
139
- (() => {
140
- _validators.validators.setNetworkConnection(4);
141
- }).should.not.throw();
142
- (() => {
143
- _validators.validators.setNetworkConnection(6);
144
- }).should.not.throw();
145
- });
146
- });
147
- });
148
- });require('source-map-support').install();
149
-
150
-
151
- //# 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":"../../.."}
@@ -1,74 +0,0 @@
1
- import LRU from 'lru-cache';
2
- import { logger } from '@appium/support';
3
- import { PROTOCOLS } from '../constants';
4
-
5
-
6
- const GENERIC_PROTOCOL = 'GENERIC';
7
- const mjsonwpLog = logger.getLogger('MJSONWP');
8
- const w3cLog = logger.getLogger('W3C');
9
- const genericProtocolLog = logger.getLogger(GENERIC_PROTOCOL);
10
-
11
-
12
- class SessionsCache {
13
- constructor (max) {
14
- this._cache = new LRU({ max });
15
- }
16
-
17
- getLogger (sessionId, protocol) {
18
- if (sessionId) {
19
- if (this._cache.has(sessionId)) {
20
- const value = this._cache.get(sessionId);
21
- if (value.logger) {
22
- return value.logger;
23
- }
24
- protocol = protocol || value.protocol;
25
- }
26
- // Always create a new logger instance for ids
27
- // that are not in the current sessions list,
28
- // so we can still see such ids as prefixes
29
- return logger.getLogger(`${protocol || GENERIC_PROTOCOL} ` +
30
- `(${sessionId.substring(0, Math.min(sessionId.length, 8))})`);
31
- }
32
-
33
- // Fall back to protocol name-only logger if session id is unknown
34
- switch (protocol) {
35
- case PROTOCOLS.W3C:
36
- return w3cLog;
37
- case PROTOCOLS.MJSONWP:
38
- return mjsonwpLog;
39
- default:
40
- return genericProtocolLog;
41
- }
42
- }
43
-
44
- getProtocol (sessionId) {
45
- return (this._cache.get(sessionId) || {}).protocol;
46
- }
47
-
48
- putSession (sessionId, value) {
49
- if (sessionId && value) {
50
- this._cache.set(sessionId, {
51
- protocol: value,
52
- // We don't want to cache the logger instance for each random session id in the cache
53
- // in order to save memory. Instead we only cache loggers for valid ids that
54
- // are returned by `createSession` call and reset them after `deleteSession` is called
55
- logger: this.getLogger(sessionId, value),
56
- });
57
- }
58
- return value;
59
- }
60
-
61
- resetLogger (sessionId) {
62
- if (this._cache.has(sessionId)) {
63
- this._cache.get(sessionId).logger = null;
64
- }
65
- }
66
- }
67
-
68
- // This cache is useful when a session gets terminated
69
- // and removed from the sessions list in the umbrella driver,
70
- // but the client still tries to send a command to this session id.
71
- // So we know how to properly wrap the error message for it
72
- const SESSIONS_CACHE = new SessionsCache(100);
73
-
74
- export default SESSIONS_CACHE;