test_framework
/
SeleniumBase
mirror of https://github.com/seleniumbase/SeleniumBase.git
3
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #725 from seleniumbase/update-dependencies 

Update dependencies and a few minor things
This commit is contained in:
Michael Mintz 2020-10-30 14:30:24 -04:00 committed by GitHub
parent 7eb232f023 21aec09095
commit 1b899bbb72
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 13 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
docs/requirements.txt
View File

@ -1,4 +1,4 @@
regex>=2020.10.23
regex>=2020.10.28
tqdm>=4.51.0
livereload==2.6.3;python_version>="3.6"
Markdown==3.3.3
@ -6,6 +6,6 @@ readme-renderer==28.0
pymdown-extensions==8.0.1
mkdocs==1.1.2
mkdocs-material==6.1.0
mkdocs-simple-hooks==0.1.1
mkdocs-simple-hooks==0.1.2
mkdocs-material-extensions==1.0.1
mkdocs-minify-plugin==0.3.0

8
requirements.txt
View File

@ -16,14 +16,14 @@ requests==2.24.0
selenium==3.141.0
msedge-selenium-tools==3.141.2
more-itertools==5.0.0;python_version<"3.5"
more-itertools==8.5.0;python_version>="3.5"
more-itertools==8.6.0;python_version>="3.5"
cssselect==1.1.0
pluggy==0.13.1
attrs>=20.2.0
py==1.8.1;python_version<"3.5"
py==1.9.0;python_version>="3.5"
pytest==4.6.11;python_version<"3.5"
pytest==6.1.1;python_version>="3.5"
pytest==6.1.2;python_version>="3.5"
pytest-cov==2.10.1
pytest-forked==1.3.0
pytest-html==1.22.1;python_version<"3.6"
@ -40,7 +40,7 @@ soupsieve==1.9.6;python_version<"3.5"
soupsieve==2.0.1;python_version>="3.5"
beautifulsoup4==4.9.3
cryptography==3.0;python_version<"3.6"
cryptography==3.2;python_version>="3.6"
cryptography==3.2.1;python_version>="3.6"
pyopenssl==19.1.0
pygments==2.5.2;python_version<"3.5"
pygments==2.7.2;python_version>="3.5"
@ -70,6 +70,6 @@ flake8==3.8.4;python_version>="3.5"
pyflakes==2.1.1;python_version<"3.5"
pyflakes==2.2.0;python_version>="3.5"
certifi>=2020.6.20
allure-pytest==2.8.18
allure-pytest==2.8.19
pdfminer.six==20191110;python_version<"3.5"
pdfminer.six==20201018;python_version>="3.5"

2
seleniumbase/__version__.py
View File

@ -1,2 +1,2 @@
# seleniumbase package
__version__ = "1.50.1"
__version__ = "1.50.2"

11
seleniumbase/fixtures/base_case.py
View File

@ -2101,13 +2101,6 @@ class BaseCase(unittest.TestCase):
os.remove(cookies_file_path)
def wait_for_ready_state_complete(self, timeout=None):
try:
# If there's an alert, skip
self.driver.switch_to.alert
return
except Exception:
# If there's no alert, continue
pass
if not timeout:
timeout = settings.EXTREME_TIMEOUT
if self.timeout_multiplier and timeout == settings.EXTREME_TIMEOUT:
@ -2122,9 +2115,9 @@ class BaseCase(unittest.TestCase):
if not current_url == self.__last_page_load_url:
time.sleep(0.02)
self.ad_block()
time.sleep(0.01)
time.sleep(0.02)
if self.is_element_present("iframe"):
time.sleep(0.07) # iframe ads take slightly longer to load
time.sleep(0.1) # iframe ads take slightly longer to load
self.ad_block() # Do ad_block on slower-loading iframes
self.__last_page_load_url = current_url
return is_ready

8
setup.py
View File

@ -120,14 +120,14 @@ setup(
'selenium==3.141.0',
'msedge-selenium-tools==3.141.2',
'more-itertools==5.0.0;python_version<"3.5"',
'more-itertools==8.5.0;python_version>="3.5"',
'more-itertools==8.6.0;python_version>="3.5"',
'cssselect==1.1.0',
'pluggy==0.13.1',
'attrs>=20.2.0',
'py==1.8.1;python_version<"3.5"',
'py==1.9.0;python_version>="3.5"',
'pytest==4.6.11;python_version<"3.5"',
'pytest==6.1.1;python_version>="3.5"',
'pytest==6.1.2;python_version>="3.5"',
'pytest-cov==2.10.1',
'pytest-forked==1.3.0',
'pytest-html==1.22.1;python_version<"3.6"',
@ -144,7 +144,7 @@ setup(
'soupsieve==2.0.1;python_version>="3.5"',
'beautifulsoup4==4.9.3',
'cryptography==3.0;python_version<"3.6"',
'cryptography==3.2;python_version>="3.6"',
'cryptography==3.2.1;python_version>="3.6"',
'pyopenssl==19.1.0',
'pygments==2.5.2;python_version<"3.5"',
'pygments==2.7.2;python_version>="3.5"',
@ -174,7 +174,7 @@ setup(
'pyflakes==2.1.1;python_version<"3.5"',
'pyflakes==2.2.0;python_version>="3.5"',
'certifi>=2020.6.20',
'allure-pytest==2.8.18',
'allure-pytest==2.8.19',
'pdfminer.six==20191110;python_version<"3.5"',
'pdfminer.six==20201018;python_version>="3.5"',
],