Resolved merge conflict

TIER · Aug 17, 2022 · 8c9d7f4 · 8c9d7f4
2 parents 5bd0e21 + ecf7bf9
commit 8c9d7f4
Show file tree

Hide file tree

Showing 34 changed files with 3,661 additions and 1,001 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
@@ -153,6 +153,10 @@ class SeleniumSIDETest extends Specification {
         'SHIBUI-1744: Verify attribute bundles in entity attribute filters' | '/SHIBUI-1744-3.side'
         'SHIBUI-2052: Logged in user & role appear on dashboard'            | '/SHIBUI-2052.side'
         'SHIBUI-2116: Verify entity attribute bundle highlights'            | '/SHIBUI-2116.side' // Note that this script WILL NOT PASS in the Selenium IDE due to ${driver} not being set (it is provided by this groovy script).
+        'SHIBUI-2267: Verify new RPO CRUD'                                  | '/SHIBUI-2267.side'
+        'SHIBUI-1674: Verify metadata source tooltips'                      | '/SHIBUI-1674-1.side'
+        'SHIBUI-1674: Verify metadata provider tooltips'                    | '/SHIBUI-1674-2.side'
+        'SHIBUI-1674: Verify advanced menu tooltips'                        | '/SHIBUI-1674-3.side'
         'SHIBUI-2269: Verify XML generation of external filters'            | '/SHIBUI-2269.side'
     }
 }
diff --git a/backend/src/integration/resources/SHIBUI-1334-1.side b/backend/src/integration/resources/SHIBUI-1334-1.side
@@ -2695,6 +2695,13 @@
         ["xpath=//span[contains(.,'Display Name v3')]", "xpath:innerText"]
       ],
       "value": "30000"
+    }, {
+      "id": "bde2bbbb-df66-4e07-a770-ec9125fe3e81",
+      "comment": "",
+      "command": "pause",
+      "target": "5000",
+      "targets": [],
+      "value": ""
     }, {
       "id": "5a976e2c-dc5f-4021-9cc6-3cad12e771ea",
       "comment": "",
@@ -2718,20 +2725,20 @@
       ],
       "value": "Display Name"
     }, {
-             "id": "4ec2c493-85e4-403b-9b09-031c5728f498",
-             "comment": "",
-             "command": "open",
-             "target": "/api/heheheheheheheWipeout",
-             "targets": [],
-             "value": ""
-           }, {
-             "id": "e074980a-8f21-4c22-8412-c4b6fcdcd1a4",
-             "comment": "",
-             "command": "assertText",
-             "target": "css=body",
-             "targets": [],
-             "value": "yes, you did it"
-           }]
+      "id": "4ec2c493-85e4-403b-9b09-031c5728f498",
+      "comment": "",
+      "command": "open",
+      "target": "/api/heheheheheheheWipeout",
+      "targets": [],
+      "value": ""
+    }, {
+      "id": "e074980a-8f21-4c22-8412-c4b6fcdcd1a4",
+      "comment": "",
+      "command": "assertText",
+      "target": "css=body",
+      "targets": [],
+      "value": "yes, you did it"
+    }]
   }],
   "suites": [{
     "id": "d2caeac4-7520-4e3c-96b1-840610b6983c",

diff --git a/backend/src/integration/resources/SHIBUI-1364-4.side b/backend/src/integration/resources/SHIBUI-1364-4.side
@@ -1417,6 +1417,20 @@
         ["xpath=//input", "xpath:position"]
       ],
       "value": ""
+    }, {
+      "id": "a9bd983c-7743-4bec-87ad-7484e60cff99",
+      "comment": "",
+      "command": "waitForElementVisible",
+      "target": "css=.d-flex:nth-child(3) > .border-primary:nth-child(2) .mb-0:nth-child(1)",
+      "targets": [],
+      "value": "30000"
+    }, {
+      "id": "0d53853f-597f-4c2a-8f6b-ef4e1109bf3c",
+      "comment": "",
+      "command": "pause",
+      "target": "5000",
+      "targets": [],
+      "value": ""
     }, {
       "id": "c2102a31-6e18-4d6c-8146-e23459403b65",
       "comment": "",

diff --git a/backend/src/integration/resources/SHIBUI-1385-1.side b/backend/src/integration/resources/SHIBUI-1385-1.side
@@ -2629,45 +2629,38 @@
       ],
       "value": ""
     }, {
-      "id": "56094f6e-45b7-42f6-9102-e4e19673240d",
+      "id": "85af384a-77b1-4d88-8915-9430afae4845",
       "comment": "",
       "command": "waitForElementVisible",
-      "target": "css=.mb-4:nth-child(3) div:nth-child(1) > .d-flex > .d-block:nth-child(2)",
-      "targets": [
-        ["css=.mb-4:nth-child(3) div:nth-child(1) > .d-flex > .d-block:nth-child(2)", "css:finder"],
-        ["xpath=//div[@id='root']/div/main/div/section/div/div/section[2]/div/div[2]/div[2]/div/div/div/span[2]", "xpath:idRelative"],
-        ["xpath=//section[2]/div/div[2]/div[2]/div/div/div/span[2]", "xpath:position"]
-      ],
+      "target": "css=div:nth-child(1) > div > .bg-diff > .d-block:nth-child(2)",
+      "targets": [],
       "value": "30000"
+    }, {
+      "id": "eb302999-153d-492c-869c-8bf26e8134a0",
+      "comment": "",
+      "command": "pause",
+      "target": "5000",
+      "targets": [],
+      "value": ""
     }, {
       "id": "5a976e2c-dc5f-4021-9cc6-3cad12e771ea",
       "comment": "",
       "command": "assertText",
-      "target": "css=.mb-4:nth-child(3) div:nth-child(1) > .d-flex > .d-block:nth-child(2)",
+      "target": "css=div:nth-child(1) > div > .bg-diff > .d-block:nth-child(2)",
       "targets": [
-        ["css=.mb-4:nth-child(3) div:nth-child(1) > .d-flex > .d-block:nth-child(2)", "css:finder"],
+        ["css=div:nth-child(1) > div > .bg-diff > .d-block:nth-child(2)", "css:finder"],
         ["xpath=//div[@id='root']/div/main/div/section/div/div/section[2]/div/div[2]/div[2]/div/div/div/span[2]", "xpath:idRelative"],
-        ["xpath=//section[2]/div/div[2]/div[2]/div/div/div/span[2]", "xpath:position"]
+        ["xpath=//section[2]/div/div[2]/div[2]/div/div/div/span[2]", "xpath:position"],
+        ["xpath=//span[contains(.,'Display Name v3')]", "xpath:innerText"]
       ],
       "value": "Display Name v3"
-    }, {
-      "id": "c2ebc46c-e443-47b9-b17b-0ac6d23b882c",
-      "comment": "",
-      "command": "waitForElementVisible",
-      "target": "css=.mb-4:nth-child(3) div:nth-child(1) > .d-flex > .d-block:nth-child(3)",
-      "targets": [
-        ["css=.mb-4:nth-child(3) div:nth-child(1) > .d-flex > .d-block:nth-child(3)", "css:finder"],
-        ["xpath=//div[@id='root']/div/main/div/section/div/div/section[2]/div/div[2]/div[2]/div/div/div/span[3]", "xpath:idRelative"],
-        ["xpath=//section[2]/div/div[2]/div[2]/div/div/div/span[3]", "xpath:position"]
-      ],
-      "value": "30000"
     }, {
       "id": "72328587-fe8d-4dc8-bc3d-a163f91a1ad6",
       "comment": "",
       "command": "assertText",
-      "target": "css=.mb-4:nth-child(3) div:nth-child(1) > .d-flex > .d-block:nth-child(3)",
+      "target": "css=div:nth-child(1) > div > .bg-diff > .d-block:nth-child(3)",
       "targets": [
-        ["css=.mb-4:nth-child(3) div:nth-child(1) > .d-flex > .d-block:nth-child(3)", "css:finder"],
+        ["css=div:nth-child(1) > div > .bg-diff > .d-block:nth-child(3)", "css:finder"],
         ["xpath=//div[@id='root']/div/main/div/section/div/div/section[2]/div/div[2]/div[2]/div/div/div/span[3]", "xpath:idRelative"],
         ["xpath=//section[2]/div/div[2]/div[2]/div/div/div/span[3]", "xpath:position"]
       ],
@@ -2878,21 +2871,21 @@
         ["xpath=//section[2]/div/div[2]/div[2]/div/div/div/span[3]", "xpath:position"]
       ],
       "value": "Display Name"
-    },{
-            "id": "4ec2c493-85e4-403b-9b09-031c5728f498",
-            "comment": "",
-            "command": "open",
-            "target": "/api/heheheheheheheWipeout",
-            "targets": [],
-            "value": ""
-          }, {
-            "id": "e074980a-8f21-4c22-8412-c4b6fcdcd1a4",
-            "comment": "",
-            "command": "assertText",
-            "target": "css=body",
-            "targets": [],
-            "value": "yes, you did it"
-          }]
+    }, {
+      "id": "4ec2c493-85e4-403b-9b09-031c5728f498",
+      "comment": "",
+      "command": "open",
+      "target": "/api/heheheheheheheWipeout",
+      "targets": [],
+      "value": ""
+    }, {
+      "id": "e074980a-8f21-4c22-8412-c4b6fcdcd1a4",
+      "comment": "",
+      "command": "assertText",
+      "target": "css=body",
+      "targets": [],
+      "value": "yes, you did it"
+    }]
   }],
   "suites": [{
     "id": "d2caeac4-7520-4e3c-96b1-840610b6983c",

diff --git a/backend/src/integration/resources/SHIBUI-1407-1.side b/backend/src/integration/resources/SHIBUI-1407-1.side
@@ -2459,6 +2459,13 @@
         ["xpath=//span[3]", "xpath:position"]
       ],
       "value": "Test Provider"
+    }, {
+      "id": "39637add-5eb4-40d0-b840-8eb1972ede0f",
+      "comment": "",
+      "command": "pause",
+      "target": "1000",
+      "targets": [],
+      "value": ""
     }, {
       "id": "138ad58b-f0a2-436b-a8b0-43484f4180e6",
       "comment": "",
@@ -2608,21 +2615,21 @@
       "target": "isPresent",
       "targets": [],
       "value": "true"
-    },{
-            "id": "4ec2c493-85e4-403b-9b09-031c5728f498",
-            "comment": "",
-            "command": "open",
-            "target": "/api/heheheheheheheWipeout",
-            "targets": [],
-            "value": ""
-          }, {
-            "id": "e074980a-8f21-4c22-8412-c4b6fcdcd1a4",
-            "comment": "",
-            "command": "assertText",
-            "target": "css=body",
-            "targets": [],
-            "value": "yes, you did it"
-          }]
+    }, {
+      "id": "4ec2c493-85e4-403b-9b09-031c5728f498",
+      "comment": "",
+      "command": "open",
+      "target": "/api/heheheheheheheWipeout",
+      "targets": [],
+      "value": ""
+    }, {
+      "id": "e074980a-8f21-4c22-8412-c4b6fcdcd1a4",
+      "comment": "",
+      "command": "assertText",
+      "target": "css=body",
+      "targets": [],
+      "value": "yes, you did it"
+    }]
   }],
   "suites": [{
     "id": "d2caeac4-7520-4e3c-96b1-840610b6983c",