SHIBUI-1440

Various fixes for provider tests. Also some additional attempts at fixing the performance issue.
TIER · Oct 16, 2019 · cf7a201 · cf7a201
1 parent d5bdb9a
commit cf7a201
Show file tree

Hide file tree

Showing 7 changed files with 98 additions and 27 deletions.
diff --git a/...end/src/integration/groovy/edu/internet2/tier/shibboleth/admin/ui/SeleniumSIDETest.groovy b/...end/src/integration/groovy/edu/internet2/tier/shibboleth/admin/ui/SeleniumSIDETest.groovy
@@ -29,6 +29,9 @@ class SeleniumSIDETest extends Specification {
         def config = new DefaultConfig([] as String[]).with {
             if (System.properties.getProperty('webdriver.driver')) {
                 it.driver = System.properties.getProperty('webdriver.driver')
+                if (it.driver == "chrome") {
+                    it.addCliArgs('--disable-extensions')
+                }
             } else {
                 it.driver = 'remote'
                 it.remoteUrl = 'http://selenium-hub:4444/wd/hub'
@@ -39,10 +42,14 @@ class SeleniumSIDETest extends Specification {
             } else {
                 it.baseurl = "http://localhost:${this.randomPort}"
             }
+            if (System.properties.getProperty('webdriver.headless')) {
+                it.addCliArgs('--headless')
+            }
             it
         }
         def runner = new Runner()
         runner.varsMap.put('xmlUpload', Paths.get(this.class.getResource('/TestUpload.xml').toURI()).toString())
+        runner.varsMap.put('SHIBUI950', Paths.get(this.class.getResource('/SHIBUI-950.xml').toURI()).toString())
         main.setupRunner(runner, config, [] as String[])
 
         expect:
@@ -59,6 +66,9 @@ class SeleniumSIDETest extends Specification {
         def config = new DefaultConfig([] as String[]).with {
             if (System.properties.getProperty('webdriver.driver')) {
                 it.driver = System.properties.getProperty('webdriver.driver')
+                if (it.driver == "chrome") {
+                    it.addCliArgs('--disable-extensions')
+                }
             } else {
                 it.driver = 'remote'
                 it.remoteUrl = 'http://selenium-hub:4444/wd/hub'
@@ -85,6 +95,9 @@ class SeleniumSIDETest extends Specification {
 
         assert result.level.exitCode == 0
 
+        cleanup:
+        runner.getWrappedDriver().quit()
+
         // TODO: Uncomment the below commented tests once they've been updated to use the new configuration screen
         where:
         name                                                                | file

diff --git a/backend/src/integration/resources/SHIBUI-1311.side b/backend/src/integration/resources/SHIBUI-1311.side
@@ -576,6 +576,13 @@
         ["xpath=//li[3]/button", "xpath:position"]
       ],
       "value": ""
+    }, {
+      "id": "563d35c7-65c9-4d10-9e0f-87d8fa31a036",
+      "comment": "",
+      "command": "pause",
+      "target": "2000",
+      "targets": [],
+      "value": ""
     }, {
       "id": "8ae5598c-a4b0-4816-859a-d30f38029f65",
       "comment": "",
@@ -672,25 +679,19 @@
       ],
       "value": ""
     }, {
-      "id": "664722f5-86a5-49a8-b60e-fac67544fbea",
+      "id": "6b776e7b-87ec-4a61-bb51-face4b5b8c97",
       "comment": "",
-      "command": "waitForElementVisible",
-      "target": "id=/name",
+      "command": "pause",
+      "target": "2000",
       "targets": [],
-      "value": "10000"
+      "value": ""
     }, {
-      "id": "6437379e-d34f-479e-82f1-bf52654a95cb",
+      "id": "664722f5-86a5-49a8-b60e-fac67544fbea",
       "comment": "",
-      "command": "click",
+      "command": "waitForElementEditable",
       "target": "id=/name",
-      "targets": [
-        ["id=/name", "id"],
-        ["name=field37", "name"],
-        ["css=#\\/name", "css:finder"],
-        ["xpath=//input[@id='/name']", "xpath:attributes"],
-        ["xpath=//input", "xpath:position"]
-      ],
-      "value": ""
+      "targets": [],
+      "value": "10000"
     }, {
       "id": "79471f9f-e04f-4d98-8e78-f8f554d36821",
       "comment": "",
@@ -734,19 +735,6 @@
       "target": "id=/xmlId",
       "targets": [],
       "value": "10000"
-    }, {
-      "id": "5795f70f-79e1-4b45-9c38-ef96d5197e70",
-      "comment": "",
-      "command": "click",
-      "target": "id=/xmlId",
-      "targets": [
-        ["id=/xmlId", "id"],
-        ["name=field43", "name"],
-        ["css=#\\/xmlId", "css:finder"],
-        ["xpath=//input[@id='/xmlId']", "xpath:attributes"],
-        ["xpath=//input", "xpath:position"]
-      ],
-      "value": ""
     }, {
       "id": "88a910a8-1e02-400a-9875-c76d0095aa57",
       "comment": "",
@@ -943,6 +931,13 @@
         ["xpath=//li[3]/button", "xpath:position"]
       ],
       "value": ""
+    }, {
+      "id": "8b702597-90a0-464d-90e6-99c0f0de3c3d",
+      "comment": "",
+      "command": "pause",
+      "target": "2000",
+      "targets": [],
+      "value": ""
     }, {
       "id": "c8b7c426-9afc-4fb0-8c09-211ae9ba0a62",
       "comment": "",
@@ -971,6 +966,13 @@
         ["xpath=//a[contains(.,'Metadata Providers')]", "xpath:innerText"]
       ],
       "value": ""
+    }, {
+      "id": "25583134-24c4-4fab-9a11-7e4cf0c05f1a",
+      "comment": "",
+      "command": "pause",
+      "target": "2000",
+      "targets": [],
+      "value": ""
     }, {
       "id": "1675c12e-8951-4d07-87b1-15e280699d66",
       "comment": "",

diff --git a/backend/src/integration/resources/SHIBUI-1334-2.side b/backend/src/integration/resources/SHIBUI-1334-2.side
@@ -569,6 +569,13 @@
         ["xpath=//li[3]/button", "xpath:position"]
       ],
       "value": ""
+    }, {
+      "id": "f72d07d6-e123-4698-a303-62a522ca45a1",
+      "comment": "",
+      "command": "pause",
+      "target": "2000",
+      "targets": [],
+      "value": ""
     }, {
       "id": "debd4893-7551-4a7b-9e49-15aa89bf487f",
       "comment": "",
@@ -597,6 +604,13 @@
         ["xpath=//a[contains(.,'Metadata Providers')]", "xpath:innerText"]
       ],
       "value": ""
+    }, {
+      "id": "5886b5f7-440e-4430-910c-9e1c4e4a353f",
+      "comment": "",
+      "command": "pause",
+      "target": "2000",
+      "targets": [],
+      "value": ""
     }, {
       "id": "1067b0b4-8aff-4972-b6f5-e4479eca9150",
       "comment": "",

diff --git a/backend/src/integration/resources/SHIBUI-1361.side b/backend/src/integration/resources/SHIBUI-1361.side
@@ -575,6 +575,13 @@
         ["xpath=//li[3]/button", "xpath:position"]
       ],
       "value": ""
+    }, {
+      "id": "5cee98ef-08bf-4eea-940d-9c29ebb241ef",
+      "comment": "",
+      "command": "pause",
+      "target": "2000",
+      "targets": [],
+      "value": ""
     }, {
       "id": "1067b0b4-8aff-4972-b6f5-e4479eca9150",
       "comment": "",

diff --git a/backend/src/integration/resources/SHIBUI-1385-1.side b/backend/src/integration/resources/SHIBUI-1385-1.side
@@ -2291,6 +2291,13 @@
       "target": "2000",
       "targets": [],
       "value": ""
+    }, {
+      "id": "3e8d20f4-879c-4105-8797-17afd60ba34b",
+      "comment": "",
+      "command": "waitForElementEditable",
+      "target": "id=/mdui/displayName",
+      "targets": [],
+      "value": "30000"
     }, {
       "id": "6f422a9d-6c2f-4200-bdd3-411ed44773a3",
       "comment": "",

diff --git a/backend/src/integration/resources/SHIBUI-1385-2.side b/backend/src/integration/resources/SHIBUI-1385-2.side
@@ -568,6 +568,13 @@
         ["xpath=//li[3]/button", "xpath:position"]
       ],
       "value": ""
+    }, {
+      "id": "c5371051-48e0-4afd-9661-2db2ad0b22f0",
+      "comment": "",
+      "command": "pause",
+      "target": "2000",
+      "targets": [],
+      "value": ""
     }, {
       "id": "1067b0b4-8aff-4972-b6f5-e4479eca9150",
       "comment": "",
@@ -605,6 +612,13 @@
         ["xpath=//span[contains(.,'FileBackedHttpMetadataResolver')]", "xpath:innerText"]
       ],
       "value": "FileBackedHttpMetadataResolver"
+    }, {
+      "id": "67beda7f-7568-443b-9a60-03face9d936b",
+      "comment": "",
+      "command": "pause",
+      "target": "2000",
+      "targets": [],
+      "value": ""
     }, {
       "id": "c768c2c1-09d4-46fe-8007-42fb4b3f4aaa",
       "comment": "",

diff --git a/backend/src/integration/resources/SHIBUI-1407-2.side b/backend/src/integration/resources/SHIBUI-1407-2.side
@@ -568,6 +568,13 @@
         ["xpath=//li[3]/button", "xpath:position"]
       ],
       "value": ""
+    }, {
+      "id": "89e87484-d5b5-4788-816d-9ca4d22f053a",
+      "comment": "",
+      "command": "pause",
+      "target": "2000",
+      "targets": [],
+      "value": ""
     }, {
       "id": "1067b0b4-8aff-4972-b6f5-e4479eca9150",
       "comment": "",
@@ -605,6 +612,13 @@
         ["xpath=//span[contains(.,'FileBackedHttpMetadataResolver')]", "xpath:innerText"]
       ],
       "value": "FileBackedHttpMetadataResolver"
+    }, {
+      "id": "77643669-03f5-4c28-9239-885bdd53749c",
+      "comment": "",
+      "command": "pause",
+      "target": "2000",
+      "targets": [],
+      "value": ""
     }, {
       "id": "c768c2c1-09d4-46fe-8007-42fb4b3f4aaa",
       "comment": "",