2052

More test fixes.
TIER · Sep 3, 2021 · b848391 · b848391
1 parent 8005135
commit b848391
Show file tree

Hide file tree

Showing 9 changed files with 256 additions and 200 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
@@ -104,15 +104,15 @@ class SeleniumSIDETest extends Specification {
         'SHIBUI-1364: Compare FSMP with filters'                            | '/SHIBUI-1364-2.side'
         'SHIBUI-1364: Compare LDMP with filters'                            | '/SHIBUI-1364-3.side'
         'SHIBUI-1364: Compare DHTTPMP with filters'                         | '/SHIBUI-1364-4.side'
-/*        'SHIBUI-1281: Metadata Source Dashboard'                            | '/SHIBUI-1281.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-1335: Verify File Backed HTTP Metadata Provider Filters'    | '/SHIBUI-1335-1.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' // adding filters to this resolver type was removed in the react update
         'SHIBUI-1335: Verify Local Dynamic Metadata Provider Filters'       | '/SHIBUI-1335-3.side' // adding filters to this resolver type was removed in the react update
         'SHIBUI-1335: Verify Dynamic HTTP Metadata Provider Filters'        | '/SHIBUI-1335-4.side'

diff --git a/backend/src/integration/resources/SHIBUI-1281.side b/backend/src/integration/resources/SHIBUI-1281.side
@@ -74,10 +74,12 @@
       "id": "ad3811ad-f95b-4cca-a5d9-63a10063a652",
       "comment": "",
       "command": "click",
-      "target": "xpath=(//button[@id='dropdown-basic'])[2]",
+      "target": "id=metadata-nav-dropdown-toggle",
       "targets": [
-        ["xpath=(//button[@id='dropdown-basic'])[2]", "xpath:attributes"],
-        ["xpath=(//div[@id='basic-nav-dropdown']/button)[2]", "xpath:idRelative"],
+        ["id=metadata-nav-dropdown-toggle", "id"],
+        ["css=#metadata-nav-dropdown-toggle", "css:finder"],
+        ["xpath=//button[@id='metadata-nav-dropdown-toggle']", "xpath:attributes"],
+        ["xpath=//div[@id='metadata-nav-dropdown']/button", "xpath:idRelative"],
         ["xpath=//div[2]/button", "xpath:position"],
         ["xpath=//button[contains(.,'Add New')]", "xpath:innerText"]
       ],
@@ -86,14 +88,16 @@
       "id": "1caf8be6-a4d9-4b3b-ace1-0f76d3600d62",
       "comment": "",
       "command": "click",
-      "target": "linkText=Add a new metadata source",
+      "target": "id=metadata-nav-dropdown-source",
       "targets": [
+        ["id=metadata-nav-dropdown-source", "id"],
         ["linkText=Add a new metadata source", "linkText"],
-        ["css=.text-primary:nth-child(1)", "css:finder"],
+        ["css=#metadata-nav-dropdown-source", "css:finder"],
         ["xpath=//a[contains(text(),'Add a new metadata source')]", "xpath:link"],
-        ["xpath=//div[@id='basic-nav-dropdown']/div/a", "xpath:idRelative"],
+        ["xpath=//a[@id='metadata-nav-dropdown-source']", "xpath:attributes"],
+        ["xpath=//div[@id='metadata-nav-dropdown']/div/a", "xpath:idRelative"],
         ["xpath=//a[contains(@href, '/metadata/source/new')]", "xpath:href"],
-        ["xpath=//div/a", "xpath:position"],
+        ["xpath=//div[2]/div/a", "xpath:position"],
         ["xpath=//a[contains(.,'Add a new metadata source')]", "xpath:innerText"]
       ],
       "value": ""
@@ -779,8 +783,17 @@
       "id": "3cfbc4e0-f120-43ca-8a59-8727f91b5a1c",
       "comment": "",
       "command": "click",
-      "target": "css=body",
-      "targets": [],
+      "target": "id=option-selector-root_serviceProviderSsoDescriptor_nameIdFormats_4-item-4",
+      "targets": [
+        ["id=option-selector-root_serviceProviderSsoDescriptor_nameIdFormats_4-item-4", "id"],
+        ["linkText=somethingElse", "linkText"],
+        ["css=#option-selector-root_serviceProviderSsoDescriptor_nameIdFormats_4-item-4", "css:finder"],
+        ["xpath=//a[@id='option-selector-root_serviceProviderSsoDescriptor_nameIdFormats_4-item-4']", "xpath:attributes"],
+        ["xpath=//div[@id='option-selector-root_serviceProviderSsoDescriptor_nameIdFormats_4']/a[5]", "xpath:idRelative"],
+        ["xpath=(//a[contains(@href, '#')])[5]", "xpath:href"],
+        ["xpath=//a[5]", "xpath:position"],
+        ["xpath=//a[contains(.,'somethingElse')]", "xpath:innerText"]
+      ],
       "value": ""
     }, {
       "id": "4f61120b-7c6b-4f8e-8543-898298451a56",
@@ -1864,12 +1877,17 @@
       ],
       "value": ""
     }, {
-      "id": "553dd570-b1bb-43bb-a469-63ee08a09794",
+      "id": "12485e9f-5ab1-4c9c-a948-d6d13386b97f",
       "comment": "",
       "command": "click",
-      "target": "css=.fa-check",
+      "target": "id=attributeRelease.checkAll",
       "targets": [
-        ["css=.fa-check", "css:finder"]
+        ["id=attributeRelease.checkAll", "id"],
+        ["css=#attributeRelease\\.checkAll", "css:finder"],
+        ["xpath=//button[@id='attributeRelease.checkAll']", "xpath:attributes"],
+        ["xpath=//div[@id='root']/div/main/div/section/div[2]/div[2]/div/div/form/div/div/div/div/div[10]/div/div/fieldset/table/tbody/tr[13]/td[2]/button", "xpath:idRelative"],
+        ["xpath=//td[2]/button", "xpath:position"],
+        ["xpath=//button[contains(.,'Check All Attributes')]", "xpath:innerText"]
       ],
       "value": ""
     }, {
@@ -1882,19 +1900,6 @@
         ["xpath=//li[3]/button", "xpath:position"]
       ],
       "value": ""
-    }, {
-      "id": "14ca713a-313d-4cda-82ca-a0b814ce81dc",
-      "comment": "",
-      "command": "click",
-      "target": "id=root_serviceEnabled",
-      "targets": [
-        ["id=root_serviceEnabled", "id"],
-        ["css=#root_serviceEnabled", "css:finder"],
-        ["xpath=//input[@id='root_serviceEnabled']", "xpath:attributes"],
-        ["xpath=//div[@id='root']/div/main/div/section/div[2]/div[2]/div/div/form/div/div/div/div/div[11]/div/div/div/div/input", "xpath:idRelative"],
-        ["xpath=//input", "xpath:position"]
-      ],
-      "value": ""
     }, {
       "id": "3baa7bd3-55c0-4d10-8aa3-c0daa63ec4d4",
       "comment": "",

diff --git a/backend/src/integration/resources/SHIBUI-1311.side b/backend/src/integration/resources/SHIBUI-1311.side
@@ -74,10 +74,12 @@
       "id": "e7a98419-36c7-4b0f-a99d-087144f6a417",
       "comment": "",
       "command": "click",
-      "target": "xpath=(//button[@id='dropdown-basic'])[2]",
+      "target": "id=metadata-nav-dropdown-toggle",
       "targets": [
-        ["xpath=(//button[@id='dropdown-basic'])[2]", "xpath:attributes"],
-        ["xpath=(//div[@id='basic-nav-dropdown']/button)[2]", "xpath:idRelative"],
+        ["id=metadata-nav-dropdown-toggle", "id"],
+        ["css=#metadata-nav-dropdown-toggle", "css:finder"],
+        ["xpath=//button[@id='metadata-nav-dropdown-toggle']", "xpath:attributes"],
+        ["xpath=//div[@id='metadata-nav-dropdown']/button", "xpath:idRelative"],
         ["xpath=//div[2]/button", "xpath:position"],
         ["xpath=//button[contains(.,'Add New')]", "xpath:innerText"]
       ],
@@ -86,12 +88,14 @@
       "id": "74fef022-3979-4bed-9226-b25114514976",
       "comment": "",
       "command": "click",
-      "target": "linkText=Add a new metadata provider",
+      "target": "id=metadata-nav-dropdown-provider",
       "targets": [
+        ["id=metadata-nav-dropdown-provider", "id"],
         ["linkText=Add a new metadata provider", "linkText"],
-        ["css=.text-primary:nth-child(2)", "css:finder"],
+        ["css=#metadata-nav-dropdown-provider", "css:finder"],
         ["xpath=//a[contains(text(),'Add a new metadata provider')]", "xpath:link"],
-        ["xpath=//div[@id='basic-nav-dropdown']/div/a[2]", "xpath:idRelative"],
+        ["xpath=//a[@id='metadata-nav-dropdown-provider']", "xpath:attributes"],
+        ["xpath=//div[@id='metadata-nav-dropdown']/div/a[2]", "xpath:idRelative"],
         ["xpath=//a[contains(@href, '/metadata/provider/new')]", "xpath:href"],
         ["xpath=//a[2]", "xpath:position"],
         ["xpath=//a[contains(.,'Add a new metadata provider')]", "xpath:innerText"]
@@ -136,6 +140,13 @@
         ["xpath=//input", "xpath:position"]
       ],
       "value": "Test Metadata Provider"
+    }, {
+      "id": "e907f2a4-db3f-42da-af79-1ccaf6032b9c",
+      "comment": "",
+      "command": "waitForElementEditable",
+      "target": "name=type",
+      "targets": [],
+      "value": "30000"
     }, {
       "id": "add874d5-e3b2-4412-8039-2b9d2619ed19",
       "comment": "",
@@ -590,19 +601,6 @@
         ["xpath=//li[3]/button", "xpath:position"]
       ],
       "value": ""
-    }, {
-      "id": "79b96f40-2677-438a-9564-62df0ea2c116",
-      "comment": "",
-      "command": "click",
-      "target": "id=root_enabled",
-      "targets": [
-        ["id=root_enabled", "id"],
-        ["css=#root_enabled", "css:finder"],
-        ["xpath=//input[@id='root_enabled']", "xpath:attributes"],
-        ["xpath=//div[@id='root']/div/main/div/section/div[2]/div[2]/div/div/form/div/div/div/div/div[2]/div/div/div/div/input", "xpath:idRelative"],
-        ["xpath=//input", "xpath:position"]
-      ],
-      "value": ""
     }, {
       "id": "52f5680c-c63d-411e-8332-52901f12ea3b",
       "comment": "",
@@ -681,10 +679,12 @@
       "id": "211711a2-0af5-4f5e-a427-812c2de0264d",
       "comment": "",
       "command": "click",
-      "target": "xpath=(//button[@id='dropdown-basic'])[2]",
+      "target": "id=metadata-nav-dropdown-toggle",
       "targets": [
-        ["xpath=(//button[@id='dropdown-basic'])[2]", "xpath:attributes"],
-        ["xpath=(//div[@id='basic-nav-dropdown']/button)[2]", "xpath:idRelative"],
+        ["id=metadata-nav-dropdown-toggle", "id"],
+        ["css=#metadata-nav-dropdown-toggle", "css:finder"],
+        ["xpath=//button[@id='metadata-nav-dropdown-toggle']", "xpath:attributes"],
+        ["xpath=//div[@id='metadata-nav-dropdown']/button", "xpath:idRelative"],
         ["xpath=//div[2]/button", "xpath:position"],
         ["xpath=//button[contains(.,'Add New')]", "xpath:innerText"]
       ],
@@ -693,12 +693,14 @@
       "id": "ed69adec-1265-4796-96a9-06ed5930d952",
       "comment": "",
       "command": "click",
-      "target": "linkText=Add a new metadata provider",
+      "target": "id=metadata-nav-dropdown-provider",
       "targets": [
+        ["id=metadata-nav-dropdown-provider", "id"],
         ["linkText=Add a new metadata provider", "linkText"],
-        ["css=.text-primary:nth-child(2)", "css:finder"],
+        ["css=#metadata-nav-dropdown-provider", "css:finder"],
         ["xpath=//a[contains(text(),'Add a new metadata provider')]", "xpath:link"],
-        ["xpath=//div[@id='basic-nav-dropdown']/div/a[2]", "xpath:idRelative"],
+        ["xpath=//a[@id='metadata-nav-dropdown-provider']", "xpath:attributes"],
+        ["xpath=//div[@id='metadata-nav-dropdown']/div/a[2]", "xpath:idRelative"],
         ["xpath=//a[contains(@href, '/metadata/provider/new')]", "xpath:href"],
         ["xpath=//a[2]", "xpath:position"],
         ["xpath=//a[contains(.,'Add a new metadata provider')]", "xpath:innerText"]
@@ -965,8 +967,13 @@
       "id": "1675c12e-8951-4d07-87b1-15e280699d66",
       "comment": "",
       "command": "waitForElementVisible",
-      "target": "css=tr:nth-child(2) .badge",
-      "targets": [],
+      "target": "css=tr:nth-child(2) > .align-middle:nth-child(2)",
+      "targets": [
+        ["css=tr:nth-child(2) > .align-middle:nth-child(2)", "css:finder"],
+        ["xpath=//div[@id='root']/div/main/div/section/div/div[2]/div/div/div/table/tbody/tr[2]/td[2]", "xpath:idRelative"],
+        ["xpath=//tr[2]/td[2]", "xpath:position"],
+        ["xpath=//td[contains(.,'Test Provider 2')]", "xpath:innerText"]
+      ],
       "value": "10000"
     }, {
       "id": "b437068f-d3ed-43b5-9975-fb54decaf7ab",
@@ -996,6 +1003,24 @@
         ["xpath=//a[contains(.,'Test Provider 2')]", "xpath:innerText"]
       ],
       "value": "Test Provider 2"
+    }, {
+      "id": "06dce737-90a1-4c29-ba5e-16dc9ce2b161",
+      "comment": "",
+      "command": "click",
+      "target": "xpath=//table/tbody/tr[2]/td[6]/span/div/input",
+      "targets": [
+        ["css=tr:nth-child(1) .custom-control", "css:finder"],
+        ["xpath=//div[@id='root']/div/main/div/section/div/div[2]/div/div/div/table/tbody/tr/td[6]/span/div", "xpath:idRelative"],
+        ["xpath=//span/div", "xpath:position"]
+      ],
+      "value": ""
+    }, {
+      "id": "56ddb945-e04d-4bf8-84d3-5157e96853f3",
+      "comment": "",
+      "command": "waitForElementVisible",
+      "target": "xpath=//li[contains(.,'Metadata provider has been enabled.')]",
+      "targets": [],
+      "value": "30000"
     }, {
       "id": "b799fede-c85b-4bd3-8e03-347f8a7d188a",
       "comment": "",
@@ -1006,18 +1031,25 @@
         ["xpath=//tr[2]/td/div/button[2]/i", "xpath:position"]
       ],
       "value": ""
+    }, {
+      "id": "dc866249-3245-4baa-af0e-55af28d270cf",
+      "comment": "",
+      "command": "pause",
+      "target": "5000",
+      "targets": [],
+      "value": ""
     }, {
       "id": "72123a28-c3be-478c-8f30-555e346837e2",
       "comment": "",
-      "command": "assertText",
-      "target": "css=tr:nth-child(2) > .text-right",
+      "command": "assertChecked",
+      "target": "xpath=//table/tbody/tr[1]/td[6]/span/div/input",
       "targets": [
         ["css=tr:nth-child(2) > .text-right", "css:finder"],
         ["xpath=//div[@id='root']/div/main/div/section/div/div[2]/div/div/div/table/tbody/tr[2]/td[6]", "xpath:idRelative"],
         ["xpath=//tr[2]/td[6]", "xpath:position"],
         ["xpath=//td[contains(.,'Enabled')]", "xpath:innerText"]
       ],
-      "value": "Enabled"
+      "value": ""
     }, {
       "id": "664aafa3-9f6f-4eab-9eb6-a4d1a8344c5c",
       "comment": "",
@@ -1031,15 +1063,15 @@
     }, {
       "id": "ad8842de-2a4c-42a4-b919-dd7524a679c6",
       "comment": "",
-      "command": "assertText",
-      "target": "css=tr:nth-child(2) > .text-right",
+      "command": "assertNotChecked",
+      "target": "xpath=//table/tbody/tr[1]/td[6]/span/div/input",
       "targets": [
         ["css=tr:nth-child(2) > .text-right", "css:finder"],
         ["xpath=//div[@id='root']/div/main/div/section/div/div[2]/div/div/div/table/tbody/tr[2]/td[6]", "xpath:idRelative"],
         ["xpath=//tr[2]/td[6]", "xpath:position"],
         ["xpath=//td[contains(.,'Disabled')]", "xpath:innerText"]
       ],
-      "value": "Disabled"
+      "value": ""
     }, {
       "id": "57d0e204-6c28-4be5-9888-28f8d7738508",
       "comment": "",

diff --git a/backend/src/integration/resources/SHIBUI-1333.side b/backend/src/integration/resources/SHIBUI-1333.side
@@ -74,10 +74,12 @@
       "id": "ad3811ad-f95b-4cca-a5d9-63a10063a652",
       "comment": "",
       "command": "click",
-      "target": "xpath=(//button[@id='dropdown-basic'])[2]",
+      "target": "id=metadata-nav-dropdown-toggle",
       "targets": [
-        ["xpath=(//button[@id='dropdown-basic'])[2]", "xpath:attributes"],
-        ["xpath=(//div[@id='basic-nav-dropdown']/button)[2]", "xpath:idRelative"],
+        ["id=metadata-nav-dropdown-toggle", "id"],
+        ["css=#metadata-nav-dropdown-toggle", "css:finder"],
+        ["xpath=//button[@id='metadata-nav-dropdown-toggle']", "xpath:attributes"],
+        ["xpath=//div[@id='metadata-nav-dropdown']/button", "xpath:idRelative"],
         ["xpath=//div[2]/button", "xpath:position"],
         ["xpath=//button[contains(.,'Add New')]", "xpath:innerText"]
       ],
@@ -86,14 +88,16 @@
       "id": "1caf8be6-a4d9-4b3b-ace1-0f76d3600d62",
       "comment": "",
       "command": "click",
-      "target": "linkText=Add a new metadata source",
+      "target": "id=metadata-nav-dropdown-source",
       "targets": [
+        ["id=metadata-nav-dropdown-source", "id"],
         ["linkText=Add a new metadata source", "linkText"],
-        ["css=.text-primary:nth-child(1)", "css:finder"],
+        ["css=#metadata-nav-dropdown-source", "css:finder"],
         ["xpath=//a[contains(text(),'Add a new metadata source')]", "xpath:link"],
-        ["xpath=//div[@id='basic-nav-dropdown']/div/a", "xpath:idRelative"],
+        ["xpath=//a[@id='metadata-nav-dropdown-source']", "xpath:attributes"],
+        ["xpath=//div[@id='metadata-nav-dropdown']/div/a", "xpath:idRelative"],
         ["xpath=//a[contains(@href, '/metadata/source/new')]", "xpath:href"],
-        ["xpath=//div/a", "xpath:position"],
+        ["xpath=//div[2]/div/a", "xpath:position"],
         ["xpath=//a[contains(.,'Add a new metadata source')]", "xpath:innerText"]
       ],
       "value": ""
@@ -1899,19 +1903,6 @@
         ["xpath=//li[3]/button", "xpath:position"]
       ],
       "value": ""
-    }, {
-      "id": "14ca713a-313d-4cda-82ca-a0b814ce81dc",
-      "comment": "",
-      "command": "click",
-      "target": "id=root_serviceEnabled",
-      "targets": [
-        ["id=root_serviceEnabled", "id"],
-        ["css=#root_serviceEnabled", "css:finder"],
-        ["xpath=//input[@id='root_serviceEnabled']", "xpath:attributes"],
-        ["xpath=//div[@id='root']/div/main/div/section/div[2]/div[2]/div/div/form/div/div/div/div/div[11]/div/div/div/div/input", "xpath:idRelative"],
-        ["xpath=//input", "xpath:position"]
-      ],
-      "value": ""
     }, {
       "id": "3baa7bd3-55c0-4d10-8aa3-c0daa63ec4d4",
       "comment": "",
@@ -2166,10 +2157,10 @@
       "id": "3f2c3eab-ecbf-45f3-bcdc-a5cad766b27c",
       "comment": "",
       "command": "assertText",
-      "target": "css=div:nth-child(5) > .py-2:nth-child(2) > .d-flex:nth-child(3) > .d-block",
+      "target": "css=div:nth-child(2) > div:nth-child(4) > .py-2:nth-child(2) > .d-flex:nth-child(3) > .d-block",
       "targets": [
-        ["css=div:nth-child(5) > .py-2:nth-child(2) > .d-flex:nth-child(3) > .d-block", "css:finder"],
-        ["xpath=//div[@id='root']/div/main/div/section/div/div/section/div/div[2]/div[2]/div[5]/div[2]/div[3]/span", "xpath:idRelative"],
+        ["css=div:nth-child(2) > div:nth-child(4) > .py-2:nth-child(2) > .d-flex:nth-child(3) > .d-block", "css:finder"],
+        ["xpath=//div[@id='root']/div/main/div/section/div/div/section/div/div[2]/div[2]/div[4]/div[2]/div[3]/span", "xpath:idRelative"],
         ["xpath=//div[3]/span", "xpath:position"],
         ["xpath=//span[contains(.,'user@test.org')]", "xpath:innerText"]
       ],