Merge branch 'feature/SHIBUI-1461-QA' into feature/SHIBUI-1385-QA

TIER · Sep 11, 2019 · 0f0a63c · 0f0a63c
2 parents 188f6af + 7059013
commit 0f0a63c
Show file tree

Hide file tree

Showing 9 changed files with 211 additions and 18 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
@@ -69,6 +69,9 @@ 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()

diff --git a/backend/src/integration/resources/SHIBUI-1311.side b/backend/src/integration/resources/SHIBUI-1311.side
@@ -765,6 +765,13 @@
         ["xpath=//li[contains(.,'PT1M')]", "xpath:innerText"]
       ],
       "value": ""
+    }, {
+      "id": "a618d41d-77d2-43ef-9237-6f4f638a282d",
+      "comment": "",
+      "command": "pause",
+      "target": "1000",
+      "targets": [],
+      "value": ""
     }, {
       "id": "9136f894-3cd3-4404-a1a8-9c09ee02f60d",
       "comment": "",
@@ -775,6 +782,13 @@
         ["xpath=//li[3]/button", "xpath:position"]
       ],
       "value": ""
+    }, {
+      "id": "0b928b41-6638-4dc7-8e05-88b2c20ec90d",
+      "comment": "",
+      "command": "pause",
+      "target": "1000",
+      "targets": [],
+      "value": ""
     }, {
       "id": "bcbc4aaf-e8f6-4369-b6aa-e33c0d9dddf1",
       "comment": "",
@@ -785,6 +799,13 @@
         ["xpath=//li[3]/button", "xpath:position"]
       ],
       "value": ""
+    }, {
+      "id": "aa2fbf24-a083-493c-aa82-ac8ac44b807c",
+      "comment": "",
+      "command": "pause",
+      "target": "1000",
+      "targets": [],
+      "value": ""
     }, {
       "id": "a97290c3-88ce-41d7-9619-f111ecbeb778",
       "comment": "",
@@ -806,6 +827,13 @@
         ["xpath=//li[3]/button", "xpath:position"]
       ],
       "value": ""
+    }, {
+      "id": "2c9b0634-d28a-4623-adde-9e0be2549ac4",
+      "comment": "",
+      "command": "pause",
+      "target": "1000",
+      "targets": [],
+      "value": ""
     }, {
       "id": "1237c623-a944-4525-9aea-b93fdd007f78",
       "comment": "",
@@ -903,4 +931,4 @@
   }],
   "urls": ["http://localhost:10101/"],
   "plugins": []
-}
+}
diff --git a/backend/src/integration/resources/SHIBUI-1334-1.side b/backend/src/integration/resources/SHIBUI-1334-1.side
@@ -2198,10 +2198,10 @@
     }, {
       "id": "e23ad673-a84c-4c28-a927-8baf21fe1f12",
       "comment": "",
-      "command": "waitForElementEditable",
-      "target": "id=/mdui/displayName",
+      "command": "pause",
+      "target": "5000",
       "targets": [],
-      "value": "10000"
+      "value": ""
     }, {
       "id": "6f422a9d-6c2f-4200-bdd3-411ed44773a3",
       "comment": "",
@@ -2215,6 +2215,13 @@
         ["xpath=//input", "xpath:position"]
       ],
       "value": "Display Name v3"
+    }, {
+      "id": "77bfef92-d0e6-41eb-9cd1-c2ede0cb9144",
+      "comment": "",
+      "command": "pause",
+      "target": "5000",
+      "targets": [],
+      "value": ""
     }, {
       "id": "c2d29077-30c4-45cf-81c9-b5790294e11e",
       "comment": "",
@@ -2310,4 +2317,4 @@
   }],
   "urls": ["http://localhost:10101/"],
   "plugins": []
-}
+}
diff --git a/backend/src/integration/resources/SHIBUI-1335-1.side b/backend/src/integration/resources/SHIBUI-1335-1.side
@@ -233,6 +233,13 @@
         ["xpath=//div[9]/sf-form-element/div/sf-widget-chooser/boolean-radio/div/div/label/input", "xpath:position"]
       ],
       "value": ""
+    }, {
+      "id": "d0af8425-5f4c-4037-a549-52553b828179",
+      "comment": "",
+      "command": "pause",
+      "target": "1000",
+      "targets": [],
+      "value": ""
     }, {
       "id": "9fe532ee-4ce6-4ff8-ab6c-ea92eb527ded",
       "comment": "",
@@ -243,6 +250,13 @@
         ["xpath=//li[3]/button", "xpath:position"]
       ],
       "value": ""
+    }, {
+      "id": "44e705a1-f284-4303-a0b6-c4bc9896c78d",
+      "comment": "",
+      "command": "pause",
+      "target": "1000",
+      "targets": [],
+      "value": ""
     }, {
       "id": "824b4515-ae14-436e-a56f-d631ea9e1edc",
       "comment": "",
@@ -585,6 +599,13 @@
         ["xpath=//input", "xpath:position"]
       ],
       "value": "Entity Attributes Filter"
+    }, {
+      "id": "9ac14c43-206b-4a60-8e58-c4ce64efa2c8",
+      "comment": "",
+      "command": "pause",
+      "target": "2000",
+      "targets": [],
+      "value": ""
     }, {
       "id": "a10a6faf-90cd-4713-8ea3-60c768ed935e",
       "comment": "",
@@ -598,6 +619,13 @@
         ["xpath=//button[contains(.,'Entity ID')]", "xpath:innerText"]
       ],
       "value": ""
+    }, {
+      "id": "1f54a508-0b40-4dc0-b6e0-706971fb19bf",
+      "comment": "",
+      "command": "pause",
+      "target": "2000",
+      "targets": [],
+      "value": ""
     }, {
       "id": "1f2b93b8-23ae-4a9c-b015-96ca890ae150",
       "comment": "",
@@ -612,6 +640,13 @@
         ["xpath=//a[contains(.,'Regex')]", "xpath:innerText"]
       ],
       "value": ""
+    }, {
+      "id": "b2a41370-db61-4bae-a5f7-a8c5e852e15e",
+      "comment": "",
+      "command": "pause",
+      "target": "2000",
+      "targets": [],
+      "value": ""
     }, {
       "id": "5c2ed93d-3630-408c-bb89-0b2baffb73c0",
       "comment": "",
@@ -1108,6 +1143,13 @@
         ["xpath=//input", "xpath:position"]
       ],
       "value": "Name ID Format Filter"
+    }, {
+      "id": "563c9606-0174-4432-877a-ad769eb3206a",
+      "comment": "",
+      "command": "pause",
+      "target": "2000",
+      "targets": [],
+      "value": ""
     }, {
       "id": "abfa17d5-ebfe-4bb2-b64a-ef5f127bac86",
       "comment": "",
@@ -1121,6 +1163,13 @@
         ["xpath=//button[contains(.,'Entity ID')]", "xpath:innerText"]
       ],
       "value": ""
+    }, {
+      "id": "43878e34-28cc-424f-9044-87b8cb61db03",
+      "comment": "",
+      "command": "pause",
+      "target": "2000",
+      "targets": [],
+      "value": ""
     }, {
       "id": "6040112e-86c4-4e98-b258-79d7e61dfb6d",
       "comment": "",
@@ -1135,6 +1184,13 @@
         ["xpath=//a[contains(.,'Entity ID')]", "xpath:innerText"]
       ],
       "value": ""
+    }, {
+      "id": "70eba7e8-d84f-4b65-b5e8-d1523514dd29",
+      "comment": "",
+      "command": "pause",
+      "target": "2000",
+      "targets": [],
+      "value": ""
     }, {
       "id": "bba23377-23a1-46d5-b044-15047a08ee53",
       "comment": "",
@@ -1442,4 +1498,4 @@
   }],
   "urls": ["http://localhost:10101/"],
   "plugins": []
-}
+}
diff --git a/backend/src/integration/resources/SHIBUI-1335-2.side b/backend/src/integration/resources/SHIBUI-1335-2.side
@@ -372,6 +372,13 @@
         ["xpath=//input", "xpath:position"]
       ],
       "value": "Entity Attributes"
+    }, {
+      "id": "36dac228-9203-4f2e-a623-db41ef8c019f",
+      "comment": "",
+      "command": "pause",
+      "target": "5000",
+      "targets": [],
+      "value": ""
     }, {
       "id": "f2c07797-07f6-4325-8c5f-57a676dc982c",
       "comment": "",
@@ -385,6 +392,13 @@
         ["xpath=//button[contains(.,'Entity ID')]", "xpath:innerText"]
       ],
       "value": ""
+    }, {
+      "id": "1c424cfa-8201-40df-b8ed-ddec065dfd66",
+      "comment": "",
+      "command": "pause",
+      "target": "5000",
+      "targets": [],
+      "value": ""
     }, {
       "id": "bca61e15-7c13-4007-8c90-1a667bbef67d",
       "comment": "",
@@ -399,6 +413,13 @@
         ["xpath=//a[contains(.,'Regex')]", "xpath:innerText"]
       ],
       "value": ""
+    }, {
+      "id": "98f6eea0-36ff-449c-b042-98b87f0d3a70",
+      "comment": "",
+      "command": "pause",
+      "target": "5000",
+      "targets": [],
+      "value": ""
     }, {
       "id": "e0c65de5-d74a-4d87-aca0-9e9f4b37fb36",
       "comment": "",
@@ -746,4 +767,4 @@
   }],
   "urls": ["http://localhost:10101/"],
   "plugins": []
-}
+}
diff --git a/backend/src/integration/resources/SHIBUI-1335-3.side b/backend/src/integration/resources/SHIBUI-1335-3.side
@@ -687,6 +687,13 @@
         ["xpath=//input", "xpath:position"]
       ],
       "value": "Name ID Format Filter"
+    }, {
+      "id": "03d1d74e-efa5-4d0e-a780-900449bb4ac5",
+      "comment": "",
+      "command": "pause",
+      "target": "2000",
+      "targets": [],
+      "value": ""
     }, {
       "id": "9b9d7604-7025-4ccb-bb95-862f57f696f1",
       "comment": "",
@@ -700,6 +707,13 @@
         ["xpath=//button[contains(.,'Entity ID')]", "xpath:innerText"]
       ],
       "value": ""
+    }, {
+      "id": "5cda2bf9-f169-4e37-8071-a6f8d1d1407d",
+      "comment": "",
+      "command": "pause",
+      "target": "2000",
+      "targets": [],
+      "value": ""
     }, {
       "id": "9e84c57f-c33d-48f8-85ac-ed50751eb37b",
       "comment": "",
@@ -714,6 +728,13 @@
         ["xpath=//a[contains(.,'Regex')]", "xpath:innerText"]
       ],
       "value": ""
+    }, {
+      "id": "82336d07-df2f-416e-b5c3-59eaf64a82d4",
+      "comment": "",
+      "command": "pause",
+      "target": "2000",
+      "targets": [],
+      "value": ""
     }, {
       "id": "f3bc22e2-0e3a-4d58-b992-31d687148c57",
       "comment": "",

diff --git a/backend/src/integration/resources/SHIBUI-1335-4.side b/backend/src/integration/resources/SHIBUI-1335-4.side
@@ -864,6 +864,13 @@
         ["xpath=//input", "xpath:position"]
       ],
       "value": "Name ID Format Filter"
+    }, {
+      "id": "dbae3f45-d828-4a82-bc01-a1e48381fa2e",
+      "comment": "",
+      "command": "pause",
+      "target": "2000",
+      "targets": [],
+      "value": ""
     }, {
       "id": "81373637-8e36-4736-9b2a-7b8d477dc2c1",
       "comment": "",
@@ -877,6 +884,13 @@
         ["xpath=//button[contains(.,'Entity ID')]", "xpath:innerText"]
       ],
       "value": ""
+    }, {
+      "id": "7cf83d2f-841e-48f3-997e-3dfedfb47dec",
+      "comment": "",
+      "command": "pause",
+      "target": "2000",
+      "targets": [],
+      "value": ""
     }, {
       "id": "f562c710-39fc-490d-80c9-d3525722397c",
       "comment": "",
@@ -891,6 +905,13 @@
         ["xpath=//a[contains(.,'Regex')]", "xpath:innerText"]
       ],
       "value": ""
+    }, {
+      "id": "0f4f0257-b63c-4724-b308-f54acf2afc2b",
+      "comment": "",
+      "command": "pause",
+      "target": "2000",
+      "targets": [],
+      "value": ""
     }, {
       "id": "c5dc3e04-eb5a-4885-92ed-3425da3026e6",
       "comment": "",
@@ -996,4 +1017,4 @@
   }],
   "urls": ["http://localhost:10101/"],
   "plugins": []
-}
+}