From 27338ac980b499bc7636856d7ffd3393fa6b7062 Mon Sep 17 00:00:00 2001
From: Bill Smith <wsmith@unicon.net>
Date: Tue, 10 Sep 2019 14:51:45 -0700
Subject: [PATCH] SHIBUI-1461

Another attempt at stabilizing some of the intermittently failing tests.

Also, added another parameter so that the tests can be run headless from
a development environment easily. Simply add `-Dwebdriver.headless=true`
to the execution command.
---
 .../admin/ui/SeleniumSIDETest.groovy          |  3 +++
 .../integration/resources/SHIBUI-1334-1.side  | 15 ++++++++----
 .../integration/resources/SHIBUI-1335-2.side  | 23 ++++++++++++++++++-
 .../integration/resources/SHIBUI-1392.side    | 23 ++++++++++++++++++-
 4 files changed, 58 insertions(+), 6 deletions(-)

diff --git a/backend/src/integration/groovy/edu/internet2/tier/shibboleth/admin/ui/SeleniumSIDETest.groovy b/backend/src/integration/groovy/edu/internet2/tier/shibboleth/admin/ui/SeleniumSIDETest.groovy
index a579a0543..d3dc9e3c7 100644
--- a/backend/src/integration/groovy/edu/internet2/tier/shibboleth/admin/ui/SeleniumSIDETest.groovy
+++ b/backend/src/integration/groovy/edu/internet2/tier/shibboleth/admin/ui/SeleniumSIDETest.groovy
@@ -69,6 +69,9 @@ class SeleniumSIDETest extends Specification {
             } else {
                 it.baseurl = "http://localhost:${this.randomPort}"
             }
+            if (System.properties.getProperty('webdriver.headless')) {
+                it.addCliArgs('--headless')
+            }
             it
         }
         def runner = new Runner()
diff --git a/backend/src/integration/resources/SHIBUI-1334-1.side b/backend/src/integration/resources/SHIBUI-1334-1.side
index 0dd5e38c2..0b2bcdfbe 100644
--- a/backend/src/integration/resources/SHIBUI-1334-1.side
+++ b/backend/src/integration/resources/SHIBUI-1334-1.side
@@ -2198,10 +2198,10 @@
     }, {
       "id": "e23ad673-a84c-4c28-a927-8baf21fe1f12",
       "comment": "",
-      "command": "waitForElementEditable",
-      "target": "id=/mdui/displayName",
+      "command": "pause",
+      "target": "5000",
       "targets": [],
-      "value": "10000"
+      "value": ""
     }, {
       "id": "6f422a9d-6c2f-4200-bdd3-411ed44773a3",
       "comment": "",
@@ -2215,6 +2215,13 @@
         ["xpath=//input", "xpath:position"]
       ],
       "value": "Display Name v3"
+    }, {
+      "id": "77bfef92-d0e6-41eb-9cd1-c2ede0cb9144",
+      "comment": "",
+      "command": "pause",
+      "target": "5000",
+      "targets": [],
+      "value": ""
     }, {
       "id": "c2d29077-30c4-45cf-81c9-b5790294e11e",
       "comment": "",
@@ -2310,4 +2317,4 @@
   }],
   "urls": ["http://localhost:10101/"],
   "plugins": []
-}
+}
\ No newline at end of file
diff --git a/backend/src/integration/resources/SHIBUI-1335-2.side b/backend/src/integration/resources/SHIBUI-1335-2.side
index 274619c86..63b48ff43 100644
--- a/backend/src/integration/resources/SHIBUI-1335-2.side
+++ b/backend/src/integration/resources/SHIBUI-1335-2.side
@@ -372,6 +372,13 @@
         ["xpath=//input", "xpath:position"]
       ],
       "value": "Entity Attributes"
+    }, {
+      "id": "36dac228-9203-4f2e-a623-db41ef8c019f",
+      "comment": "",
+      "command": "pause",
+      "target": "5000",
+      "targets": [],
+      "value": ""
     }, {
       "id": "f2c07797-07f6-4325-8c5f-57a676dc982c",
       "comment": "",
@@ -385,6 +392,13 @@
         ["xpath=//button[contains(.,'Entity ID')]", "xpath:innerText"]
       ],
       "value": ""
+    }, {
+      "id": "1c424cfa-8201-40df-b8ed-ddec065dfd66",
+      "comment": "",
+      "command": "pause",
+      "target": "5000",
+      "targets": [],
+      "value": ""
     }, {
       "id": "bca61e15-7c13-4007-8c90-1a667bbef67d",
       "comment": "",
@@ -399,6 +413,13 @@
         ["xpath=//a[contains(.,'Regex')]", "xpath:innerText"]
       ],
       "value": ""
+    }, {
+      "id": "98f6eea0-36ff-449c-b042-98b87f0d3a70",
+      "comment": "",
+      "command": "pause",
+      "target": "5000",
+      "targets": [],
+      "value": ""
     }, {
       "id": "e0c65de5-d74a-4d87-aca0-9e9f4b37fb36",
       "comment": "",
@@ -746,4 +767,4 @@
   }],
   "urls": ["http://localhost:10101/"],
   "plugins": []
-}
+}
\ No newline at end of file
diff --git a/backend/src/integration/resources/SHIBUI-1392.side b/backend/src/integration/resources/SHIBUI-1392.side
index 15edbf6fb..20cb9c8ee 100644
--- a/backend/src/integration/resources/SHIBUI-1392.side
+++ b/backend/src/integration/resources/SHIBUI-1392.side
@@ -322,6 +322,13 @@
         ["xpath=//input", "xpath:position"]
       ],
       "value": "Filter with Script"
+    }, {
+      "id": "493b9b4a-3e87-4cc5-be70-1a93d6d0d8b7",
+      "comment": "",
+      "command": "pause",
+      "target": "3000",
+      "targets": [],
+      "value": ""
     }, {
       "id": "c92e936c-d516-472f-9f28-36de89117e14",
       "comment": "",
@@ -335,6 +342,13 @@
         ["xpath=//button[contains(.,'Entity ID')]", "xpath:innerText"]
       ],
       "value": ""
+    }, {
+      "id": "cf3440dc-09b5-4b14-91e6-b7f038b07a97",
+      "comment": "",
+      "command": "pause",
+      "target": "3000",
+      "targets": [],
+      "value": ""
     }, {
       "id": "5699a5a2-d3df-4f99-b95d-f340f9156ffe",
       "comment": "",
@@ -349,6 +363,13 @@
         ["xpath=//a[contains(.,'Script')]", "xpath:innerText"]
       ],
       "value": ""
+    }, {
+      "id": "4de0d8ce-74d5-4413-a9e8-73237a906bbd",
+      "comment": "",
+      "command": "pause",
+      "target": "3000",
+      "targets": [],
+      "value": ""
     }, {
       "id": "786cd3cb-46b2-4361-b449-8f679ff97135",
       "comment": "",
@@ -476,4 +497,4 @@
   }],
   "urls": ["http://localhost:10101/"],
   "plugins": []
-}
+}
\ No newline at end of file