minor improvements

gdcc · May 5, 2021 · 22f30e9 · 22f30e9
1 parent 41f3454
commit 22f30e9
Show file tree

Hide file tree

Showing 4 changed files with 34 additions and 6 deletions.
diff --git a/src/dvtests/testing/conftest.py b/src/dvtests/testing/conftest.py
@@ -212,15 +212,14 @@ def custom_login_shibboleth_institution_page(
     return selenium
 
 
-def custom_click_cookie_rollbar(selenium, config):
+def custom_click_cookie_rollbar(selenium, max_wait_time):
     """Accept cookie rollbar."""
-    wait = WebDriverWait(selenium, config.MAX_WAIT_TIME)
-    btn_cookie_rollbar = wait.until(
+    wait = WebDriverWait(selenium, max_wait_time)
+    wait.until(
         EC.element_to_be_clickable(
             (By.ID, "CybotCookiebotDialogBodyLevelButtonLevelOptinAllowallSelection")
         )
-    )
-    btn_cookie_rollbar.click()
+    ).click()
     return selenium
 
 

diff --git a/src/dvtests/testing/data/aussda_production/default/system/testdata_dataverses.json b/src/dvtests/testing/data/aussda_production/default/system/testdata_dataverses.json
@@ -5,5 +5,12 @@
         "num-dataverses": 17
       }
     ]
+  },
+  "create-dataverse": {
+    "min-valid": [
+      {
+        "user-handle": "dataverseAdmin"
+      }
+    ]
   }
 }
diff --git a/src/dvtests/testing/data/aussda_production/default/system/testdata_user.json b/src/dvtests/testing/data/aussda_production/default/system/testdata_user.json
@@ -0,0 +1,22 @@
+{
+  "user-profile": {
+    "navigate": [
+      [
+        {
+          "user-handle": "dataverseAdmin"
+        },
+        {
+          "title": "Account - AUSSDA"
+        }
+      ],
+      [
+        {
+          "user-handle": "TestUser_NormalLogin"
+        },
+        {
+          "title": "Account - AUSSDA"
+        }
+      ]
+    ]
+  }
+}
diff --git a/src/dvtests/testing/default/system/test_authentication.py b/src/dvtests/testing/default/system/test_authentication.py
@@ -26,7 +26,7 @@ def test_login_valid(self, config, selenium, users, test_input, expected):
         """Test normal login procedure."""
         # Arrange
         # Act
-        login_normal(
+        selenium = login_normal(
             selenium,
             config.BASE_URL,
             config.LOGIN_OPTIONS,