[NOJIRA]

More Selenium test updates, WIP.
TIER · Mar 5, 2019 · ffd105f · ffd105f
1 parent 4a399a0
commit ffd105f
Show file tree

Hide file tree

Showing 10 changed files with 691 additions and 726 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
@@ -20,7 +20,7 @@ class SeleniumSIDETest extends Specification {
 
     def "Selenium: just run one"() {
         setup:
-        def file = "/CreateMetadataSourceFromCopy.side"
+        def file = "/SHIBUI-1058_DelegatedAdmin_SubmitSourceWithError.side"
         def main = new Main()
         def config = new DefaultConfig([] as String[]).with {
             System.properties.contains('')
@@ -70,12 +70,12 @@ class SeleniumSIDETest extends Specification {
         'Create Filter REGEX'                   | '/CreateFilterREGEX.side'
         'Create Filter Script'                  | '/CreateFilterScript.side'
 //        'Create Metadata Source From XML'       | '/CreateMetadataSourceFromXML.side' // failing (Failure: Cannot click <input type=file> elements)
-//        'Create Metadata Source From Copy'      | '/CreateMetadataSourceFromCopy.side' //passing
-//        'Delete Entity ID Filter'               | '/DeleteEntityIDFilter.side' // failing (decimal point bug, possibly also incomplete)
-//        'Delete REGEX Filter'                   | '/DeleteREGEXFilter_Incomplete.side' // incomplete
-//        'Create Metadata Source from URL'       | '/CreateMetadataSourceFromURL.side' //passing
-//        'Delete Incomplete Source'              | '/DeleteIncompleteSource_Incomplete.side' // incomplete
-//        'Admin Login'                           | '/SHIBUI-1031_AdminLogin.side'
+        'Create Metadata Source From Copy'      | '/CreateMetadataSourceFromCopy.side' //failing, error reported to JJ/Ryan
+        'Create Metadata Source from URL'       | '/CreateMetadataSourceFromURL.side'
+        'Delete Entity ID Filter'               | '/DeleteEntityIDFilter.side'
+        'Delete REGEX Filter'                   | '/DeleteREGEXFilter.side'
+        'Delete Incomplete Source'              | '/DeleteIncompleteSource.side'
+        'Admin Login'                           | '/SHIBUI-1031_AdminLogin.side'
 //        'Delegated Admin: SubmitSourceWithError' | '/SHIBUI-1058_DelegatedAdmin_SubmitSourceWithError.side' //passing, but with heap problem
     }
 }
diff --git a/backend/src/integration/resources/CreateFilterEntityID.side b/backend/src/integration/resources/CreateFilterEntityID.side
@@ -634,13 +634,12 @@
       "id": "c3d80754-3e28-4b07-95f6-5bfac82e9a58",
       "comment": "",
       "command": "assertText",
-      "target": "css=div.px-2",
+      "target": "css=.row:nth-child(1) > .col:nth-child(2)",
       "targets": [
-        ["css=div.px-2", "css"],
-        ["css=.px-2", "css:finder"],
-        ["xpath=//div[2]/div[2]", "xpath:position"]
+        ["css=.row:nth-child(1) > .col:nth-child(2)", "css:finder"],
+        ["xpath=//div[2]/div/div/div/div/div[2]", "xpath:position"]
       ],
-      "value": "Metadata Provider: FBHMP FileBackedHttpMetadataResolver"
+      "value": "Metadata Provider: FBHMP"
     }, {
       "id": "108a25aa-6b33-4fa2-870d-ee413d7eb986",
       "comment": "",
@@ -947,6 +946,35 @@
         ["xpath=//div/button/i", "xpath:position"]
       ],
       "value": ""
+    }, {
+      "id": "0639596d-acef-4dd4-91b1-de12b05f9876",
+      "comment": "",
+      "command": "waitForElementPresent",
+      "target": "css=.td-lg:nth-child(3)",
+      "targets": [],
+      "value": "3000"
+    }, {
+      "id": "77bb14f1-a994-4dcd-880e-16d262762941",
+      "comment": "",
+      "command": "assertText",
+      "target": "css=.td-lg:nth-child(3)",
+      "targets": [
+        ["css=.td-lg:nth-child(3)", "css:finder"],
+        ["xpath=//td[3]", "xpath:position"],
+        ["xpath=//td[contains(.,'Entity ID')]", "xpath:innerText"]
+      ],
+      "value": "Entity ID"
+    }, {
+      "id": "7e890e10-3f49-47ec-b118-25fc28c6563e",
+      "comment": "",
+      "command": "assertText",
+      "target": "css=.td-lg:nth-child(4)",
+      "targets": [
+        ["css=.td-lg:nth-child(4)", "css:finder"],
+        ["xpath=//td[4]", "xpath:position"],
+        ["xpath=//td[contains(.,'EntityAttributes')]", "xpath:innerText"]
+      ],
+      "value": "EntityAttributes"
     }]
   }],
   "suites": [{
@@ -959,4 +987,4 @@
   }],
   "urls": ["http://localhost:10101/"],
   "plugins": []
-}
+}
diff --git a/backend/src/integration/resources/CreateFilterREGEX.side b/backend/src/integration/resources/CreateFilterREGEX.side
@@ -634,13 +634,12 @@
       "id": "c3d80754-3e28-4b07-95f6-5bfac82e9a58",
       "comment": "",
       "command": "assertText",
-      "target": "css=div.px-2",
+      "target": "css=.row:nth-child(1) > .col:nth-child(2)",
       "targets": [
-        ["css=div.px-2", "css"],
-        ["css=.px-2", "css:finder"],
-        ["xpath=//div[2]/div[2]", "xpath:position"]
+        ["css=.row:nth-child(1) > .col:nth-child(2)", "css:finder"],
+        ["xpath=//div[2]/div/div/div/div/div[2]", "xpath:position"]
       ],
-      "value": "Metadata Provider: FBHMP FileBackedHttpMetadataResolver"
+      "value": "Metadata Provider: FBHMP"
     }, {
       "id": "b8c89883-4999-4429-a4f0-b20f7dbc825c",
       "comment": "",
@@ -868,7 +867,7 @@
         ["xpath=//td[3]", "xpath:position"],
         ["xpath=//td[contains(.,'REGEX')]", "xpath:innerText"]
       ],
-      "value": ""
+      "value": "3000"
     }, {
       "id": "8d472caf-2525-4e20-9f14-195e0212f72f",
       "comment": "",
@@ -892,4 +891,4 @@
   }],
   "urls": ["http://localhost:10101/"],
   "plugins": []
-}
+}
diff --git a/backend/src/integration/resources/CreateFilterScript.side b/backend/src/integration/resources/CreateFilterScript.side
@@ -634,13 +634,12 @@
       "id": "c3d80754-3e28-4b07-95f6-5bfac82e9a58",
       "comment": "",
       "command": "assertText",
-      "target": "css=div.px-2",
+      "target": "css=.row:nth-child(1) > .col:nth-child(2)",
       "targets": [
-        ["css=div.px-2", "css"],
-        ["css=.px-2", "css:finder"],
-        ["xpath=//div[2]/div[2]", "xpath:position"]
+        ["css=.row:nth-child(1) > .col:nth-child(2)", "css:finder"],
+        ["xpath=//div[2]/div/div/div/div/div[2]", "xpath:position"]
       ],
-      "value": "Metadata Provider: FBHMP FileBackedHttpMetadataResolver"
+      "value": "Metadata Provider: FBHMP"
     }, {
       "id": "9dadc071-16b4-4758-8e21-93933d72e8b5",
       "comment": "",
@@ -764,30 +763,30 @@
       ],
       "value": ""
     }, {
-      "id": "12e67d13-7a7d-4467-940d-11e5a24db0b4",
+      "id": "0d3f1f64-0a69-4dfe-bc6a-1287a8a3b79f",
       "comment": "",
-      "command": "sendKeys",
+      "command": "editContent",
       "target": "id=targetInput",
       "targets": [
         ["id=targetInput", "id"],
         ["css=#targetInput", "css:finder"],
         ["xpath=//p[@id='targetInput']", "xpath:attributes"],
-        ["xpath=//p", "xpath:position"],
-        ["xpath=//p[contains(.,'eval(true);')]", "xpath:innerText"]
+        ["xpath=//p", "xpath:position"]
       ],
-      "value": "\\n"
+      "value": "eval(true);"
     }, {
-      "id": "0d3f1f64-0a69-4dfe-bc6a-1287a8a3b79f",
+      "id": "12e67d13-7a7d-4467-940d-11e5a24db0b4",
       "comment": "",
-      "command": "editContent",
+      "command": "sendKeys",
       "target": "id=targetInput",
       "targets": [
         ["id=targetInput", "id"],
         ["css=#targetInput", "css:finder"],
         ["xpath=//p[@id='targetInput']", "xpath:attributes"],
-        ["xpath=//p", "xpath:position"]
+        ["xpath=//p", "xpath:position"],
+        ["xpath=//p[contains(.,'eval(true);')]", "xpath:innerText"]
       ],
-      "value": "eval(true);"
+      "value": "\n"
     }, {
       "id": "38c76223-9080-4938-81b0-2f3c4706e943",
       "comment": "",
@@ -848,6 +847,39 @@
         ["xpath=//div/button/i", "xpath:position"]
       ],
       "value": ""
+    }, {
+      "id": "e54836ef-e3ac-41df-9989-ca8abffa0ee5",
+      "comment": "",
+      "command": "waitForElementPresent",
+      "target": "css=.td-lg:nth-child(3)",
+      "targets": [
+        ["css=.td-lg:nth-child(3)", "css:finder"],
+        ["xpath=//td[3]", "xpath:position"],
+        ["xpath=//td[contains(.,'Script')]", "xpath:innerText"]
+      ],
+      "value": "3000"
+    }, {
+      "id": "fc850e41-44ec-4775-a64a-9a77a4c4f83b",
+      "comment": "",
+      "command": "assertText",
+      "target": "css=.td-lg:nth-child(3)",
+      "targets": [
+        ["css=.td-lg:nth-child(3)", "css:finder"],
+        ["xpath=//td[3]", "xpath:position"],
+        ["xpath=//td[contains(.,'Script')]", "xpath:innerText"]
+      ],
+      "value": "Script"
+    }, {
+      "id": "05b5bfc3-4867-4243-9941-f74dd149a352",
+      "comment": "",
+      "command": "assertText",
+      "target": "css=.td-lg:nth-child(4)",
+      "targets": [
+        ["css=.td-lg:nth-child(4)", "css:finder"],
+        ["xpath=//td[4]", "xpath:position"],
+        ["xpath=//td[contains(.,'EntityAttributes')]", "xpath:innerText"]
+      ],
+      "value": "EntityAttributes"
     }]
   }],
   "suites": [{

diff --git a/backend/src/integration/resources/CreateMetadataSourceFromURL.side b/backend/src/integration/resources/CreateMetadataSourceFromURL.side
@@ -1,29 +1,54 @@
 {
   "id": "16b5f41b-30c1-4cc1-9c9e-bc15e40d1318",
-  "version": "1.1",
+  "version": "2.0",
   "name": "ShibUI",
   "url": "http://localhost:10101/",
   "tests": [{
     "id": "daacdb81-2f14-49f3-8d15-da5f5d52586c",
     "name": "Create Metadata Source from URL",
     "commands": [{
-      "id": "227fe3ca-ebb3-46ee-8067-eb1bd1290801",
+      "id": "c023f973-f799-4dc3-90d0-d75ccade0317",
       "comment": "",
       "command": "open",
-      "target": "/api/heheheheheheheWipeout",
+      "target": "/login",
       "targets": [],
       "value": ""
     }, {
-      "id": "853ef897-df38-4b31-ad06-3598bf9bc5e2",
+      "id": "492f48b4-97f8-4cb7-b8de-abf963b576af",
+      "comment": "Use User Login",
+      "command": "type",
+      "target": "name=username",
+      "targets": [
+        ["name=username", "name"],
+        ["css=tr:nth-child(1) input", "css:finder"],
+        ["xpath=//input[@name='username']", "xpath:attributes"],
+        ["xpath=//input", "xpath:position"]
+      ],
+      "value": "admin"
+    }, {
+      "id": "f61dd17c-d2ee-4200-a8f7-96d841d4ccb8",
+      "comment": "Use User Password",
+      "command": "type",
+      "target": "name=password",
+      "targets": [
+        ["name=password", "name"],
+        ["css=tr:nth-child(2) input", "css:finder"],
+        ["xpath=//input[@name='password']", "xpath:attributes"],
+        ["xpath=//tr[2]/td[2]/input", "xpath:position"]
+      ],
+      "value": "adminpass"
+    }, {
+      "id": "fdb5a585-49aa-403c-8c23-c4fc548267b3",
       "comment": "",
-      "command": "assertText",
-      "target": "css=body",
+      "command": "click",
+      "target": "name=submit",
       "targets": [
-        ["css=body", "css"],
-        ["css=body", "css:finder"],
-        ["xpath=//body", "xpath:position"]
+        ["name=submit", "name"],
+        ["css=td:nth-child(1) > input", "css:finder"],
+        ["xpath=//input[@name='submit']", "xpath:attributes"],
+        ["xpath=//tr[3]/td/input", "xpath:position"]
       ],
-      "value": "yes, you did it"
+      "value": ""
     }, {
       "id": "effbf04c-a1fa-411e-a47f-0b71acfbf4b2",
       "comment": "",
@@ -182,6 +207,36 @@
         ["xpath=//button[2]/translate-i18n", "xpath:position"]
       ],
       "value": ""
+    }, {
+      "id": "f93bfd80-e300-4431-8bc6-ad81de1e316b",
+      "comment": "",
+      "command": "click",
+      "target": "css=.text-primary",
+      "targets": [
+        ["css=.text-primary", "css:finder"],
+        ["xpath=//div/i", "xpath:position"]
+      ],
+      "value": ""
+    }, {
+      "id": "063a098a-3dd3-46ce-90d6-aa84065b2a1b",
+      "comment": "",
+      "command": "assertText",
+      "target": "css=.row:nth-child(1) > .col:nth-child(2)",
+      "targets": [
+        ["css=.row:nth-child(1) > .col:nth-child(2)", "css:finder"],
+        ["xpath=//div[2]/div/div/div/div/div[2]", "xpath:position"]
+      ],
+      "value": "Metadata Source from URL"
+    }, {
+      "id": "3ef55a3a-2c1d-4cc5-bfed-fa13c256c440",
+      "comment": "",
+      "command": "assertText",
+      "target": "css=.row:nth-child(2) > .col:nth-child(2)",
+      "targets": [
+        ["css=.row:nth-child(2) > .col:nth-child(2)", "css:finder"],
+        ["xpath=//div[2]/div[2]", "xpath:position"]
+      ],
+      "value": "urn:amazon:webservices"
     }]
   }],
   "suites": [{