fix tests

pytest-dev · Jun 3, 2018 · de1009b · de1009b
1 parent 32e6ba9
commit de1009b
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 11 deletions.
diff --git a/.gitignore b/.gitignore
@@ -49,3 +49,4 @@ tests.*
 /include
 /src
 /.env
+/.pytest_cache
diff --git a/.travis.yml b/.travis.yml
@@ -1,12 +1,12 @@
 sudo: false
 language: python
-python: "3.4"
+python: "3.6"
 addons:
   firefox: "37.0.1"
 before_install:
   - "export DISPLAY=:99.0"
   - "sh -e /etc/init.d/xvfb start"
-  - "npm install -g selenium-standalone@4.5.3"
+  - "npm install -g selenium-standalone@6.15.0"
   - "selenium-standalone install"
   - "selenium-standalone start &"
 env:
@@ -15,7 +15,7 @@ env:
     - TESTENV=py27
     - TESTENV=py27-xdist
     - TESTENV=py27-pytest-latest
-    - TESTENV=py34
+    - TESTENV=py36
     - TESTENV=coveralls
 install:
   - pip install tox

diff --git a/Makefile b/Makefile
@@ -7,7 +7,7 @@ PATH := .env/bin:$(PATH)
 # install all needed for development
 develop: .env
 	pip install -e . -r requirements-testing.txt tox coveralls
-	npm install selenium-standalone
+	npm install selenium-standalone@6.15.0
 	node_modules/.bin/selenium-standalone install
 
 coverage: develop

diff --git a/pytest_splinter/plugin.py b/pytest_splinter/plugin.py
@@ -99,7 +99,7 @@ def splinter_remote_url(request):
 
 @pytest.fixture(scope='session')  # pragma: no cover
 def splinter_selenium_socket_timeout(request):
-    """Internal Selenium socket timeout (communication between webdriver and the browser).
+    """Return internal Selenium socket timeout (communication between webdriver and the browser).
 
     :return: Seconds.
     """
@@ -108,7 +108,7 @@ def splinter_selenium_socket_timeout(request):
 
 @pytest.fixture(scope='session')  # pragma: no cover
 def splinter_selenium_implicit_wait(request):
-    """Selenium implicit wait timeout.
+    """Return Selenium implicit wait timeout.
 
     :return: Seconds.
     """
@@ -135,7 +135,7 @@ def splinter_selenium_speed(request):
 
 @pytest.fixture(scope='session')  # pragma: no cover
 def splinter_browser_load_condition():
-    """The condition that has to be `True` to assume that the page is fully loaded.
+    """Return the condition that has to be `True` to assume that the page is fully loaded.
 
     One example is to wait for jQuery, then the condition could be::
 
@@ -152,7 +152,7 @@ def condition(browser):
 
 @pytest.fixture(scope='session')  # pragma: no cover
 def splinter_browser_load_timeout():
-    """The timeout in seconds in which the page is expected to be fully loaded."""
+    """Return the timeout in seconds in which the page is expected to be fully loaded."""
     return 10
 
 

diff --git a/setup.py b/setup.py
@@ -42,7 +42,7 @@
         'Topic :: Utilities',
         'Programming Language :: Python :: 2',
         'Programming Language :: Python :: 3',
-    ] + [('Programming Language :: Python :: %s' % x) for x in '2.7 3.0 3.1 3.2 3.3 3.4 3.5'.split()],
+    ] + [('Programming Language :: Python :: %s' % x) for x in '2.7 3.0 3.1 3.2 3.3 3.4 3.5 3.6'.split()],
     tests_require=['tox'],
     entry_points={'pytest11': [
         'pytest-splinter=pytest_splinter.plugin',

diff --git a/tests/test_plugin.py b/tests/test_plugin.py
@@ -11,7 +11,7 @@
 
 @pytest.fixture
 def simple_page_content():
-    """Simple page content."""
+    """Return simple page content."""
     return """<html xmlns="http://www.w3.org/1999/xhtml"><head></head>
     <body>
         <div id="content">
@@ -26,7 +26,7 @@ def simple_page_content():
 
 @pytest.fixture
 def simple_page(httpserver, browser, simple_page_content):
-    """Simple served html page."""
+    """Serve simple html page."""
     httpserver.serve_content(
         simple_page_content, code=200, headers={'Content-Type': 'text/html'})
     browser.visit(httpserver.url)