Skip to content

Commit e3cb810

Browse files
authored
Merge pull request #672 from seleniumbase/edge-update
Update the default version of EdgeDriver installed
2 parents 697b8c0 + 0b82b93 commit e3cb810

File tree

6 files changed

+30
-8
lines changed

6 files changed

+30
-8
lines changed
Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
import pytest
2+
3+
4+
@pytest.mark.offline
5+
def test_request_fixture(request):
6+
sb = request.getfixturevalue('sb')
7+
sb.open("data:text/html,<p>Hello<br><input></p>")
8+
sb.assert_element("html > body")
9+
sb.assert_text("Hello", "body p")
10+
sb.type("input", "Goodbye")
11+
sb.click("body p")
12+
sb.tearDown()

examples/test_request_sb_fixture.py

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
def test_request_sb_fixture(request):
2+
sb = request.getfixturevalue('sb')
3+
sb.open("https://seleniumbase.io/demo_page")
4+
sb.assert_text("SeleniumBase", "#myForm h2")
5+
sb.assert_element("input#myTextInput")
6+
sb.type("#myTextarea", "This is me")
7+
sb.click("#myButton")
8+
sb.tearDown()

examples/upload_file_test.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,11 @@ def test_file_upload_button(self):
1111
"?filename=tryjsref_fileupload_get")
1212
self.ad_block()
1313
self.switch_to_frame('iframeResult')
14-
self.add_css_style(
15-
'input[type="file"]{zoom: 1.5;-moz-transform: scale(1.5);}')
14+
zoom_in = 'input[type="file"]{zoom: 1.5;-moz-transform: scale(1.5);}'
15+
self.add_css_style(zoom_in)
1616
self.highlight('input[type="file"]')
1717
dir_name = os.path.dirname(os.path.abspath(__file__))
18-
self.choose_file(
19-
'input[type="file"]', dir_name + "/example_logs/screenshot.png")
18+
file_path = dir_name + "/example_logs/screenshot.png"
19+
self.choose_file('input[type="file"]', file_path)
2020
self.demo_mode = True # Adds highlighting to the assert statement
2121
self.assert_element('input[type="file"]')

requirements.txt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,8 @@ parameterized==0.7.4
3636
soupsieve==1.9.6;python_version<"3.5"
3737
soupsieve==2.0.1;python_version>="3.5"
3838
beautifulsoup4==4.9.1
39-
cryptography==3.0
39+
cryptography==3.0;python_version<"3.6"
40+
cryptography==3.1;python_version>="3.6"
4041
pyopenssl==19.1.0
4142
prompt-toolkit==1.0.18;python_version<"3.6.1"
4243
prompt-toolkit==3.0.6;python_version>="3.6.1"

seleniumbase/console_scripts/sb_install.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@
4343
LOCAL_PATH = "/usr/local/bin/" # On Mac and Linux systems
4444
DEFAULT_CHROMEDRIVER_VERSION = "2.44"
4545
DEFAULT_GECKODRIVER_VERSION = "v0.27.0"
46-
DEFAULT_EDGEDRIVER_VERSION = "84.0.522.61"
46+
DEFAULT_EDGEDRIVER_VERSION = "85.0.564.41"
4747
DEFAULT_OPERADRIVER_VERSION = "v.84.0.4147.89"
4848

4949

setup.py

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@
5454

5555
setup(
5656
name='seleniumbase',
57-
version='1.48.1',
57+
version='1.48.2',
5858
description='Web Automation and Test Framework - https://seleniumbase.io',
5959
long_description=long_description,
6060
long_description_content_type='text/markdown',
@@ -128,7 +128,8 @@
128128
'soupsieve==1.9.6;python_version<"3.5"',
129129
'soupsieve==2.0.1;python_version>="3.5"',
130130
'beautifulsoup4==4.9.1',
131-
'cryptography==3.0',
131+
'cryptography==3.0;python_version<"3.6"',
132+
'cryptography==3.1;python_version>="3.6"',
132133
'pyopenssl==19.1.0',
133134
'prompt-toolkit==1.0.18;python_version<"3.6.1"',
134135
'prompt-toolkit==3.0.6;python_version>="3.6.1"',

0 commit comments

Comments
 (0)