Skip to content

Commit 979db7b

Browse files
authored
Merge pull request #232 from seleniumbase/update-pytest-version
Update pytest version and replace deprecated method
2 parents fe866ac + 65d1ab9 commit 979db7b

File tree

3 files changed

+4
-4
lines changed

3 files changed

+4
-4
lines changed

requirements.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ unittest2
99
selenium==3.14.1
1010
requests==2.20.0
1111
urllib3==1.24
12-
pytest>=3.9.1
12+
pytest>=3.9.2
1313
pytest-cov>=2.6.0
1414
pytest-html>=1.19.0
1515
pytest-rerunfailures>=4.2

seleniumbase/masterqa/master_qa.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,7 @@ def manual_page_check(self, *args):
128128
def wait_for_special_alert_absent(self, timeout=MAX_IDLE_TIME_BEFORE_QUIT):
129129
for x in range(int(timeout * 20)):
130130
try:
131-
alert = self.driver.switch_to_alert()
131+
alert = self.driver.switch_to.alert
132132
dummy_variable = alert.text # Raises exception if no alert
133133
if "?" not in dummy_variable:
134134
return

setup.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717

1818
setup(
1919
name='seleniumbase',
20-
version='1.16.14',
20+
version='1.16.15',
2121
description='All-In-One Test Automation Framework',
2222
long_description=long_description,
2323
long_description_content_type='text/markdown',
@@ -61,7 +61,7 @@
6161
'selenium==3.14.1',
6262
'requests==2.20.0', # Changing this may effect "urllib3"
6363
'urllib3==1.24', # Keep this lib in sync with "requests"
64-
'pytest>=3.9.1',
64+
'pytest>=3.9.2',
6565
'pytest-cov>=2.6.0',
6666
'pytest-html>=1.19.0',
6767
'pytest-rerunfailures>=4.2',

0 commit comments

Comments
 (0)