Skip to content

Commit ad3a914

Browse files
aaltataaltat
authored
Unit test cleanup (#1202)
1 parent 87251cf commit ad3a914

File tree

1 file changed

+24
-56
lines changed

1 file changed

+24
-56
lines changed

‎utest/test/keywords/test_webdrivercreator.py‎

Lines changed: 24 additions & 56 deletions
Original file line numberDiff line numberDiff line change
@@ -55,11 +55,8 @@ def test_parse_capabilities(self):
5555
def test_chrome(self):
5656
expected_webdriver = mock()
5757
caps = webdriver.DesiredCapabilities.CHROME
58-
if SELENIUM_VERSION.major >= 3 and SELENIUM_VERSION.minor >= 8:
59-
when(webdriver).Chrome(desired_capabilities=caps,
60-
options=None).thenReturn(expected_webdriver)
61-
else:
62-
when(webdriver).Chrome(desired_capabilities=caps).thenReturn(expected_webdriver)
58+
when(webdriver).Chrome(desired_capabilities=caps,
59+
options=None).thenReturn(expected_webdriver)
6360
driver = self.creator.create_chrome({}, None)
6461
self.assertEqual(driver, expected_webdriver)
6562

@@ -79,16 +76,10 @@ def test_chrome_healdless(self):
7976
expected_webdriver = mock()
8077
options = mock()
8178
when(webdriver).ChromeOptions().thenReturn(options)
82-
if SELENIUM_VERSION.major >= 3 and SELENIUM_VERSION.minor >= 8:
83-
when(webdriver).Chrome(desired_capabilities=caps,
84-
options=options).thenReturn(expected_webdriver)
85-
else:
86-
when(webdriver).Chrome(desired_capabilities=caps).thenReturn(expected_webdriver)
79+
when(webdriver).Chrome(desired_capabilities=caps,
80+
options=options).thenReturn(expected_webdriver)
8781
driver = self.creator.create_headless_chrome({}, None)
88-
if SELENIUM_VERSION.major >= 3 and SELENIUM_VERSION.minor >= 8:
89-
verify(options).set_headless()
90-
else:
91-
verify(options, times=0).set_headless()
82+
verify(options).set_headless()
9283
self.assertEqual(driver, expected_webdriver)
9384

9485
def test_chrome_healdless_with_grid(self):
@@ -109,15 +100,10 @@ def test_firefox(self):
109100
profile = mock()
110101
when(webdriver).FirefoxProfile().thenReturn(profile)
111102
caps = webdriver.DesiredCapabilities.FIREFOX
112-
if SELENIUM_VERSION.major >= 3 and SELENIUM_VERSION.minor >= 8:
113-
log_file = self.get_geckodriver_log()
114-
when(webdriver).Firefox(capabilities=caps,
115-
options=None,
116-
firefox_profile=profile,
117-
log_path=log_file).thenReturn(expected_webdriver)
118-
else:
119-
when(webdriver).Firefox(capabilities=caps,
120-
firefox_profile=profile).thenReturn(expected_webdriver)
103+
log_file = self.get_geckodriver_log()
104+
when(webdriver).Firefox(capabilities=caps, options=None,
105+
firefox_profile=profile,
106+
log_path=log_file).thenReturn(expected_webdriver)
121107
driver = self.creator.create_firefox({}, None, None)
122108
self.assertEqual(driver, expected_webdriver)
123109
verify(webdriver).FirefoxProfile()
@@ -141,15 +127,10 @@ def test_firefox_profile(self):
141127
profile_dir = '/profile/dir'
142128
when(webdriver).FirefoxProfile(profile_dir).thenReturn(profile)
143129
caps = webdriver.DesiredCapabilities.FIREFOX
144-
if SELENIUM_VERSION.major >= 3 and SELENIUM_VERSION.minor >= 8:
145-
log_file = self.get_geckodriver_log()
146-
when(webdriver).Firefox(capabilities=caps,
147-
options=None,
148-
log_path=log_file,
149-
firefox_profile=profile).thenReturn(expected_webdriver)
150-
else:
151-
when(webdriver).Firefox(capabilities=caps,
152-
firefox_profile=profile).thenReturn(expected_webdriver)
130+
log_file = self.get_geckodriver_log()
131+
when(webdriver).Firefox(capabilities=caps, options=None,
132+
log_path=log_file,
133+
firefox_profile=profile).thenReturn(expected_webdriver)
153134
driver = self.creator.create_firefox({}, None, profile_dir)
154135
self.assertEqual(driver, expected_webdriver)
155136

@@ -158,17 +139,12 @@ def test_firefox_headless(self):
158139
caps = webdriver.DesiredCapabilities.FIREFOX
159140
profile = mock()
160141
when(webdriver).FirefoxProfile().thenReturn(profile)
161-
if SELENIUM_VERSION.major >= 3 and SELENIUM_VERSION.minor >= 8:
162-
options = mock()
163-
when(webdriver).FirefoxOptions().thenReturn(options)
164-
log_file = self.get_geckodriver_log()
165-
when(webdriver).Firefox(capabilities=caps,
166-
options=options,
167-
log_path=log_file,
168-
firefox_profile=profile).thenReturn(expected_webdriver)
169-
else:
170-
when(webdriver).Firefox(capabilities=caps,
171-
firefox_profile=profile).thenReturn(expected_webdriver)
142+
options = mock()
143+
when(webdriver).FirefoxOptions().thenReturn(options)
144+
log_file = self.get_geckodriver_log()
145+
when(webdriver).Firefox(capabilities=caps, options=options,
146+
log_path=log_file,
147+
firefox_profile=profile).thenReturn(expected_webdriver)
172148
driver = self.creator.create_headless_firefox({}, None, None)
173149
self.assertEqual(driver, expected_webdriver)
174150

@@ -320,11 +296,8 @@ def test_iphone(self):
320296
def test_create_driver_chrome(self):
321297
expected_webdriver = mock()
322298
caps = webdriver.DesiredCapabilities.CHROME
323-
if SELENIUM_VERSION.major >= 3 and SELENIUM_VERSION.minor >= 8:
324-
when(webdriver).Chrome(desired_capabilities=caps,
299+
when(webdriver).Chrome(desired_capabilities=caps,
325300
options=None).thenReturn(expected_webdriver)
326-
else:
327-
when(webdriver).Chrome(desired_capabilities=caps).thenReturn(expected_webdriver)
328301
for browser in ['chrome', 'googlechrome', 'gc']:
329302
driver = self.creator.create_driver(browser, None, None)
330303
self.assertEqual(driver, expected_webdriver)
@@ -334,15 +307,10 @@ def test_create_driver_firefox(self):
334307
profile = mock()
335308
when(webdriver).FirefoxProfile().thenReturn(profile)
336309
caps = webdriver.DesiredCapabilities.FIREFOX
337-
if SELENIUM_VERSION.major >= 3 and SELENIUM_VERSION.minor >= 8:
338-
log_file = self.get_geckodriver_log()
339-
when(webdriver).Firefox(capabilities=caps,
340-
options=None,
341-
log_path=log_file,
342-
firefox_profile=profile).thenReturn(expected_webdriver)
343-
else:
344-
when(webdriver).Firefox(capabilities=caps,
345-
firefox_profile=profile).thenReturn(expected_webdriver)
310+
log_file = self.get_geckodriver_log()
311+
when(webdriver).Firefox(capabilities=caps, options=None,
312+
log_path=log_file,
313+
firefox_profile=profile).thenReturn(expected_webdriver)
346314
for browser in ['ff', 'firefox']:
347315
driver = self.creator.create_driver(browser, None, None, None)
348316
self.assertEqual(driver, expected_webdriver)

0 commit comments

Comments
 (0)