Merged in feature/SHIBUI-1461-QA (pull request #363)

Feature/SHIBUI-1461 QA Approved-by: Ryan Mathis <rmathis@unicon.net>
TIER · Sep 12, 2019 · 99ceef8 · 99ceef8
2 parents b7d829c + 246fa63
commit 99ceef8
Show file tree

Hide file tree

Showing 16 changed files with 326 additions and 153 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-1062.side b/backend/src/integration/resources/SHIBUI-1062.side
@@ -290,4 +290,4 @@
   }],
   "urls": ["http://localhost:10101/"],
   "plugins": []
-}
+}
diff --git a/backend/src/integration/resources/SHIBUI-1281.side b/backend/src/integration/resources/SHIBUI-1281.side
@@ -1613,7 +1613,7 @@
     }, {
       "id": "3baa7bd3-55c0-4d10-8aa3-c0daa63ec4d4",
       "comment": "",
-      "command": "verifyText",
+      "command": "assertText",
       "target": "css=.px-3 > summary-property:nth-child(2) > .mb-3 > .d-block:nth-child(2)",
       "targets": [
         ["css=.px-3 > summary-property:nth-child(2) > .mb-3 > .d-block:nth-child(2)", "css:finder"],
@@ -1624,7 +1624,7 @@
     }, {
       "id": "0d355ff0-0449-49a7-ae75-14d7c405b97c",
       "comment": "",
-      "command": "verifyText",
+      "command": "assertText",
       "target": "css=.px-3:nth-child(2) > summary-property:nth-child(2) tr:nth-child(2) > td:nth-child(1)",
       "targets": [
         ["css=.px-3:nth-child(2) > summary-property:nth-child(2) tr:nth-child(2) > td:nth-child(1)", "css:finder"],
@@ -1635,7 +1635,7 @@
     }, {
       "id": "e53030b6-f344-4361-981d-b8303a721c5d",
       "comment": "",
-      "command": "verifyText",
+      "command": "assertText",
       "target": "css=summary-property:nth-child(2) > .mb-3 > .list-unstyled > li:nth-child(5)",
       "targets": [
         ["css=summary-property:nth-child(2) > .mb-3 > .list-unstyled > li:nth-child(5)", "css:finder"],
@@ -1646,7 +1646,7 @@
     }, {
       "id": "18636780-2feb-458f-97be-cf4a625b22e1",
       "comment": "",
-      "command": "verifyText",
+      "command": "assertText",
       "target": "css=summary-property:nth-child(10) .d-block:nth-child(2)",
       "targets": [
         ["css=summary-property:nth-child(10) .d-block:nth-child(2)", "css:finder"],
@@ -1677,7 +1677,7 @@
     }, {
       "id": "ba9fb8e8-d332-45bd-accd-703284744136",
       "comment": "",
-      "command": "verifyText",
+      "command": "assertText",
       "target": "css=td:nth-child(1)",
       "targets": [
         ["linkText=Test Provider", "linkText"],
@@ -1691,7 +1691,7 @@
     }, {
       "id": "eff4c9fe-7daf-4082-a162-4a9dff323293",
       "comment": "",
-      "command": "verifyText",
+      "command": "assertText",
       "target": "css=td:nth-child(2)",
       "targets": [
         ["css=td:nth-child(2)", "css:finder"],
@@ -1702,7 +1702,7 @@
     }, {
       "id": "b2d9f789-fb94-459f-9947-5364cebc43d1",
       "comment": "",
-      "command": "verifyText",
+      "command": "assertText",
       "target": "css=td:nth-child(3)",
       "targets": [
         ["css=td:nth-child(3)", "css:finder"],
@@ -1749,7 +1749,7 @@
     }, {
       "id": "a69f4347-8e82-483d-8a8a-e78a894e7aaa",
       "comment": "",
-      "command": "verifyText",
+      "command": "assertText",
       "target": "css=td:nth-child(2)",
       "targets": [
         ["css=td:nth-child(2)", "css:finder"],
@@ -1784,7 +1784,7 @@
     }, {
       "id": "6de4b65a-266e-4974-9729-cf70502bb8fd",
       "comment": "",
-      "command": "verifyElementNotPresent",
+      "command": "assertElementNotPresent",
       "target": "css=td:nth-child(2)",
       "targets": [],
       "value": ""
@@ -1800,4 +1800,4 @@
   }],
   "urls": ["http://localhost:10101/"],
   "plugins": []
-}
+}
diff --git a/backend/src/integration/resources/SHIBUI-1311.side b/backend/src/integration/resources/SHIBUI-1311.side
@@ -488,7 +488,7 @@
     }, {
       "id": "52f5680c-c63d-411e-8332-52901f12ea3b",
       "comment": "",
-      "command": "verifyText",
+      "command": "assertText",
       "target": "css=.px-3:nth-child(1) > summary-property:nth-child(2) > .mb-3 > .d-block:nth-child(2)",
       "targets": [
         ["css=.px-3:nth-child(1) > summary-property:nth-child(2) > .mb-3 > .d-block:nth-child(2)", "css:finder"],
@@ -499,7 +499,7 @@
     }, {
       "id": "67ff44aa-1efd-4b13-a0e9-3648a09911dd",
       "comment": "",
-      "command": "verifyText",
+      "command": "assertText",
       "target": "css=.px-3:nth-child(2) > summary-property:nth-child(2) > .mb-3 > .d-block:nth-child(2)",
       "targets": [
         ["css=.px-3:nth-child(2) > summary-property:nth-child(2) > .mb-3 > .d-block:nth-child(2)", "css:finder"],
@@ -530,7 +530,7 @@
     }, {
       "id": "f48dd1b5-607a-485b-b1d5-03301f99b9ce",
       "comment": "",
-      "command": "verifyText",
+      "command": "assertText",
       "target": "linkText=Test Metadata Provider",
       "targets": [
         ["linkText=Test Metadata Provider", "linkText"],
@@ -544,7 +544,7 @@
     }, {
       "id": "5eccd4e9-a451-4ec8-a9e1-1e1f8e771677",
       "comment": "",
-      "command": "verifyText",
+      "command": "assertText",
       "target": "css=td:nth-child(3)",
       "targets": [
         ["css=td:nth-child(3)", "css:finder"],
@@ -555,7 +555,7 @@
     }, {
       "id": "c768c2c1-09d4-46fe-8007-42fb4b3f4aaa",
       "comment": "",
-      "command": "verifyText",
+      "command": "assertText",
       "target": "css=td:nth-child(4)",
       "targets": [
         ["css=td:nth-child(4)", "css:finder"],
@@ -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": "",
@@ -826,7 +854,7 @@
     }, {
       "id": "b437068f-d3ed-43b5-9975-fb54decaf7ab",
       "comment": "",
-      "command": "verifyText",
+      "command": "assertText",
       "target": "linkText=Test Metadata Provider",
       "targets": [
         ["linkText=Test Metadata Provider", "linkText"],
@@ -840,7 +868,7 @@
     }, {
       "id": "abf5ec9e-eeb3-480f-8919-1efecbae20d0",
       "comment": "",
-      "command": "verifyText",
+      "command": "assertText",
       "target": "linkText=Test Provider 2",
       "targets": [
         ["linkText=Test Provider 2", "linkText"],
@@ -864,7 +892,7 @@
     }, {
       "id": "72123a28-c3be-478c-8f30-555e346837e2",
       "comment": "",
-      "command": "verifyText",
+      "command": "assertText",
       "target": "css=.badge-success > span",
       "targets": [
         ["css=.badge-success > span", "css:finder"],
@@ -884,7 +912,7 @@
     }, {
       "id": "ad8842de-2a4c-42a4-b919-dd7524a679c6",
       "comment": "",
-      "command": "verifyText",
+      "command": "assertText",
       "target": "css=.badge-danger > span",
       "targets": [
         ["css=.badge-danger > span", "css:finder"],