restore browser parameters on each test run instead of once for browser start

Author: bubenkoff

Diff for: CHANGES.rst

@@ -1,6 +1,12 @@
 Changelog
 =========
 
+1.1.1
+-----
+
+- restore browser parameters on each test run instead of once for browser start (bubenkoff)
+
+
 1.1.0
 -----
 

Diff for: pytest_splinter/plugin.py

@@ -209,6 +209,7 @@ def browser_instance_getter(
     browser_pool,
 ):
     """Splinter browser instance getter. To be used for getting of plugin.Browser's instances.
+
     :return: function(parent). Each time this function will return new instance of plugin.Browser class.
     """
     kwargs = {}
@@ -227,19 +228,11 @@ def browser_instance_getter(
         kwargs.update(splinter_driver_kwargs)
 
     def get_browser():
-        browser = Browser(
+        return Browser(
             splinter_webdriver, visit_condition=splinter_browser_load_condition,
             visit_condition_timeout=splinter_browser_load_timeout, **copy.deepcopy(kwargs)
         )
 
-        browser.driver.implicitly_wait(splinter_selenium_implicit_wait)
-        browser.driver.set_speed(splinter_selenium_speed)
-        if splinter_window_size:
-            browser.driver.set_window_size(*splinter_window_size)
-
-        return browser
-        # set automatic download directory for firefox
-
     def prepare_browser(parent):
         browser_key = id(parent)
         browser = browser_pool.get(browser_key)
@@ -251,6 +244,10 @@ def prepare_browser(parent):
             browser = browser_pool[browser_key] = get_browser()
         else:
             try:
+                browser.driver.implicitly_wait(splinter_selenium_implicit_wait)
+                browser.driver.set_speed(splinter_selenium_speed)
+                if splinter_window_size:
+                    browser.driver.set_window_size(*splinter_window_size)
                 browser.driver.delete_all_cookies()
             except IOError:
                 # we lost browser, try to restore the justice

Diff for: setup.py

@@ -1,3 +1,4 @@
+"""Setuptools entry point."""
 import codecs
 import os
 import sys
@@ -14,6 +15,9 @@
 
 
 class Tox(TestCommand):
+
+    """Integrate tox runner to setuptools."""
+
     user_options = [('tox-args=', 'a', "Arguments to pass to tox")]
 
     def initialize_options(self):
@@ -40,7 +44,7 @@ def run_tests(self):
     author='Paylogic developers',
     license='MIT license',
     author_email='[email protected]',
-    version='1.1.0',
+    version='1.1.1',
     cmdclass={'test': Tox},
     url='https://github.com/paylogic/pytest-splinter',
     install_requires=[