syncloud-lib 309__tar.gz → 311__tar.gz

{syncloud-lib-309/syncloud_lib.egg-info → syncloud-lib-311}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: syncloud-lib
-Version: 309
+Version: 311
 Summary: Syncloud common library
 Home-page: https://github.com/syncloud/lib
 Author: Syncloud

{syncloud-lib-309 → syncloud-lib-311/syncloud_lib.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: syncloud-lib
-Version: 309
+Version: 311
 Summary: Syncloud common library
 Home-page: https://github.com/syncloud/lib
 Author: Syncloud

{syncloud-lib-309 → syncloud-lib-311}/syncloudlib/integration/conftest.py

@@ -159,8 +159,8 @@ def new_chrome_driver(user_agent, hub_url):
     )
 
 
-@pytest.fixture(scope="module")
-def driver(ui_mode, browser, browser_height):
+@pytest.fixture(scope="session")
+def driver(ui_mode, browser, browser_height, request):
     hub_url = 'http://selenium:4444/wd/hub'
     user_agent = "Mozilla/5.0 (X11; Ubuntu; Linux x86_64; rv:104.0) Gecko/20100101 Firefox/100.0"
     width = 1024
@@ -173,6 +173,12 @@ def driver(ui_mode, browser, browser_height):
     else:
         driver = new_chrome_driver(user_agent, hub_url)
     driver.set_window_rect(0, 0, width, browser_height)
+
+    def driver_quit():
+        driver.quit()
+
+    request.addfinalizer(driver_quit)
+
     return driver
 
 
@@ -225,6 +231,6 @@ def selenium_timeout():
     return 300
 
 
-@pytest.fixture(scope="module")
-def selenium(driver, ui_mode, screenshot_dir, app_domain, selenium_timeout):
-    return SeleniumWrapper(driver, ui_mode, screenshot_dir, app_domain, selenium_timeout)
+@pytest.fixture(scope="session")
+def selenium(driver, ui_mode, screenshot_dir, app_domain, selenium_timeout, browser):
+    return SeleniumWrapper(driver, ui_mode, screenshot_dir, app_domain, selenium_timeout, browser)

{syncloud-lib-309 → syncloud-lib-311}/syncloudlib/integration/selenium_wrapper.py

@@ -7,11 +7,12 @@ from selenium.webdriver.support import expected_conditions
 
 
 class SeleniumWrapper:
-    def __init__(self, driver, ui_mode, screenshot_dir, app_domain, timeout):
+    def __init__(self, driver, ui_mode, screenshot_dir, app_domain, timeout, browser):
         self.app_domain = app_domain
         self.screenshot_dir = screenshot_dir
         self.ui_mode = ui_mode
         self.driver = driver
+        self.browser = browser
         self.wait_driver = WebDriverWait(self.driver, timeout)
 
     def find_by_xpath(self, xpath):
@@ -47,7 +48,6 @@ class SeleniumWrapper:
         self.wait_or_screenshot(expected_conditions.presence_of_element_located((by, value)))
         return self.driver.find_element(by, value)
 
-
     def exists_by(self, by, value, timeout=10):
         driver = WebDriverWait(self.driver, timeout)
         cond = expected_conditions.visibility_of_element_located((by, value))
@@ -88,3 +88,16 @@ class SeleniumWrapper:
 
     def open_app(self, path=''):
         self.driver.get("https://{0}{1}".format(self.app_domain, path))
+
+    def log(self):
+        if self.browser != "chrome":
+            print("browser logs are only supported in chrome")
+            return
+
+        try:
+            for entry in self.driver.get_log('browser'):
+                print("---")
+                print(entry)
+        except Exception as e:
+            print("error")
+            print(e)

syncloud-lib-311/version

@@ -0,0 +1 @@
+311

syncloud-lib-309/version

@@ -1 +0,0 @@
-309