Merge branch 'master' of bitbucket.org:unicon/shib-idp-ui into featur…

…e/SHIBUI-1385
TIER · Aug 30, 2019 · 473642f · 473642f
2 parents 8cb1d49 + 6e2baee
commit 473642f
Show file tree

Hide file tree

Showing 3 changed files with 1,195 additions and 12 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
@@ -119,6 +119,7 @@ class SeleniumSIDETest extends Specification {
         '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'
     }
 }
 
diff --git a/backend/src/integration/resources/SHIBUI-1334-2.side b/backend/src/integration/resources/SHIBUI-1334-2.side
@@ -693,41 +693,41 @@
       "id": "68103f0e-e3f1-419b-903d-5d8c30bc6700",
       "comment": "",
       "command": "verifyText",
-      "target": "css=.d-block > primitive-property:nth-child(2) .d-block:nth-child(2)",
+      "target": "css=.d-block > primitive-property:nth-child(4) .d-block:nth-child(2)",
       "targets": [
-        ["css=.d-block > primitive-property:nth-child(2) .d-block:nth-child(2)", "css:finder"],
-        ["xpath=//primitive-property[2]/div/span[2]", "xpath:position"],
+        ["css=.d-block > primitive-property:nth-child(4) .d-block:nth-child(2)", "css:finder"],
+        ["xpath=//primitive-property[4]/div/span[2]", "xpath:position"],
         ["xpath=//span[contains(.,'123 v2')]", "xpath:innerText"]
       ],
       "value": "123 v2"
     }, {
       "id": "a13198b9-7827-47e2-ade3-143b981d34ee",
       "comment": "",
       "command": "verifyText",
-      "target": "css=.d-block > primitive-property:nth-child(2) .d-block:nth-child(3)",
+      "target": "css=.d-block > primitive-property:nth-child(4) .d-block:nth-child(3)",
       "targets": [
-        ["css=.d-block > primitive-property:nth-child(2) .d-block:nth-child(3)", "css:finder"],
-        ["xpath=//primitive-property[2]/div/span[3]", "xpath:position"]
+        ["css=.d-block > primitive-property:nth-child(4) .d-block:nth-child(3)", "css:finder"],
+        ["xpath=//primitive-property[4]/div/span[3]", "xpath:position"]
       ],
       "value": "123"
     }, {
       "id": "3d83741c-299e-4fcb-9ce6-4b7291c423a4",
       "comment": "",
       "command": "verifyText",
-      "target": "css=.d-block > primitive-property:nth-child(10) .d-block:nth-child(2)",
+      "target": "css=.d-block > primitive-property:nth-child(12) .d-block:nth-child(2)",
       "targets": [
-        ["css=.d-block > primitive-property:nth-child(10) .d-block:nth-child(2)", "css:finder"],
-        ["xpath=//primitive-property[10]/div/span[2]", "xpath:position"]
+        ["css=.d-block > primitive-property:nth-child(12) .d-block:nth-child(2)", "css:finder"],
+        ["xpath=//primitive-property[12]/div/span[2]", "xpath:position"]
       ],
       "value": "false"
     }, {
       "id": "190cc157-d427-4046-aff2-180392395ad3",
       "comment": "",
       "command": "verifyText",
-      "target": "css=.d-block > primitive-property:nth-child(10) .d-block:nth-child(3)",
+      "target": "css=.d-block > primitive-property:nth-child(12) .d-block:nth-child(3)",
       "targets": [
-        ["css=.d-block > primitive-property:nth-child(10) .d-block:nth-child(3)", "css:finder"],
-        ["xpath=//primitive-property[10]/div/span[3]", "xpath:position"]
+        ["css=.d-block > primitive-property:nth-child(12) .d-block:nth-child(3)", "css:finder"],
+        ["xpath=//primitive-property[12]/div/span[3]", "xpath:position"]
       ],
       "value": "true"
     }, {