Merged in feature/SHIBUI-1408-QA (pull request #387)

Feature/SHIBUI-1408 QA Approved-by: Ryan Mathis <rmathis@unicon.net>
TIER · Oct 8, 2019 · fc2d383 · fc2d383
2 parents 2e02472 + 732a675
commit fc2d383
Show file tree

Hide file tree

Showing 3 changed files with 34 additions and 97 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
@@ -85,24 +85,25 @@ class SeleniumSIDETest extends Specification {
 
         assert result.level.exitCode == 0
 
+        // TODO: Uncomment the below commented tests once they've been updated to use the new configuration screen
         where:
         name                                                                | file
-        'SHIBUI-1281: Metadata Source Dashboard'                            | '/SHIBUI-1281.side'
-        'SHIBUI-1311: Metadata Provider Dashboard'                          | '/SHIBUI-1311.side'
+//        'SHIBUI-1281: Metadata Source Dashboard'                            | '/SHIBUI-1281.side'
+//        'SHIBUI-1311: Metadata Provider Dashboard'                          | '/SHIBUI-1311.side'
         'SHIBUI-950: Metadata Source from XML w/ digest'                    | '/SHIBUI-950.side'
         'SHIBUI-1352: Create LocalDynamic provider'                         | '/SHIBUI-1352-1.side'
         'SHIBUI-1352: Create FileSystem provider'                           | '/SHIBUI-1352-2.side'
-        'SHIBUI-1333: Verify metadata source configuration'                 | '/SHIBUI-1333.side'
-        'SHIBUI-1334: Verify metadata source versioning'                    | '/SHIBUI-1334-1.side'
-        'SHIBUI-1334: Verify metadata provider versioning'                  | '/SHIBUI-1334-2.side'
+//        'SHIBUI-1333: Verify metadata source configuration'                 | '/SHIBUI-1333.side'
+//        'SHIBUI-1334: Verify metadata source versioning'                    | '/SHIBUI-1334-1.side'
+//        'SHIBUI-1334: Verify metadata provider versioning'                  | '/SHIBUI-1334-2.side'
         'SHIBUI-1335: Verify File Backed HTTP Metadata Provider Filters'    | '/SHIBUI-1335-1.side'
         'SHIBUI-1335: Verify Filesystem Metadata Provider Filters'          | '/SHIBUI-1335-2.side'
         'SHIBUI-1335: Verify Local Dynamic Metadata Provider Filters'       | '/SHIBUI-1335-3.side'
         'SHIBUI-1335: Verify Dynamic HTTP Metadata Provider Filters'        | '/SHIBUI-1335-4.side'
         'SHIBUI-1392: Verify provider with script filter is persistable'    | '/SHIBUI-1392.side'
-        'SHIBUI-1361: Verify dates display in proper format'                | '/SHIBUI-1361.side'
-        'SHIBUI-1385: Restore a metadata source version'                    | '/SHIBUI-1385-1.side'
-        'SHIBUI-1385: Restore a metadata provider version'                  | '/SHIBUI-1385-2.side'
+//        'SHIBUI-1361: Verify dates display in proper format'                | '/SHIBUI-1361.side'
+//        'SHIBUI-1385: Restore a metadata source version'                    | '/SHIBUI-1385-1.side'
+//        'SHIBUI-1385: Restore a metadata provider version'                  | '/SHIBUI-1385-2.side'
         'SHIBUI-1391: Regex Validation'                                     | '/SHIBUI-1391.side'
         'SHIBUI-1407: Metadata source comparison highlights'                | '/SHIBUI-1407-1.side'
         'SHIBUI-1407: Metadata provider comparison highlights'              | '/SHIBUI-1407-2.side'

diff --git a/backend/src/integration/resources/SHIBUI-1407-1.side b/backend/src/integration/resources/SHIBUI-1407-1.side
@@ -1775,45 +1775,47 @@
       "id": "3baa7bd3-55c0-4d10-8aa3-c0daa63ec4d4",
       "comment": "",
       "command": "assertText",
-      "target": "css=.px-3 > summary-property:nth-child(2) > .mb-3 > .d-block:nth-child(2)",
+      "target": "css=.d-block > primitive-property:nth-child(1) .text-truncate",
       "targets": [
-        ["css=.px-3 > summary-property:nth-child(2) > .mb-3 > .d-block:nth-child(2)", "css:finder"],
-        ["xpath=//summary-property/div/span", "xpath:position"],
+        ["css=.d-block > primitive-property:nth-child(1) .text-truncate", "css:finder"],
+        ["xpath=//metadata-configuration[@id='configuration']/div/section/div/div[2]/object-property/primitive-property/div/div/span[2]", "xpath:idRelative"],
+        ["xpath=//div/span[2]", "xpath:position"],
         ["xpath=//span[contains(.,'test-1234')]", "xpath:innerText"]
       ],
       "value": "test-1234"
     }, {
       "id": "0d355ff0-0449-49a7-ae75-14d7c405b97c",
       "comment": "",
       "command": "assertText",
-      "target": "css=.px-3:nth-child(2) > summary-property:nth-child(2) tr:nth-child(2) > td:nth-child(1)",
+      "target": "css=.mb-4:nth-child(7) .py-2:nth-child(3) > .d-flex:nth-child(1) > .text-truncate",
       "targets": [
-        ["css=.px-3:nth-child(2) > summary-property:nth-child(2) tr:nth-child(2) > td:nth-child(1)", "css:finder"],
-        ["xpath=//div[2]/section[2]/summary-property/div/table/tbody/tr[2]/td", "xpath:position"],
-        ["xpath=//td[contains(.,'http://test.org/assert2')]", "xpath:innerText"]
+        ["css=.mb-4:nth-child(7) .py-2:nth-child(3) > .d-flex:nth-child(1) > .text-truncate", "css:finder"],
+        ["xpath=//metadata-configuration[@id='configuration']/div/section[7]/div/div[2]/object-property/array-property/div/div[3]/div/div[2]", "xpath:idRelative"],
+        ["xpath=//section[7]/div/div[2]/object-property/array-property/div/div[3]/div/div[2]", "xpath:position"]
       ],
       "value": "http://test.org/assert2"
     }, {
       "id": "e53030b6-f344-4361-981d-b8303a721c5d",
       "comment": "",
       "command": "assertText",
-      "target": "css=summary-property:nth-child(2) > .mb-3 > .list-unstyled > li:nth-child(5)",
+      "target": "css=array-property:nth-child(8) .border-0",
       "targets": [
-        ["css=summary-property:nth-child(2) > .mb-3 > .list-unstyled > li:nth-child(5)", "css:finder"],
-        ["xpath=//li[5]", "xpath:position"],
-        ["xpath=//li[contains(.,'somethingElse')]", "xpath:innerText"]
+        ["css=array-property:nth-child(8) .border-0", "css:finder"],
+        ["xpath=//metadata-configuration[@id='configuration']/div/section[8]/div/div[2]/object-property/object-property/array-property/div/ul/li[5]", "xpath:idRelative"],
+        ["xpath=//section[8]/div/div[2]/object-property/object-property/array-property/div/ul/li[5]", "xpath:position"]
       ],
       "value": "somethingElse"
     }, {
       "id": "18636780-2feb-458f-97be-cf4a625b22e1",
       "comment": "",
       "command": "assertText",
-      "target": "css=summary-property:nth-child(10) .d-block:nth-child(2)",
+      "target": "css=.d-flex:nth-child(2) > .py-2 > span",
       "targets": [
-        ["css=summary-property:nth-child(10) .d-block:nth-child(2)", "css:finder"],
-        ["xpath=//summary-property[10]/div/span", "xpath:position"]
+        ["css=.d-flex:nth-child(2) > .py-2 > span", "css:finder"],
+        ["xpath=//metadata-configuration[@id='configuration']/div/section[9]/div/div[2]/object-property/array-property/div/div[2]/div/span", "xpath:idRelative"],
+        ["xpath=//array-property/div/div[2]/div/span", "xpath:position"]
       ],
-      "value": "true"
+      "value": "True"
     }, {
       "id": "1406d7e4-907d-4359-8de8-a40206f0993e",
       "comment": "",
@@ -1871,18 +1873,6 @@
         ["xpath=//td[contains(.,'root')]", "xpath:innerText"]
       ],
       "value": "admin"
-    }, {
-      "id": "87281e0a-322f-4d3a-9703-3e6966f26759",
-      "comment": "",
-      "command": "click",
-      "target": "id=search",
-      "targets": [
-        ["id=search", "id"],
-        ["css=#search", "css:finder"],
-        ["xpath=//input[@id='search']", "xpath:attributes"],
-        ["xpath=//input", "xpath:position"]
-      ],
-      "value": ""
     }, {
       "id": "fbcf1587-cb27-4deb-80c6-78b4d4aa2478",
       "comment": "",
@@ -2438,34 +2428,6 @@
       "target": "isPresent",
       "targets": [],
       "value": "true"
-    }, {
-      "id": "1d80e2ba-e14d-460e-b575-0314025bcf42",
-      "comment": "",
-      "command": "assertText",
-      "target": "xpath=//metadata-comparison/div/metadata-configuration/div/section[2]/div/div[2]/div",
-      "targets": [],
-      "value": "No Changes"
-    }, {
-      "id": "4dc0b20f-380a-43a0-b79a-8ba7b7a24ecd",
-      "comment": "",
-      "command": "storeAttribute",
-      "target": "xpath=//metadata-comparison/div/metadata-configuration/div/section[2]/div/div[2]/div@class",
-      "targets": [],
-      "value": "classes"
-    }, {
-      "id": "a604f1d3-af29-4800-aded-5cd70c4cd81e",
-      "comment": "",
-      "command": "executeScript",
-      "target": "return ${classes}.includes('bg-diff')",
-      "targets": [],
-      "value": "isPresent"
-    }, {
-      "id": "6ba6e7e2-9037-4260-8131-5fb98774b602",
-      "comment": "",
-      "command": "assert",
-      "target": "isPresent",
-      "targets": [],
-      "value": "false"
     }]
   }],
   "suites": [{

diff --git a/backend/src/integration/resources/SHIBUI-1407-2.side b/backend/src/integration/resources/SHIBUI-1407-2.side
@@ -538,21 +538,23 @@
       "id": "52f5680c-c63d-411e-8332-52901f12ea3b",
       "comment": "",
       "command": "assertText",
-      "target": "css=.px-3:nth-child(1) > summary-property:nth-child(2) > .mb-3 > .d-block:nth-child(2)",
+      "target": "css=.mb-4:nth-child(1) primitive-property:nth-child(1) .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"],
-        ["xpath=//summary-property/div/span", "xpath:position"],
+        ["css=.mb-4:nth-child(1) primitive-property:nth-child(1) .d-block:nth-child(2)", "css:finder"],
+        ["xpath=//metadata-configuration[@id='configuration']/div/section/div/div[2]/object-property/primitive-property/div/div/span[2]", "xpath:idRelative"],
+        ["xpath=//div/span[2]", "xpath:position"],
         ["xpath=//span[contains(.,'Test Metadata Provider')]", "xpath:innerText"]
       ],
       "value": "Test Metadata Provider"
     }, {
       "id": "67ff44aa-1efd-4b13-a0e9-3648a09911dd",
       "comment": "",
       "command": "assertText",
-      "target": "css=.px-3:nth-child(2) > summary-property:nth-child(2) > .mb-3 > .d-block:nth-child(2)",
+      "target": "css=.mb-4:nth-child(2) primitive-property:nth-child(1) .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"],
-        ["xpath=//section[2]/summary-property/div/span", "xpath:position"],
+        ["css=.mb-4:nth-child(2) primitive-property:nth-child(1) .d-block:nth-child(2)", "css:finder"],
+        ["xpath=//metadata-configuration[@id='configuration']/div/section[2]/div/div[2]/object-property/primitive-property/div/div/span[2]", "xpath:idRelative"],
+        ["xpath=//section[2]/div/div[2]/object-property/primitive-property/div/div/span[2]", "xpath:position"],
         ["xpath=//span[contains(.,'123')]", "xpath:innerText"]
       ],
       "value": "123"
@@ -916,34 +918,6 @@
       "target": "isDiff",
       "targets": [],
       "value": "true"
-    }, {
-      "id": "f82d1c60-acc3-40b8-90eb-3c7435b2dd52",
-      "comment": "",
-      "command": "assertText",
-      "target": "xpath=//metadata-comparison/div/metadata-configuration/div/section[2]/div/div[2]",
-      "targets": [],
-      "value": "No Changes"
-    }, {
-      "id": "9cad9b4c-982d-474f-9a6a-cd3e559a50b9",
-      "comment": "",
-      "command": "storeAttribute",
-      "target": "xpath=//metadata-comparison/div/metadata-configuration/div/section[2]/div/div[2]@class",
-      "targets": [],
-      "value": "classes"
-    }, {
-      "id": "6eb4e560-76f6-490f-a3b4-a5333962f2c6",
-      "comment": "",
-      "command": "executeScript",
-      "target": "return ${classes}.includes('bg-diff')",
-      "targets": [],
-      "value": "isDiff"
-    }, {
-      "id": "a10d2948-5e23-41ba-8c3d-716ac959c108",
-      "comment": "",
-      "command": "assert",
-      "target": "isDiff",
-      "targets": [],
-      "value": "false"
     }]
   }],
   "suites": [{