appium-safari-driver 2.1.0 → 2.2.0

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.
@@ -21,6 +21,9 @@ stages:
21
21
  - stage: Integration_Tests
22
22
  jobs:
23
23
  - job: Node_Integration_Tests
24
+ variables:
25
+ CI: true
26
+ _FORCE_LOGS: 1
24
27
  steps:
25
28
  - template: azure-templates/node_setup_steps.yml
26
29
  - script: npm install
package/README.md CHANGED
@@ -37,14 +37,15 @@ webkit:WebRTC | This capability allows a test to temporarily change Safari's pol
37
37
  ## Example
38
38
 
39
39
  ```python
40
- # python
41
- from selenium.webdriver.common.by import By
42
- from appium import webdriver
43
- import unittest
40
+ # Python3 + PyTest
41
+ import pytest
44
42
  import time
45
43
 
44
+ from appium import webdriver
45
+ from selenium.webdriver.common.by import By
46
+
46
47
 
47
- def setup_module(module):
48
+ def generate_caps():
48
49
  common_caps = {
49
50
  # It does not really matter what to put there, although setting 'Safari' might cause a failure
50
51
  # depending on the particular client library
@@ -64,7 +65,7 @@ def setup_module(module):
64
65
  simulator_caps = {
65
66
  **common_caps,
66
67
  'platformName': 'iOS',
67
- 'safari:platformVersion': '14.1'
68
+ 'safari:platformVersion': '14.1',
68
69
  'safari:deviceName': 'iPad Air 2',
69
70
  'safari:useSimulator': True,
70
71
  }
@@ -72,57 +73,68 @@ def setup_module(module):
72
73
  **common_caps,
73
74
  'platformName': 'Mac',
74
75
  }
75
-
76
- WebKitFeatureStatusTest.driver = webdriver.Remote('http://localhost:4723/wd/hub', simulator_caps)
77
-
78
-
79
- def teardown_module(module):
80
- WebKitFeatureStatusTest.driver.quit()
81
-
82
-
83
- class WebKitFeatureStatusTest(unittest.TestCase):
84
-
85
- def test_feature_status_page_search(self):
86
- self.driver.get("https://webkit.org/status/")
87
-
88
- # Enter "CSS" into the search box.
89
- # Ensures that at least one result appears in search
90
- # !!! Remember there are no ID and NAME locators in W3C standard
91
- # These two have been superseded by CSS ones
92
- search_box = self.driver.find_element_by_css("#search")
93
- search_box.send_keys("CSS")
94
- value = search_box.get_attribute("value")
95
- self.assertTrue(len(value) > 0)
96
- search_box.submit()
97
- time.sleep(1)
98
- # Count the visible results when filters are applied
99
- # so one result shows up in at most one filter
100
- feature_count = self.shown_feature_count()
101
- self.assertTrue(feature_count > 0)
102
-
103
- def test_feature_status_page_filters(self):
104
- self.driver.get("https://webkit.org/status/")
105
-
106
- time.sleep(1)
107
- filters = self.driver.execute_script("return document.querySelectorAll('.filter-toggle')")
108
- self.assertTrue(len(filters) is 7)
109
-
110
- # Make sure every filter is turned off.
111
- for checked_filter in filter(lambda f: f.is_selected(), filters):
112
- checked_filter.click()
113
-
114
- # Make sure you can select every filter.
115
- for filt in filters:
116
- filt.click()
117
- self.assertTrue(filt.is_selected())
118
- filt.click()
119
-
120
- def shown_feature_count(self):
121
- return len(self.driver.execute_script("return document.querySelectorAll('li.feature:not(.is-hidden)')"))
122
-
123
-
124
- if __name__ == "__main__":
125
- unittest.main()
76
+ return [real_device_caps, simulator_caps, desktop_browser_caps]
77
+
78
+
79
+ @pytest.fixture(params=generate_caps())
80
+ def driver(request):
81
+ drv = webdriver.Remote('http://localhost:4723/wd/hub', request.param)
82
+ yield drv
83
+ drv.quit()
84
+
85
+
86
+ class TimeoutError(Exception):
87
+ pass
88
+
89
+
90
+ def wait_until_truthy(func, timeout_sec=5.0, interval_sec=0.5):
91
+ started = time.time()
92
+ original_error = None
93
+ while time.time() - started < timeout_sec:
94
+ original_error = None
95
+ try:
96
+ result = func()
97
+ if result:
98
+ return result
99
+ except Exception as e:
100
+ original_error = e
101
+ time.sleep(interval_sec)
102
+ if original_error is None:
103
+ raise TimeoutError(f'Condition unmet after {timeout_sec}s timeout')
104
+ raise original_error
105
+
106
+
107
+ def test_feature_status_page_search(driver):
108
+ driver.get('https://webkit.org/status/')
109
+
110
+ # Enter "CSS" into the search box.
111
+ # Ensures that at least one result appears in search
112
+ # !!! Remember there are no ID and NAME locators in W3C standard
113
+ # These two have been superseded by CSS ones
114
+ search_box = driver.find_element_by_css('#search')
115
+ search_box.send_keys('CSS')
116
+ value = search_box.get_attribute('value')
117
+ assert len(value) > 0
118
+ search_box.submit()
119
+ # Count the visible results when filters are applied
120
+ # so one result shows up in at most one filter
121
+ assert wait_until_truthy(lambda: len(driver.execute_script("return document.querySelectorAll('li.feature:not(.is-hidden)')")) > 0)
122
+
123
+
124
+ def test_feature_status_page_filters(driver):
125
+ driver.get('https://webkit.org/status/')
126
+
127
+ assert wait_until_truthy(lambda: len(driver.execute_script("return document.querySelectorAll('.filter-toggle')")) == 7)
128
+
129
+ # Make sure every filter is turned off.
130
+ for checked_filter in filter(lambda f: f.is_selected(), filters):
131
+ checked_filter.click()
132
+
133
+ # Make sure you can select every filter.
134
+ for filt in filters:
135
+ filt.click()
136
+ assert filt.is_selected()
137
+ filt.click()
126
138
  ```
127
139
 
128
140
  ## Development
@@ -3,3 +3,4 @@ steps:
3
3
  inputs:
4
4
  versionSpec: "$(DEFAULT_NODE_VERSION)"
5
5
  - script: sudo xcode-select --switch "/Applications/Xcode_$(XCODE_VERSION).app/Contents/Developer"
6
+ # - script: safaridriver --enable
@@ -27,7 +27,7 @@ const NO_PROXY = [['GET', new RegExp('^/session/[^/]+/appium')], ['POST', new Re
27
27
 
28
28
  class SafariDriver extends _appiumBaseDriver.BaseDriver {
29
29
  constructor(opts = {}) {
30
- super(opts, false);
30
+ super(opts);
31
31
  this.desiredCapConstraints = _desiredCaps.desiredCapConstraints;
32
32
  this.locatorStrategies = ['xpath', 'tag name', 'link text', 'partial link text', 'css selector', 'id', 'name'];
33
33
  this.resetState();
@@ -62,7 +62,7 @@ class SafariDriver extends _appiumBaseDriver.BaseDriver {
62
62
  try {
63
63
  await this.safari.start((0, _utils.formatCapsForServer)(caps));
64
64
  } catch (e) {
65
- await this.safari.stop();
65
+ await this.deleteSession();
66
66
  throw e;
67
67
  }
68
68
 
@@ -75,8 +75,8 @@ class SafariDriver extends _appiumBaseDriver.BaseDriver {
75
75
  _logger.default.info('Ending Safari session');
76
76
 
77
77
  await this.safari.stop();
78
- await super.deleteSession();
79
78
  this.resetState();
79
+ await super.deleteSession();
80
80
  }
81
81
 
82
82
  }
@@ -85,4 +85,4 @@ var _default = SafariDriver;
85
85
  exports.default = _default;require('source-map-support').install();
86
86
 
87
87
 
88
- //# sourceMappingURL=data:application/json;charset=utf8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbImxpYi9kcml2ZXIuanMiXSwibmFtZXMiOlsiTk9fUFJPWFkiLCJSZWdFeHAiLCJTYWZhcmlEcml2ZXIiLCJCYXNlRHJpdmVyIiwiY29uc3RydWN0b3IiLCJvcHRzIiwiZGVzaXJlZENhcENvbnN0cmFpbnRzIiwibG9jYXRvclN0cmF0ZWdpZXMiLCJyZXNldFN0YXRlIiwiY21kIiwiZm4iLCJfIiwidG9QYWlycyIsImNvbW1hbmRzIiwicHJvdG90eXBlIiwic2FmYXJpIiwicHJveHlSZXFSZXMiLCJpc1Byb3h5QWN0aXZlIiwicHJveHlBY3RpdmUiLCJnZXRQcm94eUF2b2lkTGlzdCIsImNhblByb3h5IiwiY3JlYXRlU2Vzc2lvbiIsImFyZ3MiLCJzZXNzaW9uSWQiLCJjYXBzIiwiU2FmYXJpRHJpdmVyU2VydmVyIiwic3RhcnQiLCJlIiwic3RvcCIsInByb3h5IiwiYmluZCIsImRlbGV0ZVNlc3Npb24iLCJsb2ciLCJpbmZvIl0sIm1hcHBpbmdzIjoiOzs7Ozs7Ozs7OztBQUFBOztBQUNBOztBQUNBOztBQUNBOztBQUNBOztBQUNBOztBQUNBOztBQUVBLE1BQU1BLFFBQVEsR0FBRyxDQUNmLENBQUMsS0FBRCxFQUFRLElBQUlDLE1BQUosQ0FBVyx3QkFBWCxDQUFSLENBRGUsRUFFZixDQUFDLE1BQUQsRUFBUyxJQUFJQSxNQUFKLENBQVcsd0JBQVgsQ0FBVCxDQUZlLEVBR2YsQ0FBQyxNQUFELEVBQVMsSUFBSUEsTUFBSixDQUFXLDBDQUFYLENBQVQsQ0FIZSxFQUlmLENBQUMsTUFBRCxFQUFTLElBQUlBLE1BQUosQ0FBVyw0QkFBWCxDQUFULENBSmUsQ0FBakI7O0FBT0EsTUFBTUMsWUFBTixTQUEyQkMsNEJBQTNCLENBQXNDO0FBRXBDQyxFQUFBQSxXQUFXLENBQUVDLElBQUksR0FBRyxFQUFULEVBQWE7QUFDdEIsVUFBTUEsSUFBTixFQUFZLEtBQVo7QUFDQSxTQUFLQyxxQkFBTCxHQUE2QkEsa0NBQTdCO0FBQ0EsU0FBS0MsaUJBQUwsR0FBeUIsQ0FDdkIsT0FEdUIsRUFFdkIsVUFGdUIsRUFHdkIsV0FIdUIsRUFJdkIsbUJBSnVCLEVBS3ZCLGNBTHVCLEVBT3ZCLElBUHVCLEVBUXZCLE1BUnVCLENBQXpCO0FBVUEsU0FBS0MsVUFBTDs7QUFFQSxTQUFLLE1BQU0sQ0FBQ0MsR0FBRCxFQUFNQyxFQUFOLENBQVgsSUFBd0JDLGdCQUFFQyxPQUFGLENBQVVDLGNBQVYsQ0FBeEIsRUFBNkM7QUFDM0NYLE1BQUFBLFlBQVksQ0FBQ1ksU0FBYixDQUF1QkwsR0FBdkIsSUFBOEJDLEVBQTlCO0FBQ0Q7QUFDRjs7QUFFREYsRUFBQUEsVUFBVSxHQUFJO0FBQ1osU0FBS08sTUFBTCxHQUFjLElBQWQ7QUFDQSxTQUFLQyxXQUFMLEdBQW1CLElBQW5CO0FBQ0EsU0FBS0MsYUFBTCxHQUFxQixLQUFyQjtBQUNEOztBQUVEQyxFQUFBQSxXQUFXLEdBQUk7QUFDYixXQUFPLEtBQUtELGFBQVo7QUFDRDs7QUFFREUsRUFBQUEsaUJBQWlCLEdBQUk7QUFDbkIsV0FBT25CLFFBQVA7QUFDRDs7QUFFRG9CLEVBQUFBLFFBQVEsR0FBSTtBQUNWLFdBQU8sSUFBUDtBQUNEOztBQUVELFFBQU1DLGFBQU4sQ0FBcUIsR0FBR0MsSUFBeEIsRUFBOEI7QUFDNUIsVUFBTSxDQUFDQyxTQUFELEVBQVlDLElBQVosSUFBb0IsTUFBTSxNQUFNSCxhQUFOLENBQW9CLEdBQUdDLElBQXZCLENBQWhDO0FBQ0EsU0FBS1AsTUFBTCxHQUFjLElBQUlVLGVBQUosRUFBZDs7QUFDQSxRQUFJO0FBQ0YsWUFBTSxLQUFLVixNQUFMLENBQVlXLEtBQVosQ0FBa0IsZ0NBQW9CRixJQUFwQixDQUFsQixDQUFOO0FBQ0QsS0FGRCxDQUVFLE9BQU9HLENBQVAsRUFBVTtBQUNWLFlBQU0sS0FBS1osTUFBTCxDQUFZYSxJQUFaLEVBQU47QUFDQSxZQUFNRCxDQUFOO0FBQ0Q7O0FBQ0QsU0FBS1gsV0FBTCxHQUFtQixLQUFLRCxNQUFMLENBQVljLEtBQVosQ0FBa0JiLFdBQWxCLENBQThCYyxJQUE5QixDQUFtQyxLQUFLZixNQUFMLENBQVljLEtBQS9DLENBQW5CO0FBQ0EsU0FBS1osYUFBTCxHQUFxQixJQUFyQjtBQUNBLFdBQU8sQ0FBQ00sU0FBRCxFQUFZQyxJQUFaLENBQVA7QUFDRDs7QUFFRCxRQUFNTyxhQUFOLEdBQXVCO0FBQ3JCQyxvQkFBSUMsSUFBSixDQUFTLHVCQUFUOztBQUNBLFVBQU0sS0FBS2xCLE1BQUwsQ0FBWWEsSUFBWixFQUFOO0FBQ0EsVUFBTSxNQUFNRyxhQUFOLEVBQU47QUFDQSxTQUFLdkIsVUFBTDtBQUNEOztBQTNEbUM7O2VBOER2Qk4sWSIsInNvdXJjZXNDb250ZW50IjpbImltcG9ydCBfIGZyb20gJ2xvZGFzaCc7XG5pbXBvcnQgeyBCYXNlRHJpdmVyIH0gZnJvbSAnYXBwaXVtLWJhc2UtZHJpdmVyJztcbmltcG9ydCBsb2cgZnJvbSAnLi9sb2dnZXInO1xuaW1wb3J0IFNhZmFyaURyaXZlclNlcnZlciBmcm9tICcuL3NhZmFyaSc7XG5pbXBvcnQgeyBkZXNpcmVkQ2FwQ29uc3RyYWludHMgfSBmcm9tICcuL2Rlc2lyZWQtY2Fwcyc7XG5pbXBvcnQgY29tbWFuZHMgZnJvbSAnLi9jb21tYW5kcy9pbmRleCc7XG5pbXBvcnQgeyBmb3JtYXRDYXBzRm9yU2VydmVyIH0gZnJvbSAnLi91dGlscyc7XG5cbmNvbnN0IE5PX1BST1hZID0gW1xuICBbJ0dFVCcsIG5ldyBSZWdFeHAoJ14vc2Vzc2lvbi9bXi9dKy9hcHBpdW0nKV0sXG4gIFsnUE9TVCcsIG5ldyBSZWdFeHAoJ14vc2Vzc2lvbi9bXi9dKy9hcHBpdW0nKV0sXG4gIFsnUE9TVCcsIG5ldyBSZWdFeHAoJ14vc2Vzc2lvbi9bXi9dKy9lbGVtZW50L1teL10rL2VsZW1lbnRzPyQnKV0sXG4gIFsnUE9TVCcsIG5ldyBSZWdFeHAoJ14vc2Vzc2lvbi9bXi9dKy9lbGVtZW50cz8kJyldLFxuXTtcblxuY2xhc3MgU2FmYXJpRHJpdmVyIGV4dGVuZHMgQmFzZURyaXZlciB7XG5cbiAgY29uc3RydWN0b3IgKG9wdHMgPSB7fSkge1xuICAgIHN1cGVyKG9wdHMsIGZhbHNlKTtcbiAgICB0aGlzLmRlc2lyZWRDYXBDb25zdHJhaW50cyA9IGRlc2lyZWRDYXBDb25zdHJhaW50cztcbiAgICB0aGlzLmxvY2F0b3JTdHJhdGVnaWVzID0gW1xuICAgICAgJ3hwYXRoJyxcbiAgICAgICd0YWcgbmFtZScsXG4gICAgICAnbGluayB0ZXh0JyxcbiAgICAgICdwYXJ0aWFsIGxpbmsgdGV4dCcsXG4gICAgICAnY3NzIHNlbGVjdG9yJyxcbiAgICAgIC8vIExldCB0aGVzZSB0d28gcmVhY2ggU2FmYXJpIERyaXZlciBhbmQgZmFpbCB0aGVyZSB3aXRoIGEgcHJvcGVyIGVycm9yIG1lc3NhZ2VcbiAgICAgICdpZCcsXG4gICAgICAnbmFtZScsXG4gICAgXTtcbiAgICB0aGlzLnJlc2V0U3RhdGUoKTtcblxuICAgIGZvciAoY29uc3QgW2NtZCwgZm5dIG9mIF8udG9QYWlycyhjb21tYW5kcykpIHtcbiAgICAgIFNhZmFyaURyaXZlci5wcm90b3R5cGVbY21kXSA9IGZuO1xuICAgIH1cbiAgfVxuXG4gIHJlc2V0U3RhdGUgKCkge1xuICAgIHRoaXMuc2FmYXJpID0gbnVsbDtcbiAgICB0aGlzLnByb3h5UmVxUmVzID0gbnVsbDtcbiAgICB0aGlzLmlzUHJveHlBY3RpdmUgPSBmYWxzZTtcbiAgfVxuXG4gIHByb3h5QWN0aXZlICgpIHtcbiAgICByZXR1cm4gdGhpcy5pc1Byb3h5QWN0aXZlO1xuICB9XG5cbiAgZ2V0UHJveHlBdm9pZExpc3QgKCkge1xuICAgIHJldHVybiBOT19QUk9YWTtcbiAgfVxuXG4gIGNhblByb3h5ICgpIHtcbiAgICByZXR1cm4gdHJ1ZTtcbiAgfVxuXG4gIGFzeW5jIGNyZWF0ZVNlc3Npb24gKC4uLmFyZ3MpIHtcbiAgICBjb25zdCBbc2Vzc2lvbklkLCBjYXBzXSA9IGF3YWl0IHN1cGVyLmNyZWF0ZVNlc3Npb24oLi4uYXJncyk7XG4gICAgdGhpcy5zYWZhcmkgPSBuZXcgU2FmYXJpRHJpdmVyU2VydmVyKCk7XG4gICAgdHJ5IHtcbiAgICAgIGF3YWl0IHRoaXMuc2FmYXJpLnN0YXJ0KGZvcm1hdENhcHNGb3JTZXJ2ZXIoY2FwcykpO1xuICAgIH0gY2F0Y2ggKGUpIHtcbiAgICAgIGF3YWl0IHRoaXMuc2FmYXJpLnN0b3AoKTtcbiAgICAgIHRocm93IGU7XG4gICAgfVxuICAgIHRoaXMucHJveHlSZXFSZXMgPSB0aGlzLnNhZmFyaS5wcm94eS5wcm94eVJlcVJlcy5iaW5kKHRoaXMuc2FmYXJpLnByb3h5KTtcbiAgICB0aGlzLmlzUHJveHlBY3RpdmUgPSB0cnVlO1xuICAgIHJldHVybiBbc2Vzc2lvbklkLCBjYXBzXTtcbiAgfVxuXG4gIGFzeW5jIGRlbGV0ZVNlc3Npb24gKCkge1xuICAgIGxvZy5pbmZvKCdFbmRpbmcgU2FmYXJpIHNlc3Npb24nKTtcbiAgICBhd2FpdCB0aGlzLnNhZmFyaS5zdG9wKCk7XG4gICAgYXdhaXQgc3VwZXIuZGVsZXRlU2Vzc2lvbigpO1xuICAgIHRoaXMucmVzZXRTdGF0ZSgpO1xuICB9XG59XG5cbmV4cG9ydCBkZWZhdWx0IFNhZmFyaURyaXZlcjtcbiJdLCJmaWxlIjoibGliL2RyaXZlci5qcyIsInNvdXJjZVJvb3QiOiIuLi8uLiJ9
88
+ //# sourceMappingURL=data:application/json;charset=utf8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbImxpYi9kcml2ZXIuanMiXSwibmFtZXMiOlsiTk9fUFJPWFkiLCJSZWdFeHAiLCJTYWZhcmlEcml2ZXIiLCJCYXNlRHJpdmVyIiwiY29uc3RydWN0b3IiLCJvcHRzIiwiZGVzaXJlZENhcENvbnN0cmFpbnRzIiwibG9jYXRvclN0cmF0ZWdpZXMiLCJyZXNldFN0YXRlIiwiY21kIiwiZm4iLCJfIiwidG9QYWlycyIsImNvbW1hbmRzIiwicHJvdG90eXBlIiwic2FmYXJpIiwicHJveHlSZXFSZXMiLCJpc1Byb3h5QWN0aXZlIiwicHJveHlBY3RpdmUiLCJnZXRQcm94eUF2b2lkTGlzdCIsImNhblByb3h5IiwiY3JlYXRlU2Vzc2lvbiIsImFyZ3MiLCJzZXNzaW9uSWQiLCJjYXBzIiwiU2FmYXJpRHJpdmVyU2VydmVyIiwic3RhcnQiLCJlIiwiZGVsZXRlU2Vzc2lvbiIsInByb3h5IiwiYmluZCIsImxvZyIsImluZm8iLCJzdG9wIl0sIm1hcHBpbmdzIjoiOzs7Ozs7Ozs7OztBQUFBOztBQUNBOztBQUNBOztBQUNBOztBQUNBOztBQUNBOztBQUNBOztBQUVBLE1BQU1BLFFBQVEsR0FBRyxDQUNmLENBQUMsS0FBRCxFQUFRLElBQUlDLE1BQUosQ0FBVyx3QkFBWCxDQUFSLENBRGUsRUFFZixDQUFDLE1BQUQsRUFBUyxJQUFJQSxNQUFKLENBQVcsd0JBQVgsQ0FBVCxDQUZlLEVBR2YsQ0FBQyxNQUFELEVBQVMsSUFBSUEsTUFBSixDQUFXLDBDQUFYLENBQVQsQ0FIZSxFQUlmLENBQUMsTUFBRCxFQUFTLElBQUlBLE1BQUosQ0FBVyw0QkFBWCxDQUFULENBSmUsQ0FBakI7O0FBT0EsTUFBTUMsWUFBTixTQUEyQkMsNEJBQTNCLENBQXNDO0FBQ3BDQyxFQUFBQSxXQUFXLENBQUVDLElBQUksR0FBRyxFQUFULEVBQWE7QUFDdEIsVUFBTUEsSUFBTjtBQUNBLFNBQUtDLHFCQUFMLEdBQTZCQSxrQ0FBN0I7QUFDQSxTQUFLQyxpQkFBTCxHQUF5QixDQUN2QixPQUR1QixFQUV2QixVQUZ1QixFQUd2QixXQUh1QixFQUl2QixtQkFKdUIsRUFLdkIsY0FMdUIsRUFPdkIsSUFQdUIsRUFRdkIsTUFSdUIsQ0FBekI7QUFVQSxTQUFLQyxVQUFMOztBQUVBLFNBQUssTUFBTSxDQUFDQyxHQUFELEVBQU1DLEVBQU4sQ0FBWCxJQUF3QkMsZ0JBQUVDLE9BQUYsQ0FBVUMsY0FBVixDQUF4QixFQUE2QztBQUMzQ1gsTUFBQUEsWUFBWSxDQUFDWSxTQUFiLENBQXVCTCxHQUF2QixJQUE4QkMsRUFBOUI7QUFDRDtBQUNGOztBQUVERixFQUFBQSxVQUFVLEdBQUk7QUFDWixTQUFLTyxNQUFMLEdBQWMsSUFBZDtBQUNBLFNBQUtDLFdBQUwsR0FBbUIsSUFBbkI7QUFDQSxTQUFLQyxhQUFMLEdBQXFCLEtBQXJCO0FBQ0Q7O0FBRURDLEVBQUFBLFdBQVcsR0FBSTtBQUNiLFdBQU8sS0FBS0QsYUFBWjtBQUNEOztBQUVERSxFQUFBQSxpQkFBaUIsR0FBSTtBQUNuQixXQUFPbkIsUUFBUDtBQUNEOztBQUVEb0IsRUFBQUEsUUFBUSxHQUFJO0FBQ1YsV0FBTyxJQUFQO0FBQ0Q7O0FBRUQsUUFBTUMsYUFBTixDQUFxQixHQUFHQyxJQUF4QixFQUE4QjtBQUM1QixVQUFNLENBQUNDLFNBQUQsRUFBWUMsSUFBWixJQUFvQixNQUFNLE1BQU1ILGFBQU4sQ0FBb0IsR0FBR0MsSUFBdkIsQ0FBaEM7QUFDQSxTQUFLUCxNQUFMLEdBQWMsSUFBSVUsZUFBSixFQUFkOztBQUNBLFFBQUk7QUFDRixZQUFNLEtBQUtWLE1BQUwsQ0FBWVcsS0FBWixDQUFrQixnQ0FBb0JGLElBQXBCLENBQWxCLENBQU47QUFDRCxLQUZELENBRUUsT0FBT0csQ0FBUCxFQUFVO0FBQ1YsWUFBTSxLQUFLQyxhQUFMLEVBQU47QUFDQSxZQUFNRCxDQUFOO0FBQ0Q7O0FBQ0QsU0FBS1gsV0FBTCxHQUFtQixLQUFLRCxNQUFMLENBQVljLEtBQVosQ0FBa0JiLFdBQWxCLENBQThCYyxJQUE5QixDQUFtQyxLQUFLZixNQUFMLENBQVljLEtBQS9DLENBQW5CO0FBQ0EsU0FBS1osYUFBTCxHQUFxQixJQUFyQjtBQUNBLFdBQU8sQ0FBQ00sU0FBRCxFQUFZQyxJQUFaLENBQVA7QUFDRDs7QUFFRCxRQUFNSSxhQUFOLEdBQXVCO0FBQ3JCRyxvQkFBSUMsSUFBSixDQUFTLHVCQUFUOztBQUNBLFVBQU0sS0FBS2pCLE1BQUwsQ0FBWWtCLElBQVosRUFBTjtBQUNBLFNBQUt6QixVQUFMO0FBRUEsVUFBTSxNQUFNb0IsYUFBTixFQUFOO0FBQ0Q7O0FBM0RtQzs7ZUE4RHZCMUIsWSIsInNvdXJjZXNDb250ZW50IjpbImltcG9ydCBfIGZyb20gJ2xvZGFzaCc7XG5pbXBvcnQgeyBCYXNlRHJpdmVyIH0gZnJvbSAnYXBwaXVtLWJhc2UtZHJpdmVyJztcbmltcG9ydCBsb2cgZnJvbSAnLi9sb2dnZXInO1xuaW1wb3J0IFNhZmFyaURyaXZlclNlcnZlciBmcm9tICcuL3NhZmFyaSc7XG5pbXBvcnQgeyBkZXNpcmVkQ2FwQ29uc3RyYWludHMgfSBmcm9tICcuL2Rlc2lyZWQtY2Fwcyc7XG5pbXBvcnQgY29tbWFuZHMgZnJvbSAnLi9jb21tYW5kcy9pbmRleCc7XG5pbXBvcnQgeyBmb3JtYXRDYXBzRm9yU2VydmVyIH0gZnJvbSAnLi91dGlscyc7XG5cbmNvbnN0IE5PX1BST1hZID0gW1xuICBbJ0dFVCcsIG5ldyBSZWdFeHAoJ14vc2Vzc2lvbi9bXi9dKy9hcHBpdW0nKV0sXG4gIFsnUE9TVCcsIG5ldyBSZWdFeHAoJ14vc2Vzc2lvbi9bXi9dKy9hcHBpdW0nKV0sXG4gIFsnUE9TVCcsIG5ldyBSZWdFeHAoJ14vc2Vzc2lvbi9bXi9dKy9lbGVtZW50L1teL10rL2VsZW1lbnRzPyQnKV0sXG4gIFsnUE9TVCcsIG5ldyBSZWdFeHAoJ14vc2Vzc2lvbi9bXi9dKy9lbGVtZW50cz8kJyldLFxuXTtcblxuY2xhc3MgU2FmYXJpRHJpdmVyIGV4dGVuZHMgQmFzZURyaXZlciB7XG4gIGNvbnN0cnVjdG9yIChvcHRzID0ge30pIHtcbiAgICBzdXBlcihvcHRzKTtcbiAgICB0aGlzLmRlc2lyZWRDYXBDb25zdHJhaW50cyA9IGRlc2lyZWRDYXBDb25zdHJhaW50cztcbiAgICB0aGlzLmxvY2F0b3JTdHJhdGVnaWVzID0gW1xuICAgICAgJ3hwYXRoJyxcbiAgICAgICd0YWcgbmFtZScsXG4gICAgICAnbGluayB0ZXh0JyxcbiAgICAgICdwYXJ0aWFsIGxpbmsgdGV4dCcsXG4gICAgICAnY3NzIHNlbGVjdG9yJyxcbiAgICAgIC8vIExldCB0aGVzZSB0d28gcmVhY2ggU2FmYXJpIERyaXZlciBhbmQgZmFpbCB0aGVyZSB3aXRoIGEgcHJvcGVyIGVycm9yIG1lc3NhZ2VcbiAgICAgICdpZCcsXG4gICAgICAnbmFtZScsXG4gICAgXTtcbiAgICB0aGlzLnJlc2V0U3RhdGUoKTtcblxuICAgIGZvciAoY29uc3QgW2NtZCwgZm5dIG9mIF8udG9QYWlycyhjb21tYW5kcykpIHtcbiAgICAgIFNhZmFyaURyaXZlci5wcm90b3R5cGVbY21kXSA9IGZuO1xuICAgIH1cbiAgfVxuXG4gIHJlc2V0U3RhdGUgKCkge1xuICAgIHRoaXMuc2FmYXJpID0gbnVsbDtcbiAgICB0aGlzLnByb3h5UmVxUmVzID0gbnVsbDtcbiAgICB0aGlzLmlzUHJveHlBY3RpdmUgPSBmYWxzZTtcbiAgfVxuXG4gIHByb3h5QWN0aXZlICgpIHtcbiAgICByZXR1cm4gdGhpcy5pc1Byb3h5QWN0aXZlO1xuICB9XG5cbiAgZ2V0UHJveHlBdm9pZExpc3QgKCkge1xuICAgIHJldHVybiBOT19QUk9YWTtcbiAgfVxuXG4gIGNhblByb3h5ICgpIHtcbiAgICByZXR1cm4gdHJ1ZTtcbiAgfVxuXG4gIGFzeW5jIGNyZWF0ZVNlc3Npb24gKC4uLmFyZ3MpIHtcbiAgICBjb25zdCBbc2Vzc2lvbklkLCBjYXBzXSA9IGF3YWl0IHN1cGVyLmNyZWF0ZVNlc3Npb24oLi4uYXJncyk7XG4gICAgdGhpcy5zYWZhcmkgPSBuZXcgU2FmYXJpRHJpdmVyU2VydmVyKCk7XG4gICAgdHJ5IHtcbiAgICAgIGF3YWl0IHRoaXMuc2FmYXJpLnN0YXJ0KGZvcm1hdENhcHNGb3JTZXJ2ZXIoY2FwcykpO1xuICAgIH0gY2F0Y2ggKGUpIHtcbiAgICAgIGF3YWl0IHRoaXMuZGVsZXRlU2Vzc2lvbigpO1xuICAgICAgdGhyb3cgZTtcbiAgICB9XG4gICAgdGhpcy5wcm94eVJlcVJlcyA9IHRoaXMuc2FmYXJpLnByb3h5LnByb3h5UmVxUmVzLmJpbmQodGhpcy5zYWZhcmkucHJveHkpO1xuICAgIHRoaXMuaXNQcm94eUFjdGl2ZSA9IHRydWU7XG4gICAgcmV0dXJuIFtzZXNzaW9uSWQsIGNhcHNdO1xuICB9XG5cbiAgYXN5bmMgZGVsZXRlU2Vzc2lvbiAoKSB7XG4gICAgbG9nLmluZm8oJ0VuZGluZyBTYWZhcmkgc2Vzc2lvbicpO1xuICAgIGF3YWl0IHRoaXMuc2FmYXJpLnN0b3AoKTtcbiAgICB0aGlzLnJlc2V0U3RhdGUoKTtcblxuICAgIGF3YWl0IHN1cGVyLmRlbGV0ZVNlc3Npb24oKTtcbiAgfVxufVxuXG5leHBvcnQgZGVmYXVsdCBTYWZhcmlEcml2ZXI7XG4iXSwiZmlsZSI6ImxpYi9kcml2ZXIuanMiLCJzb3VyY2VSb290IjoiLi4vLi4ifQ==
@@ -172,15 +172,19 @@ class SafariDriverServer {
172
172
  }
173
173
 
174
174
  async stop() {
175
+ var _this$proxy;
176
+
175
177
  if (!this.isRunning) {
176
178
  log.info(`${SD_BINARY} session cannot be stopped, because the server is not running`);
177
179
  return;
178
180
  }
179
181
 
180
- try {
181
- await this.proxy.command(`/session/${this.proxy.sessionId}`, 'DELETE');
182
- } catch (e) {
183
- log.info(`${SD_BINARY} session cannot be stopped. Original error: ${e.message}`);
182
+ if ((_this$proxy = this.proxy) === null || _this$proxy === void 0 ? void 0 : _this$proxy.sessionId) {
183
+ try {
184
+ await this.proxy.command(`/session/${this.proxy.sessionId}`, 'DELETE');
185
+ } catch (e) {
186
+ log.info(`${SD_BINARY} session cannot be deleted. Original error: ${e.message}`);
187
+ }
184
188
  }
185
189
  }
186
190
 
@@ -190,4 +194,4 @@ var _default = SafariDriverServer;
190
194
  exports.default = _default;require('source-map-support').install();
191
195
 
192
196
 
193
- //# sourceMappingURL=data:application/json;charset=utf8;base64,{"version":3,"sources":["lib/safari.js"],"names":["log","logger","getLogger","SD_BINARY","STARTUP_TIMEOUT","SAFARI_PORT_RANGE","SAFARI_SERVER_GUARD","util","getLockFileGuard","path","resolve","os","tmpdir","timeout","tryRecovery","SafariProxy","JWProxy","proxyCommand","url","method","body","didProcessExit","errors","InvalidContextError","SafariDriverProcess","constructor","port","proc","isRunning","init","startPort","endPort","e","Error","safariBin","fs","which","SubProcess","on","stdout","stderr","line","debug","code","signal","info","start","kill","stop","ign","SAFARI_DRIVER_PROCESS","process","once","pid","SafariDriverServer","proxy","caps","server","base","keepAlive","command","err","message","waitMs","intervalMs","test","capabilities","firstMatch","alwaysMatch","sessionId"],"mappings":";;;;;;;;;;;AAAA;;AACA;;AACA;;AACA;;AACA;;AACA;;AACA;;AACA;;AAEA,MAAMA,GAAG,GAAGC,sBAAOC,SAAP,CAAiB,oBAAjB,CAAZ;;AAEA,MAAMC,SAAS,GAAG,cAAlB;AACA,MAAMC,eAAe,GAAG,KAAxB;AACA,MAAMC,iBAAiB,GAAG,CAAC,IAAD,EAAO,IAAP,CAA1B;;AAGA,MAAMC,mBAAmB,GAAGC,oBAAKC,gBAAL,CAC1BC,cAAKC,OAAL,CAAaC,YAAGC,MAAH,EAAb,EAA0B,0BAA1B,CAD0B,EAE1B;AAACC,EAAAA,OAAO,EAAE,CAAV;AAAaC,EAAAA,WAAW,EAAE;AAA1B,CAF0B,CAA5B;;AAMA,MAAMC,WAAN,SAA0BC,yBAA1B,CAAkC;AAChC,QAAMC,YAAN,CAAoBC,GAApB,EAAyBC,MAAzB,EAAiCC,IAAI,GAAG,IAAxC,EAA8C;AAC5C,QAAI,KAAKC,cAAT,EAAyB;AACvB,YAAM,IAAIC,yBAAOC,mBAAX,CACH,IAAGJ,MAAO,IAAGD,GAAI,sDAAlB,GACA,sFAFI,CAAN;AAGD;;AACD,WAAO,MAAM,MAAMD,YAAN,CAAmBC,GAAnB,EAAwBC,MAAxB,EAAgCC,IAAhC,CAAb;AACD;;AAR+B;;AAYlC,MAAMI,mBAAN,CAA0B;AACxBC,EAAAA,WAAW,GAAI;AACb,SAAKC,IAAL,GAAY,IAAZ;AACA,SAAKC,IAAL,GAAY,IAAZ;AACD;;AAED,MAAIC,SAAJ,GAAiB;AAAA;;AACf,WAAO,CAAC,gBAAE,KAAKD,IAAP,+CAAE,WAAWC,SAAb,CAAR;AACD;;AAED,QAAMC,IAAN,GAAc;AACZ,UAAMvB,mBAAmB,CAAC,YAAY;AACpC,UAAI,KAAKsB,SAAT,EAAoB;AAClB;AACD;;AAED,YAAM,CAACE,SAAD,EAAYC,OAAZ,IAAuB1B,iBAA7B;;AACA,UAAI;AACF,aAAKqB,IAAL,GAAY,MAAM,oCAAkBI,SAAlB,EAA6BC,OAA7B,CAAlB;AACD,OAFD,CAEE,OAAOC,CAAP,EAAU;AACV,cAAM,IAAIC,KAAJ,CACH,sCAAqCH,SAAU,KAAIC,OAAQ,IAA5D,GACC,oFADD,GAEC,oCAHG,CAAN;AAID;;AAED,UAAIG,SAAJ;;AACA,UAAI;AACFA,QAAAA,SAAS,GAAG,MAAMC,kBAAGC,KAAH,CAASjC,SAAT,CAAlB;AACD,OAFD,CAEE,OAAO6B,CAAP,EAAU;AACV,cAAM,IAAIC,KAAJ,CAAW,GAAE9B,SAAU,mCAAb,GACb,+CADG,CAAN;AAED;;AACD,WAAKwB,IAAL,GAAY,IAAIU,wBAAJ,CAAeH,SAAf,EAA0B,CAAC,IAAD,EAAO,KAAKR,IAAZ,EAAkB,YAAlB,CAA1B,CAAZ;AACA,WAAKC,IAAL,CAAUW,EAAV,CAAa,QAAb,EAAuB,CAACC,MAAD,EAASC,MAAT,KAAoB;AACzC,cAAMC,IAAI,GAAGF,MAAM,IAAIC,MAAvB;AACAxC,QAAAA,GAAG,CAAC0C,KAAJ,CAAW,IAAGvC,SAAU,KAAIsC,IAAK,EAAjC;AACD,OAHD;AAIA,WAAKd,IAAL,CAAUW,EAAV,CAAa,MAAb,EAAqB,CAACK,IAAD,EAAOC,MAAP,KAAkB;AACrC5C,QAAAA,GAAG,CAAC6C,IAAJ,CAAU,GAAE1C,SAAU,yBAAwBwC,IAAK,YAAWC,MAAO,EAArE;AACD,OAFD;AAGA5C,MAAAA,GAAG,CAAC6C,IAAJ,CAAU,aAAYX,SAAU,aAAY,KAAKR,IAAK,EAAtD;AACA,YAAM,KAAKC,IAAL,CAAUmB,KAAV,CAAgB,CAAhB,CAAN;AACD,KAhCwB,CAAzB;AAiCD;;AAED,QAAMC,IAAN,GAAc;AACZ,QAAI,KAAKnB,SAAT,EAAoB;AAClB,UAAI;AACF,cAAM,KAAKD,IAAL,CAAUqB,IAAV,CAAe,SAAf,CAAN;AACD,OAFD,CAEE,OAAOC,GAAP,EAAY,CAAE;AACjB;AACF;;AApDuB;;AAwD1B,MAAMC,qBAAqB,GAAG,IAAI1B,mBAAJ,EAA9B;AACA2B,OAAO,CAACC,IAAR,CAAa,MAAb,EAAqB,MAAM;AACzB,MAAIF,qBAAqB,CAACtB,SAA1B,EAAqC;AACnC,QAAI;AACF,mCAAU,QAAOsB,qBAAqB,CAACvB,IAAtB,CAA2B0B,GAAI,EAAhD;AACD,KAFD,CAEE,OAAOJ,GAAP,EAAY,CAAE;AACjB;AACF,CAND;;AAQA,MAAMK,kBAAN,CAAyB;AACvB7B,EAAAA,WAAW,GAAI;AACb,SAAK8B,KAAL,GAAa,IAAb;AACD;;AAED,MAAI3B,SAAJ,GAAiB;AACf,WAAO,CAAC,CAAEsB,qBAAqB,CAACtB,SAAhC;AACD;;AAED,QAAMkB,KAAN,CAAaU,IAAb,EAAmB;AACjB,UAAMN,qBAAqB,CAACrB,IAAtB,EAAN;AAEA,SAAK0B,KAAL,GAAa,IAAIxC,WAAJ,CAAgB;AAC3B0C,MAAAA,MAAM,EAAE,WADmB;AAE3B/B,MAAAA,IAAI,EAAEwB,qBAAqB,CAACxB,IAFD;AAG3BgC,MAAAA,IAAI,EAAE,EAHqB;AAI3BC,MAAAA,SAAS,EAAE;AAJgB,KAAhB,CAAb;AAMA,SAAKJ,KAAL,CAAWlC,cAAX,GAA4B,KAA5B;AACA6B,IAAAA,qBAAqB,CAACvB,IAAtB,CAA2BW,EAA3B,CAA8B,MAA9B,EAAsC,MAAM;AAC1C,WAAKiB,KAAL,CAAWlC,cAAX,GAA4B,IAA5B;AACD,KAFD;;AAIA,QAAI;AACF,YAAM,gCAAiB,YAAY;AACjC,YAAI;AACF,gBAAM,KAAKkC,KAAL,CAAWK,OAAX,CAAmB,SAAnB,EAA8B,KAA9B,CAAN;AACA,iBAAO,IAAP;AACD,SAHD,CAGE,OAAOC,GAAP,EAAY;AACZ,cAAI,KAAKN,KAAL,CAAWlC,cAAf,EAA+B;AAC7B,kBAAM,IAAIY,KAAJ,CAAU4B,GAAG,CAACC,OAAd,CAAN;AACD;;AACD,iBAAO,KAAP;AACD;AACF,OAVK,EAUH;AACDC,QAAAA,MAAM,EAAE3D,eADP;AAED4D,QAAAA,UAAU,EAAE;AAFX,OAVG,CAAN;AAcD,KAfD,CAeE,OAAOhC,CAAP,EAAU;AACV,UAAI,kBAAkBiC,IAAlB,CAAuBjC,CAAC,CAAC8B,OAAzB,CAAJ,EAAuC;AACrC,YAAIZ,qBAAqB,CAACtB,SAA1B,EAAqC;AAEnC,gBAAMsB,qBAAqB,CAACH,IAAtB,EAAN;AACD;;AACD,cAAM,IAAId,KAAJ,CAAW,gDAA+C7B,eAAgB,cAAhE,GACb,+FADa,GAEb,uCAFG,CAAN;AAGD;;AACD,YAAM4B,CAAN;AACD;;AAED,UAAM,KAAKuB,KAAL,CAAWK,OAAX,CAAmB,UAAnB,EAA+B,MAA/B,EAAuC;AAC3CM,MAAAA,YAAY,EAAE;AACZC,QAAAA,UAAU,EAAE,CAAC,EAAD,CADA;AAEZC,QAAAA,WAAW,EAAEZ;AAFD;AAD6B,KAAvC,CAAN;AAMD;;AAED,QAAMR,IAAN,GAAc;AACZ,QAAI,CAAC,KAAKpB,SAAV,EAAqB;AACnB5B,MAAAA,GAAG,CAAC6C,IAAJ,CAAU,GAAE1C,SAAU,+DAAtB;AACA;AACD;;AAED,QAAI;AACF,YAAM,KAAKoD,KAAL,CAAWK,OAAX,CAAoB,YAAW,KAAKL,KAAL,CAAWc,SAAU,EAApD,EAAuD,QAAvD,CAAN;AACD,KAFD,CAEE,OAAOrC,CAAP,EAAU;AACVhC,MAAAA,GAAG,CAAC6C,IAAJ,CAAU,GAAE1C,SAAU,+CAA8C6B,CAAC,CAAC8B,OAAQ,EAA9E;AACD;AACF;;AAtEsB;;eAyEVR,kB","sourcesContent":["import os from 'os';\nimport path from 'path';\nimport { JWProxy, errors } from 'appium-base-driver';\nimport { fs, logger, util } from 'appium-support';\nimport { SubProcess } from 'teen_process';\nimport { waitForCondition } from 'asyncbox';\nimport { findAPortNotInUse } from 'portscanner';\nimport { execSync } from 'child_process';\n\nconst log = logger.getLogger('SafariDriverServer');\n\nconst SD_BINARY = 'safaridriver';\nconst STARTUP_TIMEOUT = 10000; // seconds\nconst SAFARI_PORT_RANGE = [5100, 5200];\n// This guard is needed to make sure\n// we never run multiple Safari driver processes for the same Appium process\nconst SAFARI_SERVER_GUARD = util.getLockFileGuard(\n  path.resolve(os.tmpdir(), 'safari_server_guard.lock'),\n  {timeout: 5, tryRecovery: true}\n);\n\n\nclass SafariProxy extends JWProxy {\n  async proxyCommand (url, method, body = null) {\n    if (this.didProcessExit) {\n      throw new errors.InvalidContextError(\n        `'${method} ${url}' cannot be proxied to Safari Driver server because ` +\n        'the process is not running (probably crashed). Check the server log for more details');\n    }\n    return await super.proxyCommand(url, method, body);\n  }\n}\n\n\nclass SafariDriverProcess {\n  constructor () {\n    this.port = null;\n    this.proc = null;\n  }\n\n  get isRunning () {\n    return !!(this.proc?.isRunning);\n  }\n\n  async init () {\n    await SAFARI_SERVER_GUARD(async () => {\n      if (this.isRunning) {\n        return;\n      }\n\n      const [startPort, endPort] = SAFARI_PORT_RANGE;\n      try {\n        this.port = await findAPortNotInUse(startPort, endPort);\n      } catch (e) {\n        throw new Error(\n          `Cannot find any free port in range ${startPort}..${endPort}. ` +\n          `Double check the processes that are locking ports within this range and terminate ` +\n          `these which are not needed anymore`);\n      }\n\n      let safariBin;\n      try {\n        safariBin = await fs.which(SD_BINARY);\n      } catch (e) {\n        throw new Error(`${SD_BINARY} binary cannot be found in PATH. ` +\n          `Please make sure it is present on your system`);\n      }\n      this.proc = new SubProcess(safariBin, ['-p', this.port, '--diagnose']);\n      this.proc.on('output', (stdout, stderr) => {\n        const line = stdout || stderr;\n        log.debug(`[${SD_BINARY}] ${line}`);\n      });\n      this.proc.on('exit', (code, signal) => {\n        log.info(`${SD_BINARY} has exited with code ${code}, signal ${signal}`);\n      });\n      log.info(`Starting '${safariBin}' on port ${this.port}`);\n      await this.proc.start(0);\n    });\n  }\n\n  async kill () {\n    if (this.isRunning) {\n      try {\n        await this.proc.stop('SIGKILL');\n      } catch (ign) {}\n    }\n  }\n}\n\n// Single server process per Appium instance\nconst SAFARI_DRIVER_PROCESS = new SafariDriverProcess();\nprocess.once('exit', () => {\n  if (SAFARI_DRIVER_PROCESS.isRunning) {\n    try {\n      execSync(`kill ${SAFARI_DRIVER_PROCESS.proc.pid}`);\n    } catch (ign) {}\n  }\n});\n\nclass SafariDriverServer {\n  constructor () {\n    this.proxy = null;\n  }\n\n  get isRunning () {\n    return !!(SAFARI_DRIVER_PROCESS.isRunning);\n  }\n\n  async start (caps) {\n    await SAFARI_DRIVER_PROCESS.init();\n\n    this.proxy = new SafariProxy({\n      server: '127.0.0.1',\n      port: SAFARI_DRIVER_PROCESS.port,\n      base: '',\n      keepAlive: true,\n    });\n    this.proxy.didProcessExit = false;\n    SAFARI_DRIVER_PROCESS.proc.on('exit', () => {\n      this.proxy.didProcessExit = true;\n    });\n\n    try {\n      await waitForCondition(async () => {\n        try {\n          await this.proxy.command('/status', 'GET');\n          return true;\n        } catch (err) {\n          if (this.proxy.didProcessExit) {\n            throw new Error(err.message);\n          }\n          return false;\n        }\n      }, {\n        waitMs: STARTUP_TIMEOUT,\n        intervalMs: 1000,\n      });\n    } catch (e) {\n      if (/Condition unmet/.test(e.message)) {\n        if (SAFARI_DRIVER_PROCESS.isRunning) {\n          // avoid \"frozen\" processes,\n          await SAFARI_DRIVER_PROCESS.kill();\n        }\n        throw new Error(`Safari Driver server is not listening within ${STARTUP_TIMEOUT}ms timeout. ` +\n          `Make sure it has been executed manually at least once with '--enable' command line argument. ` +\n          `Check the server log for more details`);\n      }\n      throw e;\n    }\n\n    await this.proxy.command('/session', 'POST', {\n      capabilities: {\n        firstMatch: [{}],\n        alwaysMatch: caps,\n      }\n    });\n  }\n\n  async stop () {\n    if (!this.isRunning) {\n      log.info(`${SD_BINARY} session cannot be stopped, because the server is not running`);\n      return;\n    }\n\n    try {\n      await this.proxy.command(`/session/${this.proxy.sessionId}`, 'DELETE');\n    } catch (e) {\n      log.info(`${SD_BINARY} session cannot be stopped. Original error: ${e.message}`);\n    }\n  }\n}\n\nexport default SafariDriverServer;\n"],"file":"lib/safari.js","sourceRoot":"../.."}
197
+ //# sourceMappingURL=data:application/json;charset=utf8;base64,{"version":3,"sources":["lib/safari.js"],"names":["log","logger","getLogger","SD_BINARY","STARTUP_TIMEOUT","SAFARI_PORT_RANGE","SAFARI_SERVER_GUARD","util","getLockFileGuard","path","resolve","os","tmpdir","timeout","tryRecovery","SafariProxy","JWProxy","proxyCommand","url","method","body","didProcessExit","errors","InvalidContextError","SafariDriverProcess","constructor","port","proc","isRunning","init","startPort","endPort","e","Error","safariBin","fs","which","SubProcess","on","stdout","stderr","line","debug","code","signal","info","start","kill","stop","ign","SAFARI_DRIVER_PROCESS","process","once","pid","SafariDriverServer","proxy","caps","server","base","keepAlive","command","err","message","waitMs","intervalMs","test","capabilities","firstMatch","alwaysMatch","sessionId"],"mappings":"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","sourcesContent":["import os from 'os';\nimport path from 'path';\nimport { JWProxy, errors } from 'appium-base-driver';\nimport { fs, logger, util } from 'appium-support';\nimport { SubProcess } from 'teen_process';\nimport { waitForCondition } from 'asyncbox';\nimport { findAPortNotInUse } from 'portscanner';\nimport { execSync } from 'child_process';\n\nconst log = logger.getLogger('SafariDriverServer');\n\nconst SD_BINARY = 'safaridriver';\nconst STARTUP_TIMEOUT = 10000; // seconds\nconst SAFARI_PORT_RANGE = [5100, 5200];\n// This guard is needed to make sure\n// we never run multiple Safari driver processes for the same Appium process\nconst SAFARI_SERVER_GUARD = util.getLockFileGuard(\n  path.resolve(os.tmpdir(), 'safari_server_guard.lock'),\n  {timeout: 5, tryRecovery: true}\n);\n\n\nclass SafariProxy extends JWProxy {\n  async proxyCommand (url, method, body = null) {\n    if (this.didProcessExit) {\n      throw new errors.InvalidContextError(\n        `'${method} ${url}' cannot be proxied to Safari Driver server because ` +\n        'the process is not running (probably crashed). Check the server log for more details');\n    }\n    return await super.proxyCommand(url, method, body);\n  }\n}\n\n\nclass SafariDriverProcess {\n  constructor () {\n    this.port = null;\n    this.proc = null;\n  }\n\n  get isRunning () {\n    return !!(this.proc?.isRunning);\n  }\n\n  async init () {\n    await SAFARI_SERVER_GUARD(async () => {\n      if (this.isRunning) {\n        return;\n      }\n\n      const [startPort, endPort] = SAFARI_PORT_RANGE;\n      try {\n        this.port = await findAPortNotInUse(startPort, endPort);\n      } catch (e) {\n        throw new Error(\n          `Cannot find any free port in range ${startPort}..${endPort}. ` +\n          `Double check the processes that are locking ports within this range and terminate ` +\n          `these which are not needed anymore`);\n      }\n\n      let safariBin;\n      try {\n        safariBin = await fs.which(SD_BINARY);\n      } catch (e) {\n        throw new Error(`${SD_BINARY} binary cannot be found in PATH. ` +\n          `Please make sure it is present on your system`);\n      }\n      this.proc = new SubProcess(safariBin, ['-p', this.port, '--diagnose']);\n      this.proc.on('output', (stdout, stderr) => {\n        const line = stdout || stderr;\n        log.debug(`[${SD_BINARY}] ${line}`);\n      });\n      this.proc.on('exit', (code, signal) => {\n        log.info(`${SD_BINARY} has exited with code ${code}, signal ${signal}`);\n      });\n      log.info(`Starting '${safariBin}' on port ${this.port}`);\n      await this.proc.start(0);\n    });\n  }\n\n  async kill () {\n    if (this.isRunning) {\n      try {\n        await this.proc.stop('SIGKILL');\n      } catch (ign) {}\n    }\n  }\n}\n\n// Single server process per Appium instance\nconst SAFARI_DRIVER_PROCESS = new SafariDriverProcess();\nprocess.once('exit', () => {\n  if (SAFARI_DRIVER_PROCESS.isRunning) {\n    try {\n      execSync(`kill ${SAFARI_DRIVER_PROCESS.proc.pid}`);\n    } catch (ign) {}\n  }\n});\n\nclass SafariDriverServer {\n  constructor () {\n    this.proxy = null;\n  }\n\n  get isRunning () {\n    return !!(SAFARI_DRIVER_PROCESS.isRunning);\n  }\n\n  async start (caps) {\n    await SAFARI_DRIVER_PROCESS.init();\n\n    this.proxy = new SafariProxy({\n      server: '127.0.0.1',\n      port: SAFARI_DRIVER_PROCESS.port,\n      base: '',\n      keepAlive: true,\n    });\n    this.proxy.didProcessExit = false;\n    SAFARI_DRIVER_PROCESS.proc.on('exit', () => {\n      this.proxy.didProcessExit = true;\n    });\n\n    try {\n      await waitForCondition(async () => {\n        try {\n          await this.proxy.command('/status', 'GET');\n          return true;\n        } catch (err) {\n          if (this.proxy.didProcessExit) {\n            throw new Error(err.message);\n          }\n          return false;\n        }\n      }, {\n        waitMs: STARTUP_TIMEOUT,\n        intervalMs: 1000,\n      });\n    } catch (e) {\n      if (/Condition unmet/.test(e.message)) {\n        if (SAFARI_DRIVER_PROCESS.isRunning) {\n          // avoid \"frozen\" processes,\n          await SAFARI_DRIVER_PROCESS.kill();\n        }\n        throw new Error(`Safari Driver server is not listening within ${STARTUP_TIMEOUT}ms timeout. ` +\n          `Make sure it has been executed manually at least once with '--enable' command line argument. ` +\n          `Check the server log for more details`);\n      }\n      throw e;\n    }\n\n    await this.proxy.command('/session', 'POST', {\n      capabilities: {\n        firstMatch: [{}],\n        alwaysMatch: caps,\n      }\n    });\n  }\n\n  async stop () {\n    if (!this.isRunning) {\n      log.info(`${SD_BINARY} session cannot be stopped, because the server is not running`);\n      return;\n    }\n\n    if (this.proxy?.sessionId) {\n      try {\n        await this.proxy.command(`/session/${this.proxy.sessionId}`, 'DELETE');\n      } catch (e) {\n        log.info(`${SD_BINARY} session cannot be deleted. Original error: ${e.message}`);\n      }\n    }\n  }\n}\n\nexport default SafariDriverServer;\n"],"file":"lib/safari.js","sourceRoot":"../.."}
@@ -12,21 +12,22 @@ var _chaiAsPromised = _interopRequireDefault(require("chai-as-promised"));
12
12
 
13
13
  var _chai = _interopRequireDefault(require("chai"));
14
14
 
15
+ var _utils = require("../utils");
16
+
15
17
  _chai.default.should();
16
18
 
17
19
  _chai.default.use(_chaiAsPromised.default);
18
20
 
19
- const HOST = '127.0.0.1';
20
- const PORT = 4567;
21
21
  const CAPS = {
22
22
  browserName: 'AppiumSafari',
23
23
  platformName: 'mac'
24
24
  };
25
25
  describe('Desktop SafariDriver', function () {
26
+ this.timeout(_utils.MOCHA_TIMEOUT);
26
27
  let server;
27
28
  let driver;
28
29
  before(async function () {
29
- server = await (0, _.startServer)(PORT, HOST);
30
+ server = await (0, _.startServer)(_utils.PORT, _utils.HOST);
30
31
  });
31
32
  after(async function () {
32
33
  if (server) {
@@ -35,7 +36,7 @@ describe('Desktop SafariDriver', function () {
35
36
  }
36
37
  });
37
38
  beforeEach(async function () {
38
- driver = _wd.default.promiseChainRemote(HOST, PORT);
39
+ driver = _wd.default.promiseChainRemote(_utils.HOST, _utils.PORT);
39
40
  await driver.init(CAPS);
40
41
  });
41
42
  afterEach(async function () {
@@ -52,4 +53,4 @@ describe('Desktop SafariDriver', function () {
52
53
  });require('source-map-support').install();
53
54
 
54
55
 
55
- //# sourceMappingURL=data:application/json;charset=utf8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbInRlc3QvZnVuY3Rpb25hbC9kZXNrdG9wLWRyaXZlci1lMmUtc3BlY3MuanMiXSwibmFtZXMiOlsiY2hhaSIsInNob3VsZCIsInVzZSIsImNoYWlBc1Byb21pc2VkIiwiSE9TVCIsIlBPUlQiLCJDQVBTIiwiYnJvd3Nlck5hbWUiLCJwbGF0Zm9ybU5hbWUiLCJkZXNjcmliZSIsInNlcnZlciIsImRyaXZlciIsImJlZm9yZSIsImFmdGVyIiwiY2xvc2UiLCJiZWZvcmVFYWNoIiwid2QiLCJwcm9taXNlQ2hhaW5SZW1vdGUiLCJpbml0IiwiYWZ0ZXJFYWNoIiwicXVpdCIsIml0IiwiZ2V0IiwiYnV0dG9uIiwiZWxlbWVudEJ5Q3NzIiwidGV4dCIsImV2ZW50dWFsbHkiLCJlcWwiXSwibWFwcGluZ3MiOiI7Ozs7OztBQUFBOztBQUNBOztBQUNBOztBQUNBOztBQUVBQSxjQUFLQyxNQUFMOztBQUNBRCxjQUFLRSxHQUFMLENBQVNDLHVCQUFUOztBQUVBLE1BQU1DLElBQUksR0FBRyxXQUFiO0FBQ0EsTUFBTUMsSUFBSSxHQUFHLElBQWI7QUFDQSxNQUFNQyxJQUFJLEdBQUc7QUFDWEMsRUFBQUEsV0FBVyxFQUFFLGNBREY7QUFFWEMsRUFBQUEsWUFBWSxFQUFFO0FBRkgsQ0FBYjtBQUtBQyxRQUFRLENBQUMsc0JBQUQsRUFBeUIsWUFBWTtBQUMzQyxNQUFJQyxNQUFKO0FBQ0EsTUFBSUMsTUFBSjtBQUNBQyxFQUFBQSxNQUFNLENBQUMsa0JBQWtCO0FBQ3ZCRixJQUFBQSxNQUFNLEdBQUcsTUFBTSxtQkFBWUwsSUFBWixFQUFrQkQsSUFBbEIsQ0FBZjtBQUNELEdBRkssQ0FBTjtBQUdBUyxFQUFBQSxLQUFLLENBQUMsa0JBQWtCO0FBQ3RCLFFBQUlILE1BQUosRUFBWTtBQUNWLFlBQU1BLE1BQU0sQ0FBQ0ksS0FBUCxFQUFOO0FBQ0FKLE1BQUFBLE1BQU0sR0FBRyxJQUFUO0FBQ0Q7QUFDRixHQUxJLENBQUw7QUFNQUssRUFBQUEsVUFBVSxDQUFDLGtCQUFrQjtBQUMzQkosSUFBQUEsTUFBTSxHQUFHSyxZQUFHQyxrQkFBSCxDQUFzQmIsSUFBdEIsRUFBNEJDLElBQTVCLENBQVQ7QUFDQSxVQUFNTSxNQUFNLENBQUNPLElBQVAsQ0FBWVosSUFBWixDQUFOO0FBQ0QsR0FIUyxDQUFWO0FBSUFhLEVBQUFBLFNBQVMsQ0FBQyxrQkFBa0I7QUFDMUIsUUFBSVIsTUFBSixFQUFZO0FBQ1YsWUFBTUEsTUFBTSxDQUFDUyxJQUFQLEVBQU47QUFDQVQsTUFBQUEsTUFBTSxHQUFHLElBQVQ7QUFDRDtBQUNGLEdBTFEsQ0FBVDtBQU9BVSxFQUFBQSxFQUFFLENBQUMsaUNBQUQsRUFBb0Msa0JBQWtCO0FBQ3RELFVBQU1WLE1BQU0sQ0FBQ1csR0FBUCxDQUFXLG9CQUFYLENBQU47QUFDQSxVQUFNQyxNQUFNLEdBQUcsTUFBTVosTUFBTSxDQUFDYSxZQUFQLENBQW9CLGVBQXBCLENBQXJCO0FBQ0EsVUFBTUQsTUFBTSxDQUFDRSxJQUFQLEdBQWN4QixNQUFkLENBQXFCeUIsVUFBckIsQ0FBZ0NDLEdBQWhDLENBQW9DLGlCQUFwQyxDQUFOO0FBQ0QsR0FKQyxDQUFGO0FBS0QsQ0E1Qk8sQ0FBUiIsInNvdXJjZXNDb250ZW50IjpbImltcG9ydCB3ZCBmcm9tICd3ZCc7XG5pbXBvcnQgeyBzdGFydFNlcnZlciB9IGZyb20gJy4uLy4uJztcbmltcG9ydCBjaGFpQXNQcm9taXNlZCBmcm9tICdjaGFpLWFzLXByb21pc2VkJztcbmltcG9ydCBjaGFpIGZyb20gJ2NoYWknO1xuXG5jaGFpLnNob3VsZCgpO1xuY2hhaS51c2UoY2hhaUFzUHJvbWlzZWQpO1xuXG5jb25zdCBIT1NUID0gJzEyNy4wLjAuMSc7XG5jb25zdCBQT1JUID0gNDU2NztcbmNvbnN0IENBUFMgPSB7XG4gIGJyb3dzZXJOYW1lOiAnQXBwaXVtU2FmYXJpJyxcbiAgcGxhdGZvcm1OYW1lOiAnbWFjJyxcbn07XG5cbmRlc2NyaWJlKCdEZXNrdG9wIFNhZmFyaURyaXZlcicsIGZ1bmN0aW9uICgpIHtcbiAgbGV0IHNlcnZlcjtcbiAgbGV0IGRyaXZlcjtcbiAgYmVmb3JlKGFzeW5jIGZ1bmN0aW9uICgpIHtcbiAgICBzZXJ2ZXIgPSBhd2FpdCBzdGFydFNlcnZlcihQT1JULCBIT1NUKTtcbiAgfSk7XG4gIGFmdGVyKGFzeW5jIGZ1bmN0aW9uICgpIHtcbiAgICBpZiAoc2VydmVyKSB7XG4gICAgICBhd2FpdCBzZXJ2ZXIuY2xvc2UoKTtcbiAgICAgIHNlcnZlciA9IG51bGw7XG4gICAgfVxuICB9KTtcbiAgYmVmb3JlRWFjaChhc3luYyBmdW5jdGlvbiAoKSB7XG4gICAgZHJpdmVyID0gd2QucHJvbWlzZUNoYWluUmVtb3RlKEhPU1QsIFBPUlQpO1xuICAgIGF3YWl0IGRyaXZlci5pbml0KENBUFMpO1xuICB9KTtcbiAgYWZ0ZXJFYWNoKGFzeW5jIGZ1bmN0aW9uICgpIHtcbiAgICBpZiAoZHJpdmVyKSB7XG4gICAgICBhd2FpdCBkcml2ZXIucXVpdCgpO1xuICAgICAgZHJpdmVyID0gbnVsbDtcbiAgICB9XG4gIH0pO1xuXG4gIGl0KCdzaG91bGQgc3RhcnQgYW5kIHN0b3AgYSBzZXNzaW9uJywgYXN5bmMgZnVuY3Rpb24gKCkge1xuICAgIGF3YWl0IGRyaXZlci5nZXQoJ2h0dHBzOi8vYXBwaXVtLmlvLycpO1xuICAgIGNvbnN0IGJ1dHRvbiA9IGF3YWl0IGRyaXZlci5lbGVtZW50QnlDc3MoJyNkb3dubG9hZExpbmsnKTtcbiAgICBhd2FpdCBidXR0b24udGV4dCgpLnNob3VsZC5ldmVudHVhbGx5LmVxbCgnRG93bmxvYWQgQXBwaXVtJyk7XG4gIH0pO1xufSk7XG5cblxuIl0sImZpbGUiOiJ0ZXN0L2Z1bmN0aW9uYWwvZGVza3RvcC1kcml2ZXItZTJlLXNwZWNzLmpzIiwic291cmNlUm9vdCI6Ii4uLy4uLy4uIn0=
56
+ //# sourceMappingURL=data:application/json;charset=utf8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbInRlc3QvZnVuY3Rpb25hbC9kZXNrdG9wLWRyaXZlci1lMmUtc3BlY3MuanMiXSwibmFtZXMiOlsiY2hhaSIsInNob3VsZCIsInVzZSIsImNoYWlBc1Byb21pc2VkIiwiQ0FQUyIsImJyb3dzZXJOYW1lIiwicGxhdGZvcm1OYW1lIiwiZGVzY3JpYmUiLCJ0aW1lb3V0IiwiTU9DSEFfVElNRU9VVCIsInNlcnZlciIsImRyaXZlciIsImJlZm9yZSIsIlBPUlQiLCJIT1NUIiwiYWZ0ZXIiLCJjbG9zZSIsImJlZm9yZUVhY2giLCJ3ZCIsInByb21pc2VDaGFpblJlbW90ZSIsImluaXQiLCJhZnRlckVhY2giLCJxdWl0IiwiaXQiLCJnZXQiLCJidXR0b24iLCJlbGVtZW50QnlDc3MiLCJ0ZXh0IiwiZXZlbnR1YWxseSIsImVxbCJdLCJtYXBwaW5ncyI6Ijs7Ozs7O0FBQUE7O0FBQ0E7O0FBQ0E7O0FBQ0E7O0FBQ0E7O0FBRUFBLGNBQUtDLE1BQUw7O0FBQ0FELGNBQUtFLEdBQUwsQ0FBU0MsdUJBQVQ7O0FBR0EsTUFBTUMsSUFBSSxHQUFHO0FBQ1hDLEVBQUFBLFdBQVcsRUFBRSxjQURGO0FBRVhDLEVBQUFBLFlBQVksRUFBRTtBQUZILENBQWI7QUFLQUMsUUFBUSxDQUFDLHNCQUFELEVBQXlCLFlBQVk7QUFDM0MsT0FBS0MsT0FBTCxDQUFhQyxvQkFBYjtBQUVBLE1BQUlDLE1BQUo7QUFDQSxNQUFJQyxNQUFKO0FBQ0FDLEVBQUFBLE1BQU0sQ0FBQyxrQkFBa0I7QUFDdkJGLElBQUFBLE1BQU0sR0FBRyxNQUFNLG1CQUFZRyxXQUFaLEVBQWtCQyxXQUFsQixDQUFmO0FBQ0QsR0FGSyxDQUFOO0FBR0FDLEVBQUFBLEtBQUssQ0FBQyxrQkFBa0I7QUFDdEIsUUFBSUwsTUFBSixFQUFZO0FBQ1YsWUFBTUEsTUFBTSxDQUFDTSxLQUFQLEVBQU47QUFDQU4sTUFBQUEsTUFBTSxHQUFHLElBQVQ7QUFDRDtBQUNGLEdBTEksQ0FBTDtBQU1BTyxFQUFBQSxVQUFVLENBQUMsa0JBQWtCO0FBQzNCTixJQUFBQSxNQUFNLEdBQUdPLFlBQUdDLGtCQUFILENBQXNCTCxXQUF0QixFQUE0QkQsV0FBNUIsQ0FBVDtBQUNBLFVBQU1GLE1BQU0sQ0FBQ1MsSUFBUCxDQUFZaEIsSUFBWixDQUFOO0FBQ0QsR0FIUyxDQUFWO0FBSUFpQixFQUFBQSxTQUFTLENBQUMsa0JBQWtCO0FBQzFCLFFBQUlWLE1BQUosRUFBWTtBQUNWLFlBQU1BLE1BQU0sQ0FBQ1csSUFBUCxFQUFOO0FBQ0FYLE1BQUFBLE1BQU0sR0FBRyxJQUFUO0FBQ0Q7QUFDRixHQUxRLENBQVQ7QUFPQVksRUFBQUEsRUFBRSxDQUFDLGlDQUFELEVBQW9DLGtCQUFrQjtBQUN0RCxVQUFNWixNQUFNLENBQUNhLEdBQVAsQ0FBVyxvQkFBWCxDQUFOO0FBQ0EsVUFBTUMsTUFBTSxHQUFHLE1BQU1kLE1BQU0sQ0FBQ2UsWUFBUCxDQUFvQixlQUFwQixDQUFyQjtBQUNBLFVBQU1ELE1BQU0sQ0FBQ0UsSUFBUCxHQUFjMUIsTUFBZCxDQUFxQjJCLFVBQXJCLENBQWdDQyxHQUFoQyxDQUFvQyxpQkFBcEMsQ0FBTjtBQUNELEdBSkMsQ0FBRjtBQUtELENBOUJPLENBQVIiLCJzb3VyY2VzQ29udGVudCI6WyJpbXBvcnQgd2QgZnJvbSAnd2QnO1xuaW1wb3J0IHsgc3RhcnRTZXJ2ZXIgfSBmcm9tICcuLi8uLic7XG5pbXBvcnQgY2hhaUFzUHJvbWlzZWQgZnJvbSAnY2hhaS1hcy1wcm9taXNlZCc7XG5pbXBvcnQgY2hhaSBmcm9tICdjaGFpJztcbmltcG9ydCB7IEhPU1QsIFBPUlQsIE1PQ0hBX1RJTUVPVVQgfSBmcm9tICcuLi91dGlscyc7XG5cbmNoYWkuc2hvdWxkKCk7XG5jaGFpLnVzZShjaGFpQXNQcm9taXNlZCk7XG5cblxuY29uc3QgQ0FQUyA9IHtcbiAgYnJvd3Nlck5hbWU6ICdBcHBpdW1TYWZhcmknLFxuICBwbGF0Zm9ybU5hbWU6ICdtYWMnLFxufTtcblxuZGVzY3JpYmUoJ0Rlc2t0b3AgU2FmYXJpRHJpdmVyJywgZnVuY3Rpb24gKCkge1xuICB0aGlzLnRpbWVvdXQoTU9DSEFfVElNRU9VVCk7XG5cbiAgbGV0IHNlcnZlcjtcbiAgbGV0IGRyaXZlcjtcbiAgYmVmb3JlKGFzeW5jIGZ1bmN0aW9uICgpIHtcbiAgICBzZXJ2ZXIgPSBhd2FpdCBzdGFydFNlcnZlcihQT1JULCBIT1NUKTtcbiAgfSk7XG4gIGFmdGVyKGFzeW5jIGZ1bmN0aW9uICgpIHtcbiAgICBpZiAoc2VydmVyKSB7XG4gICAgICBhd2FpdCBzZXJ2ZXIuY2xvc2UoKTtcbiAgICAgIHNlcnZlciA9IG51bGw7XG4gICAgfVxuICB9KTtcbiAgYmVmb3JlRWFjaChhc3luYyBmdW5jdGlvbiAoKSB7XG4gICAgZHJpdmVyID0gd2QucHJvbWlzZUNoYWluUmVtb3RlKEhPU1QsIFBPUlQpO1xuICAgIGF3YWl0IGRyaXZlci5pbml0KENBUFMpO1xuICB9KTtcbiAgYWZ0ZXJFYWNoKGFzeW5jIGZ1bmN0aW9uICgpIHtcbiAgICBpZiAoZHJpdmVyKSB7XG4gICAgICBhd2FpdCBkcml2ZXIucXVpdCgpO1xuICAgICAgZHJpdmVyID0gbnVsbDtcbiAgICB9XG4gIH0pO1xuXG4gIGl0KCdzaG91bGQgc3RhcnQgYW5kIHN0b3AgYSBzZXNzaW9uJywgYXN5bmMgZnVuY3Rpb24gKCkge1xuICAgIGF3YWl0IGRyaXZlci5nZXQoJ2h0dHBzOi8vYXBwaXVtLmlvLycpO1xuICAgIGNvbnN0IGJ1dHRvbiA9IGF3YWl0IGRyaXZlci5lbGVtZW50QnlDc3MoJyNkb3dubG9hZExpbmsnKTtcbiAgICBhd2FpdCBidXR0b24udGV4dCgpLnNob3VsZC5ldmVudHVhbGx5LmVxbCgnRG93bmxvYWQgQXBwaXVtJyk7XG4gIH0pO1xufSk7XG5cblxuIl0sImZpbGUiOiJ0ZXN0L2Z1bmN0aW9uYWwvZGVza3RvcC1kcml2ZXItZTJlLXNwZWNzLmpzIiwic291cmNlUm9vdCI6Ii4uLy4uLy4uIn0=
@@ -12,13 +12,14 @@ var _chaiAsPromised = _interopRequireDefault(require("chai-as-promised"));
12
12
 
13
13
  var _chai = _interopRequireDefault(require("chai"));
14
14
 
15
+ var _nodeSimctl = _interopRequireDefault(require("node-simctl"));
16
+
17
+ var _utils = require("../utils");
18
+
15
19
  _chai.default.should();
16
20
 
17
21
  _chai.default.use(_chaiAsPromised.default);
18
22
 
19
- const HOST = '127.0.0.1';
20
- const PORT = 4567;
21
- const MOCHA_TIMEOUT = 240000;
22
23
  const PLATFORM_VERSION = process.env.PLATFORM_VERSION || '14.1';
23
24
  const DEVICE_NAME = process.env.DEVICE_NAME || 'iPhone 11 Pro Max';
24
25
  const CAPS = {
@@ -29,15 +30,31 @@ const CAPS = {
29
30
  'safari:deviceName': DEVICE_NAME
30
31
  };
31
32
  describe('Mobile SafariDriver', function () {
32
- this.timeout(MOCHA_TIMEOUT);
33
+ this.timeout(_utils.MOCHA_TIMEOUT);
33
34
  let server;
34
35
  let driver;
35
36
  before(async function () {
36
- if (process.env.DEVICE_NAME) {
37
+ if (process.env.CI) {
37
38
  return this.skip();
38
39
  }
39
40
 
40
- server = await (0, _.startServer)(PORT, HOST);
41
+ const simctl = new _nodeSimctl.default();
42
+ const allDevices = await simctl.getDevices(PLATFORM_VERSION, 'iOS');
43
+ const device = allDevices.find(({
44
+ name
45
+ }) => name === DEVICE_NAME);
46
+
47
+ if (!device) {
48
+ throw new Error(`Cannot find '${DEVICE_NAME}' Simulator (${PLATFORM_VERSION})`);
49
+ }
50
+
51
+ if (device.state !== 'Booted') {
52
+ simctl.udid = device.udid;
53
+ await simctl.bootDevice();
54
+ await simctl.startBootMonitor();
55
+ }
56
+
57
+ server = await (0, _.startServer)(_utils.PORT, _utils.HOST);
41
58
  });
42
59
  after(async function () {
43
60
  if (server) {
@@ -46,7 +63,7 @@ describe('Mobile SafariDriver', function () {
46
63
  }
47
64
  });
48
65
  beforeEach(async function () {
49
- driver = _wd.default.promiseChainRemote(HOST, PORT);
66
+ driver = _wd.default.promiseChainRemote(_utils.HOST, _utils.PORT);
50
67
  await driver.init(CAPS);
51
68
  });
52
69
  afterEach(async function () {
@@ -63,4 +80,4 @@ describe('Mobile SafariDriver', function () {
63
80
  });require('source-map-support').install();
64
81
 
65
82
 
66
- //# sourceMappingURL=data:application/json;charset=utf8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbInRlc3QvZnVuY3Rpb25hbC9tb2JpbGUtZHJpdmVyLWUyZS1zcGVjcy5qcyJdLCJuYW1lcyI6WyJjaGFpIiwic2hvdWxkIiwidXNlIiwiY2hhaUFzUHJvbWlzZWQiLCJIT1NUIiwiUE9SVCIsIk1PQ0hBX1RJTUVPVVQiLCJQTEFURk9STV9WRVJTSU9OIiwicHJvY2VzcyIsImVudiIsIkRFVklDRV9OQU1FIiwiQ0FQUyIsImJyb3dzZXJOYW1lIiwicGxhdGZvcm1OYW1lIiwiZGVzY3JpYmUiLCJ0aW1lb3V0Iiwic2VydmVyIiwiZHJpdmVyIiwiYmVmb3JlIiwic2tpcCIsImFmdGVyIiwiY2xvc2UiLCJiZWZvcmVFYWNoIiwid2QiLCJwcm9taXNlQ2hhaW5SZW1vdGUiLCJpbml0IiwiYWZ0ZXJFYWNoIiwicXVpdCIsIml0IiwiZ2V0IiwiYnV0dG9uIiwiZWxlbWVudEJ5Q3NzIiwidGV4dCIsImV2ZW50dWFsbHkiLCJlcWwiXSwibWFwcGluZ3MiOiI7Ozs7OztBQUFBOztBQUNBOztBQUNBOztBQUNBOztBQUVBQSxjQUFLQyxNQUFMOztBQUNBRCxjQUFLRSxHQUFMLENBQVNDLHVCQUFUOztBQUVBLE1BQU1DLElBQUksR0FBRyxXQUFiO0FBQ0EsTUFBTUMsSUFBSSxHQUFHLElBQWI7QUFDQSxNQUFNQyxhQUFhLEdBQUcsTUFBdEI7QUFDQSxNQUFNQyxnQkFBZ0IsR0FBR0MsT0FBTyxDQUFDQyxHQUFSLENBQVlGLGdCQUFaLElBQWdDLE1BQXpEO0FBQ0EsTUFBTUcsV0FBVyxHQUFHRixPQUFPLENBQUNDLEdBQVIsQ0FBWUMsV0FBWixJQUEyQixtQkFBL0M7QUFDQSxNQUFNQyxJQUFJLEdBQUc7QUFDWEMsRUFBQUEsV0FBVyxFQUFFLGNBREY7QUFFWEMsRUFBQUEsWUFBWSxFQUFFLEtBRkg7QUFHWCx5QkFBdUIsSUFIWjtBQUlYLDRCQUEwQk4sZ0JBSmY7QUFLWCx1QkFBcUJHO0FBTFYsQ0FBYjtBQVFBSSxRQUFRLENBQUMscUJBQUQsRUFBd0IsWUFBWTtBQUMxQyxPQUFLQyxPQUFMLENBQWFULGFBQWI7QUFFQSxNQUFJVSxNQUFKO0FBQ0EsTUFBSUMsTUFBSjtBQUNBQyxFQUFBQSxNQUFNLENBQUMsa0JBQWtCO0FBQ3ZCLFFBQUlWLE9BQU8sQ0FBQ0MsR0FBUixDQUFZQyxXQUFoQixFQUE2QjtBQUkzQixhQUFPLEtBQUtTLElBQUwsRUFBUDtBQUNEOztBQUVESCxJQUFBQSxNQUFNLEdBQUcsTUFBTSxtQkFBWVgsSUFBWixFQUFrQkQsSUFBbEIsQ0FBZjtBQUNELEdBVEssQ0FBTjtBQVVBZ0IsRUFBQUEsS0FBSyxDQUFDLGtCQUFrQjtBQUN0QixRQUFJSixNQUFKLEVBQVk7QUFDVixZQUFNQSxNQUFNLENBQUNLLEtBQVAsRUFBTjtBQUNBTCxNQUFBQSxNQUFNLEdBQUcsSUFBVDtBQUNEO0FBQ0YsR0FMSSxDQUFMO0FBTUFNLEVBQUFBLFVBQVUsQ0FBQyxrQkFBa0I7QUFDM0JMLElBQUFBLE1BQU0sR0FBR00sWUFBR0Msa0JBQUgsQ0FBc0JwQixJQUF0QixFQUE0QkMsSUFBNUIsQ0FBVDtBQUNBLFVBQU1ZLE1BQU0sQ0FBQ1EsSUFBUCxDQUFZZCxJQUFaLENBQU47QUFDRCxHQUhTLENBQVY7QUFJQWUsRUFBQUEsU0FBUyxDQUFDLGtCQUFrQjtBQUMxQixRQUFJVCxNQUFKLEVBQVk7QUFDVixZQUFNQSxNQUFNLENBQUNVLElBQVAsRUFBTjtBQUNBVixNQUFBQSxNQUFNLEdBQUcsSUFBVDtBQUNEO0FBQ0YsR0FMUSxDQUFUO0FBT0FXLEVBQUFBLEVBQUUsQ0FBQyxpQ0FBRCxFQUFvQyxrQkFBa0I7QUFDdEQsVUFBTVgsTUFBTSxDQUFDWSxHQUFQLENBQVcsb0JBQVgsQ0FBTjtBQUNBLFVBQU1DLE1BQU0sR0FBRyxNQUFNYixNQUFNLENBQUNjLFlBQVAsQ0FBb0IsZUFBcEIsQ0FBckI7QUFDQSxVQUFNRCxNQUFNLENBQUNFLElBQVAsR0FBYy9CLE1BQWQsQ0FBcUJnQyxVQUFyQixDQUFnQ0MsR0FBaEMsQ0FBb0MsaUJBQXBDLENBQU47QUFDRCxHQUpDLENBQUY7QUFLRCxDQXJDTyxDQUFSIiwic291cmNlc0NvbnRlbnQiOlsiaW1wb3J0IHdkIGZyb20gJ3dkJztcbmltcG9ydCB7IHN0YXJ0U2VydmVyIH0gZnJvbSAnLi4vLi4nO1xuaW1wb3J0IGNoYWlBc1Byb21pc2VkIGZyb20gJ2NoYWktYXMtcHJvbWlzZWQnO1xuaW1wb3J0IGNoYWkgZnJvbSAnY2hhaSc7XG5cbmNoYWkuc2hvdWxkKCk7XG5jaGFpLnVzZShjaGFpQXNQcm9taXNlZCk7XG5cbmNvbnN0IEhPU1QgPSAnMTI3LjAuMC4xJztcbmNvbnN0IFBPUlQgPSA0NTY3O1xuY29uc3QgTU9DSEFfVElNRU9VVCA9IDI0MDAwMDtcbmNvbnN0IFBMQVRGT1JNX1ZFUlNJT04gPSBwcm9jZXNzLmVudi5QTEFURk9STV9WRVJTSU9OIHx8ICcxNC4xJztcbmNvbnN0IERFVklDRV9OQU1FID0gcHJvY2Vzcy5lbnYuREVWSUNFX05BTUUgfHwgJ2lQaG9uZSAxMSBQcm8gTWF4JztcbmNvbnN0IENBUFMgPSB7XG4gIGJyb3dzZXJOYW1lOiAnQXBwaXVtU2FmYXJpJyxcbiAgcGxhdGZvcm1OYW1lOiAnaW9zJyxcbiAgJ3NhZmFyaTp1c2VTaW11bGF0b3InOiB0cnVlLFxuICAnc2FmYXJpOnBsYXRmb3JtVmVyc2lvbic6IFBMQVRGT1JNX1ZFUlNJT04sXG4gICdzYWZhcmk6ZGV2aWNlTmFtZSc6IERFVklDRV9OQU1FLFxufTtcblxuZGVzY3JpYmUoJ01vYmlsZSBTYWZhcmlEcml2ZXInLCBmdW5jdGlvbiAoKSB7XG4gIHRoaXMudGltZW91dChNT0NIQV9USU1FT1VUKTtcblxuICBsZXQgc2VydmVyO1xuICBsZXQgZHJpdmVyO1xuICBiZWZvcmUoYXN5bmMgZnVuY3Rpb24gKCkge1xuICAgIGlmIChwcm9jZXNzLmVudi5ERVZJQ0VfTkFNRSkge1xuICAgICAgLy8gSW4gQXp1cmUgQ0kgdGhlIHN0dWZmIGZhaWxzIHdpdGhcbiAgICAgIC8vIFwiVGhlIGRldmljZSBpcyBub3QgY29uZmlndXJlZCB0byBhbGxvdyByZW1vdGUgY29udHJvbCB2aWEgV2ViRHJpdmVyLiBUbyBmaXggdGhpcywgdG9nZ2xlICdBbGxvdyBSZW1vdGUgQXV0b21hdGlvbicgaW4gU2FmYXJpJ3Mgc2V0dGluZ3MgKFNldHRpbmdzIEFwcCA+IFNhZmFyaSA+IEFkdmFuY2VkKS5cIlxuICAgICAgLy8gZXJyb3JcbiAgICAgIHJldHVybiB0aGlzLnNraXAoKTtcbiAgICB9XG5cbiAgICBzZXJ2ZXIgPSBhd2FpdCBzdGFydFNlcnZlcihQT1JULCBIT1NUKTtcbiAgfSk7XG4gIGFmdGVyKGFzeW5jIGZ1bmN0aW9uICgpIHtcbiAgICBpZiAoc2VydmVyKSB7XG4gICAgICBhd2FpdCBzZXJ2ZXIuY2xvc2UoKTtcbiAgICAgIHNlcnZlciA9IG51bGw7XG4gICAgfVxuICB9KTtcbiAgYmVmb3JlRWFjaChhc3luYyBmdW5jdGlvbiAoKSB7XG4gICAgZHJpdmVyID0gd2QucHJvbWlzZUNoYWluUmVtb3RlKEhPU1QsIFBPUlQpO1xuICAgIGF3YWl0IGRyaXZlci5pbml0KENBUFMpO1xuICB9KTtcbiAgYWZ0ZXJFYWNoKGFzeW5jIGZ1bmN0aW9uICgpIHtcbiAgICBpZiAoZHJpdmVyKSB7XG4gICAgICBhd2FpdCBkcml2ZXIucXVpdCgpO1xuICAgICAgZHJpdmVyID0gbnVsbDtcbiAgICB9XG4gIH0pO1xuXG4gIGl0KCdzaG91bGQgc3RhcnQgYW5kIHN0b3AgYSBzZXNzaW9uJywgYXN5bmMgZnVuY3Rpb24gKCkge1xuICAgIGF3YWl0IGRyaXZlci5nZXQoJ2h0dHBzOi8vYXBwaXVtLmlvLycpO1xuICAgIGNvbnN0IGJ1dHRvbiA9IGF3YWl0IGRyaXZlci5lbGVtZW50QnlDc3MoJyNkb3dubG9hZExpbmsnKTtcbiAgICBhd2FpdCBidXR0b24udGV4dCgpLnNob3VsZC5ldmVudHVhbGx5LmVxbCgnRG93bmxvYWQgQXBwaXVtJyk7XG4gIH0pO1xufSk7XG5cblxuIl0sImZpbGUiOiJ0ZXN0L2Z1bmN0aW9uYWwvbW9iaWxlLWRyaXZlci1lMmUtc3BlY3MuanMiLCJzb3VyY2VSb290IjoiLi4vLi4vLi4ifQ==
83
+ //# sourceMappingURL=data:application/json;charset=utf8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbInRlc3QvZnVuY3Rpb25hbC9tb2JpbGUtZHJpdmVyLWUyZS1zcGVjcy5qcyJdLCJuYW1lcyI6WyJjaGFpIiwic2hvdWxkIiwidXNlIiwiY2hhaUFzUHJvbWlzZWQiLCJQTEFURk9STV9WRVJTSU9OIiwicHJvY2VzcyIsImVudiIsIkRFVklDRV9OQU1FIiwiQ0FQUyIsImJyb3dzZXJOYW1lIiwicGxhdGZvcm1OYW1lIiwiZGVzY3JpYmUiLCJ0aW1lb3V0IiwiTU9DSEFfVElNRU9VVCIsInNlcnZlciIsImRyaXZlciIsImJlZm9yZSIsIkNJIiwic2tpcCIsInNpbWN0bCIsIlNpbWN0bCIsImFsbERldmljZXMiLCJnZXREZXZpY2VzIiwiZGV2aWNlIiwiZmluZCIsIm5hbWUiLCJFcnJvciIsInN0YXRlIiwidWRpZCIsImJvb3REZXZpY2UiLCJzdGFydEJvb3RNb25pdG9yIiwiUE9SVCIsIkhPU1QiLCJhZnRlciIsImNsb3NlIiwiYmVmb3JlRWFjaCIsIndkIiwicHJvbWlzZUNoYWluUmVtb3RlIiwiaW5pdCIsImFmdGVyRWFjaCIsInF1aXQiLCJpdCIsImdldCIsImJ1dHRvbiIsImVsZW1lbnRCeUNzcyIsInRleHQiLCJldmVudHVhbGx5IiwiZXFsIl0sIm1hcHBpbmdzIjoiOzs7Ozs7QUFBQTs7QUFDQTs7QUFDQTs7QUFDQTs7QUFDQTs7QUFDQTs7QUFFQUEsY0FBS0MsTUFBTDs7QUFDQUQsY0FBS0UsR0FBTCxDQUFTQyx1QkFBVDs7QUFFQSxNQUFNQyxnQkFBZ0IsR0FBR0MsT0FBTyxDQUFDQyxHQUFSLENBQVlGLGdCQUFaLElBQWdDLE1BQXpEO0FBQ0EsTUFBTUcsV0FBVyxHQUFHRixPQUFPLENBQUNDLEdBQVIsQ0FBWUMsV0FBWixJQUEyQixtQkFBL0M7QUFDQSxNQUFNQyxJQUFJLEdBQUc7QUFDWEMsRUFBQUEsV0FBVyxFQUFFLGNBREY7QUFFWEMsRUFBQUEsWUFBWSxFQUFFLEtBRkg7QUFHWCx5QkFBdUIsSUFIWjtBQUlYLDRCQUEwQk4sZ0JBSmY7QUFLWCx1QkFBcUJHO0FBTFYsQ0FBYjtBQVFBSSxRQUFRLENBQUMscUJBQUQsRUFBd0IsWUFBWTtBQUMxQyxPQUFLQyxPQUFMLENBQWFDLG9CQUFiO0FBRUEsTUFBSUMsTUFBSjtBQUNBLE1BQUlDLE1BQUo7QUFDQUMsRUFBQUEsTUFBTSxDQUFDLGtCQUFrQjtBQUN2QixRQUFJWCxPQUFPLENBQUNDLEdBQVIsQ0FBWVcsRUFBaEIsRUFBb0I7QUFJbEIsYUFBTyxLQUFLQyxJQUFMLEVBQVA7QUFDRDs7QUFHRCxVQUFNQyxNQUFNLEdBQUcsSUFBSUMsbUJBQUosRUFBZjtBQUNBLFVBQU1DLFVBQVUsR0FBRyxNQUFNRixNQUFNLENBQUNHLFVBQVAsQ0FBa0JsQixnQkFBbEIsRUFBb0MsS0FBcEMsQ0FBekI7QUFDQSxVQUFNbUIsTUFBTSxHQUFHRixVQUFVLENBQUNHLElBQVgsQ0FBZ0IsQ0FBQztBQUFDQyxNQUFBQTtBQUFELEtBQUQsS0FBWUEsSUFBSSxLQUFLbEIsV0FBckMsQ0FBZjs7QUFDQSxRQUFJLENBQUNnQixNQUFMLEVBQWE7QUFDWCxZQUFNLElBQUlHLEtBQUosQ0FBVyxnQkFBZW5CLFdBQVksZ0JBQWVILGdCQUFpQixHQUF0RSxDQUFOO0FBQ0Q7O0FBQ0QsUUFBSW1CLE1BQU0sQ0FBQ0ksS0FBUCxLQUFpQixRQUFyQixFQUErQjtBQUM3QlIsTUFBQUEsTUFBTSxDQUFDUyxJQUFQLEdBQWNMLE1BQU0sQ0FBQ0ssSUFBckI7QUFDQSxZQUFNVCxNQUFNLENBQUNVLFVBQVAsRUFBTjtBQUNBLFlBQU1WLE1BQU0sQ0FBQ1csZ0JBQVAsRUFBTjtBQUNEOztBQUVEaEIsSUFBQUEsTUFBTSxHQUFHLE1BQU0sbUJBQVlpQixXQUFaLEVBQWtCQyxXQUFsQixDQUFmO0FBQ0QsR0F0QkssQ0FBTjtBQXVCQUMsRUFBQUEsS0FBSyxDQUFDLGtCQUFrQjtBQUN0QixRQUFJbkIsTUFBSixFQUFZO0FBQ1YsWUFBTUEsTUFBTSxDQUFDb0IsS0FBUCxFQUFOO0FBQ0FwQixNQUFBQSxNQUFNLEdBQUcsSUFBVDtBQUNEO0FBQ0YsR0FMSSxDQUFMO0FBTUFxQixFQUFBQSxVQUFVLENBQUMsa0JBQWtCO0FBQzNCcEIsSUFBQUEsTUFBTSxHQUFHcUIsWUFBR0Msa0JBQUgsQ0FBc0JMLFdBQXRCLEVBQTRCRCxXQUE1QixDQUFUO0FBQ0EsVUFBTWhCLE1BQU0sQ0FBQ3VCLElBQVAsQ0FBWTlCLElBQVosQ0FBTjtBQUNELEdBSFMsQ0FBVjtBQUlBK0IsRUFBQUEsU0FBUyxDQUFDLGtCQUFrQjtBQUMxQixRQUFJeEIsTUFBSixFQUFZO0FBQ1YsWUFBTUEsTUFBTSxDQUFDeUIsSUFBUCxFQUFOO0FBQ0F6QixNQUFBQSxNQUFNLEdBQUcsSUFBVDtBQUNEO0FBQ0YsR0FMUSxDQUFUO0FBT0EwQixFQUFBQSxFQUFFLENBQUMsaUNBQUQsRUFBb0Msa0JBQWtCO0FBQ3RELFVBQU0xQixNQUFNLENBQUMyQixHQUFQLENBQVcsb0JBQVgsQ0FBTjtBQUNBLFVBQU1DLE1BQU0sR0FBRyxNQUFNNUIsTUFBTSxDQUFDNkIsWUFBUCxDQUFvQixlQUFwQixDQUFyQjtBQUNBLFVBQU1ELE1BQU0sQ0FBQ0UsSUFBUCxHQUFjNUMsTUFBZCxDQUFxQjZDLFVBQXJCLENBQWdDQyxHQUFoQyxDQUFvQyxpQkFBcEMsQ0FBTjtBQUNELEdBSkMsQ0FBRjtBQUtELENBbERPLENBQVIiLCJzb3VyY2VzQ29udGVudCI6WyJpbXBvcnQgd2QgZnJvbSAnd2QnO1xuaW1wb3J0IHsgc3RhcnRTZXJ2ZXIgfSBmcm9tICcuLi8uLic7XG5pbXBvcnQgY2hhaUFzUHJvbWlzZWQgZnJvbSAnY2hhaS1hcy1wcm9taXNlZCc7XG5pbXBvcnQgY2hhaSBmcm9tICdjaGFpJztcbmltcG9ydCBTaW1jdGwgZnJvbSAnbm9kZS1zaW1jdGwnO1xuaW1wb3J0IHsgSE9TVCwgUE9SVCwgTU9DSEFfVElNRU9VVCB9IGZyb20gJy4uL3V0aWxzJztcblxuY2hhaS5zaG91bGQoKTtcbmNoYWkudXNlKGNoYWlBc1Byb21pc2VkKTtcblxuY29uc3QgUExBVEZPUk1fVkVSU0lPTiA9IHByb2Nlc3MuZW52LlBMQVRGT1JNX1ZFUlNJT04gfHwgJzE0LjEnO1xuY29uc3QgREVWSUNFX05BTUUgPSBwcm9jZXNzLmVudi5ERVZJQ0VfTkFNRSB8fCAnaVBob25lIDExIFBybyBNYXgnO1xuY29uc3QgQ0FQUyA9IHtcbiAgYnJvd3Nlck5hbWU6ICdBcHBpdW1TYWZhcmknLFxuICBwbGF0Zm9ybU5hbWU6ICdpb3MnLFxuICAnc2FmYXJpOnVzZVNpbXVsYXRvcic6IHRydWUsXG4gICdzYWZhcmk6cGxhdGZvcm1WZXJzaW9uJzogUExBVEZPUk1fVkVSU0lPTixcbiAgJ3NhZmFyaTpkZXZpY2VOYW1lJzogREVWSUNFX05BTUUsXG59O1xuXG5kZXNjcmliZSgnTW9iaWxlIFNhZmFyaURyaXZlcicsIGZ1bmN0aW9uICgpIHtcbiAgdGhpcy50aW1lb3V0KE1PQ0hBX1RJTUVPVVQpO1xuXG4gIGxldCBzZXJ2ZXI7XG4gIGxldCBkcml2ZXI7XG4gIGJlZm9yZShhc3luYyBmdW5jdGlvbiAoKSB7XG4gICAgaWYgKHByb2Nlc3MuZW52LkNJKSB7XG4gICAgICAvLyBJbiBBenVyZSBDSSB0aGUgc3R1ZmYgdW5leHBlY3RlZGx5IGZhaWxzIHdpdGhcbiAgICAgIC8vIFwiVGhlIGRldmljZSBpcyBub3QgY29uZmlndXJlZCB0byBhbGxvdyByZW1vdGUgY29udHJvbCB2aWEgV2ViRHJpdmVyLiBUbyBmaXggdGhpcywgdG9nZ2xlICdBbGxvdyBSZW1vdGUgQXV0b21hdGlvbicgaW4gU2FmYXJpJ3Mgc2V0dGluZ3MgKFNldHRpbmdzIEFwcCA+IFNhZmFyaSA+IEFkdmFuY2VkKS5cIlxuICAgICAgLy8gZXJyb3JcbiAgICAgIHJldHVybiB0aGlzLnNraXAoKTtcbiAgICB9XG5cbiAgICAvLyBQcmVib290IFNpbXVsYXRvciB0byBhdm9pZCB1bmV4cGVjdGVkIHRpbWVvdXRzXG4gICAgY29uc3Qgc2ltY3RsID0gbmV3IFNpbWN0bCgpO1xuICAgIGNvbnN0IGFsbERldmljZXMgPSBhd2FpdCBzaW1jdGwuZ2V0RGV2aWNlcyhQTEFURk9STV9WRVJTSU9OLCAnaU9TJyk7XG4gICAgY29uc3QgZGV2aWNlID0gYWxsRGV2aWNlcy5maW5kKCh7bmFtZX0pID0+IG5hbWUgPT09IERFVklDRV9OQU1FKTtcbiAgICBpZiAoIWRldmljZSkge1xuICAgICAgdGhyb3cgbmV3IEVycm9yKGBDYW5ub3QgZmluZCAnJHtERVZJQ0VfTkFNRX0nIFNpbXVsYXRvciAoJHtQTEFURk9STV9WRVJTSU9OfSlgKTtcbiAgICB9XG4gICAgaWYgKGRldmljZS5zdGF0ZSAhPT0gJ0Jvb3RlZCcpIHtcbiAgICAgIHNpbWN0bC51ZGlkID0gZGV2aWNlLnVkaWQ7XG4gICAgICBhd2FpdCBzaW1jdGwuYm9vdERldmljZSgpO1xuICAgICAgYXdhaXQgc2ltY3RsLnN0YXJ0Qm9vdE1vbml0b3IoKTtcbiAgICB9XG5cbiAgICBzZXJ2ZXIgPSBhd2FpdCBzdGFydFNlcnZlcihQT1JULCBIT1NUKTtcbiAgfSk7XG4gIGFmdGVyKGFzeW5jIGZ1bmN0aW9uICgpIHtcbiAgICBpZiAoc2VydmVyKSB7XG4gICAgICBhd2FpdCBzZXJ2ZXIuY2xvc2UoKTtcbiAgICAgIHNlcnZlciA9IG51bGw7XG4gICAgfVxuICB9KTtcbiAgYmVmb3JlRWFjaChhc3luYyBmdW5jdGlvbiAoKSB7XG4gICAgZHJpdmVyID0gd2QucHJvbWlzZUNoYWluUmVtb3RlKEhPU1QsIFBPUlQpO1xuICAgIGF3YWl0IGRyaXZlci5pbml0KENBUFMpO1xuICB9KTtcbiAgYWZ0ZXJFYWNoKGFzeW5jIGZ1bmN0aW9uICgpIHtcbiAgICBpZiAoZHJpdmVyKSB7XG4gICAgICBhd2FpdCBkcml2ZXIucXVpdCgpO1xuICAgICAgZHJpdmVyID0gbnVsbDtcbiAgICB9XG4gIH0pO1xuXG4gIGl0KCdzaG91bGQgc3RhcnQgYW5kIHN0b3AgYSBzZXNzaW9uJywgYXN5bmMgZnVuY3Rpb24gKCkge1xuICAgIGF3YWl0IGRyaXZlci5nZXQoJ2h0dHBzOi8vYXBwaXVtLmlvLycpO1xuICAgIGNvbnN0IGJ1dHRvbiA9IGF3YWl0IGRyaXZlci5lbGVtZW50QnlDc3MoJyNkb3dubG9hZExpbmsnKTtcbiAgICBhd2FpdCBidXR0b24udGV4dCgpLnNob3VsZC5ldmVudHVhbGx5LmVxbCgnRG93bmxvYWQgQXBwaXVtJyk7XG4gIH0pO1xufSk7XG5cblxuIl0sImZpbGUiOiJ0ZXN0L2Z1bmN0aW9uYWwvbW9iaWxlLWRyaXZlci1lMmUtc3BlY3MuanMiLCJzb3VyY2VSb290IjoiLi4vLi4vLi4ifQ==
@@ -0,0 +1,18 @@
1
+ "use strict";
2
+
3
+ Object.defineProperty(exports, "__esModule", {
4
+ value: true
5
+ });
6
+ exports.MOCHA_TIMEOUT = exports.PORT = exports.HOST = void 0;
7
+
8
+ require("source-map-support/register");
9
+
10
+ const HOST = '127.0.0.1';
11
+ exports.HOST = HOST;
12
+ const PORT = 4567;
13
+ exports.PORT = PORT;
14
+ const MOCHA_TIMEOUT = 240000;
15
+ exports.MOCHA_TIMEOUT = MOCHA_TIMEOUT;require('source-map-support').install();
16
+
17
+
18
+ //# sourceMappingURL=data:application/json;charset=utf8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbInRlc3QvdXRpbHMuanMiXSwibmFtZXMiOlsiSE9TVCIsIlBPUlQiLCJNT0NIQV9USU1FT1VUIl0sIm1hcHBpbmdzIjoiOzs7Ozs7Ozs7QUFBQSxNQUFNQSxJQUFJLEdBQUcsV0FBYjs7QUFDQSxNQUFNQyxJQUFJLEdBQUcsSUFBYjs7QUFDQSxNQUFNQyxhQUFhLEdBQUcsTUFBdEIiLCJzb3VyY2VzQ29udGVudCI6WyJjb25zdCBIT1NUID0gJzEyNy4wLjAuMSc7XG5jb25zdCBQT1JUID0gNDU2NztcbmNvbnN0IE1PQ0hBX1RJTUVPVVQgPSAyNDAwMDA7XG5cbmV4cG9ydCB7IEhPU1QsIFBPUlQsIE1PQ0hBX1RJTUVPVVQgfTtcbiJdLCJmaWxlIjoidGVzdC91dGlscy5qcyIsInNvdXJjZVJvb3QiOiIuLi8uLiJ9
package/lib/driver.js CHANGED
@@ -14,9 +14,8 @@ const NO_PROXY = [
14
14
  ];
15
15
 
16
16
  class SafariDriver extends BaseDriver {
17
-
18
17
  constructor (opts = {}) {
19
- super(opts, false);
18
+ super(opts);
20
19
  this.desiredCapConstraints = desiredCapConstraints;
21
20
  this.locatorStrategies = [
22
21
  'xpath',
@@ -59,7 +58,7 @@ class SafariDriver extends BaseDriver {
59
58
  try {
60
59
  await this.safari.start(formatCapsForServer(caps));
61
60
  } catch (e) {
62
- await this.safari.stop();
61
+ await this.deleteSession();
63
62
  throw e;
64
63
  }
65
64
  this.proxyReqRes = this.safari.proxy.proxyReqRes.bind(this.safari.proxy);
@@ -70,8 +69,9 @@ class SafariDriver extends BaseDriver {
70
69
  async deleteSession () {
71
70
  log.info('Ending Safari session');
72
71
  await this.safari.stop();
73
- await super.deleteSession();
74
72
  this.resetState();
73
+
74
+ await super.deleteSession();
75
75
  }
76
76
  }
77
77
 
package/lib/safari.js CHANGED
@@ -162,10 +162,12 @@ class SafariDriverServer {
162
162
  return;
163
163
  }
164
164
 
165
- try {
166
- await this.proxy.command(`/session/${this.proxy.sessionId}`, 'DELETE');
167
- } catch (e) {
168
- log.info(`${SD_BINARY} session cannot be stopped. Original error: ${e.message}`);
165
+ if (this.proxy?.sessionId) {
166
+ try {
167
+ await this.proxy.command(`/session/${this.proxy.sessionId}`, 'DELETE');
168
+ } catch (e) {
169
+ log.info(`${SD_BINARY} session cannot be deleted. Original error: ${e.message}`);
170
+ }
169
171
  }
170
172
  }
171
173
  }
package/package.json CHANGED
@@ -5,7 +5,7 @@
5
5
  "appium",
6
6
  "safari"
7
7
  ],
8
- "version": "2.1.0",
8
+ "version": "2.2.0",
9
9
  "author": "appium",
10
10
  "license": "Apache-2.0",
11
11
  "repository": {
@@ -69,6 +69,7 @@
69
69
  "eslint-config-appium": "^4.0.1",
70
70
  "gulp": "^4.0.0",
71
71
  "mocha": "^8.0.1",
72
+ "node-simctl": "^6.4.0",
72
73
  "pre-commit": "^1.1.3",
73
74
  "sinon": "^9.0.0",
74
75
  "wd": "^1.5.0"
@@ -2,18 +2,20 @@ import wd from 'wd';
2
2
  import { startServer } from '../..';
3
3
  import chaiAsPromised from 'chai-as-promised';
4
4
  import chai from 'chai';
5
+ import { HOST, PORT, MOCHA_TIMEOUT } from '../utils';
5
6
 
6
7
  chai.should();
7
8
  chai.use(chaiAsPromised);
8
9
 
9
- const HOST = '127.0.0.1';
10
- const PORT = 4567;
10
+
11
11
  const CAPS = {
12
12
  browserName: 'AppiumSafari',
13
13
  platformName: 'mac',
14
14
  };
15
15
 
16
16
  describe('Desktop SafariDriver', function () {
17
+ this.timeout(MOCHA_TIMEOUT);
18
+
17
19
  let server;
18
20
  let driver;
19
21
  before(async function () {
@@ -2,13 +2,12 @@ import wd from 'wd';
2
2
  import { startServer } from '../..';
3
3
  import chaiAsPromised from 'chai-as-promised';
4
4
  import chai from 'chai';
5
+ import Simctl from 'node-simctl';
6
+ import { HOST, PORT, MOCHA_TIMEOUT } from '../utils';
5
7
 
6
8
  chai.should();
7
9
  chai.use(chaiAsPromised);
8
10
 
9
- const HOST = '127.0.0.1';
10
- const PORT = 4567;
11
- const MOCHA_TIMEOUT = 240000;
12
11
  const PLATFORM_VERSION = process.env.PLATFORM_VERSION || '14.1';
13
12
  const DEVICE_NAME = process.env.DEVICE_NAME || 'iPhone 11 Pro Max';
14
13
  const CAPS = {
@@ -25,13 +24,26 @@ describe('Mobile SafariDriver', function () {
25
24
  let server;
26
25
  let driver;
27
26
  before(async function () {
28
- if (process.env.DEVICE_NAME) {
29
- // In Azure CI the stuff fails with
27
+ if (process.env.CI) {
28
+ // In Azure CI the stuff unexpectedly fails with
30
29
  // "The device is not configured to allow remote control via WebDriver. To fix this, toggle 'Allow Remote Automation' in Safari's settings (Settings App > Safari > Advanced)."
31
30
  // error
32
31
  return this.skip();
33
32
  }
34
33
 
34
+ // Preboot Simulator to avoid unexpected timeouts
35
+ const simctl = new Simctl();
36
+ const allDevices = await simctl.getDevices(PLATFORM_VERSION, 'iOS');
37
+ const device = allDevices.find(({name}) => name === DEVICE_NAME);
38
+ if (!device) {
39
+ throw new Error(`Cannot find '${DEVICE_NAME}' Simulator (${PLATFORM_VERSION})`);
40
+ }
41
+ if (device.state !== 'Booted') {
42
+ simctl.udid = device.udid;
43
+ await simctl.bootDevice();
44
+ await simctl.startBootMonitor();
45
+ }
46
+
35
47
  server = await startServer(PORT, HOST);
36
48
  });
37
49
  after(async function () {
package/test/utils.js ADDED
@@ -0,0 +1,5 @@
1
+ const HOST = '127.0.0.1';
2
+ const PORT = 4567;
3
+ const MOCHA_TIMEOUT = 240000;
4
+
5
+ export { HOST, PORT, MOCHA_TIMEOUT };