Merge pull request #925 from ngageoint/release-ui-584

Submodule hoot-ui 5cd3c45..55974f1:

Author: brianhatchl

hoot-ui

@@ -4,7 +4,6 @@ Feature: Clip Dataset
         Given I am on Hootenanny
         And I resize the window
         And I click Get Started
-
     Scenario: I can open the form with the shortcut
         When I click the "map" at "0","0"
         Then I click the "8" key
@@ -16,7 +15,6 @@ Feature: Clip Dataset
         And I press "Add Layer"
         Then I wait 30 "seconds" to see "DcGisRoadsCucumber"
         Then I change the reference layer color to blue
-
     Scenario: I can change coordinates for clip
         When I press "Tools"
         And I hover over ".tools-clip"
@@ -35,7 +33,7 @@ Feature: Clip Dataset
         And I fill "minlon" with "-77.071161"
         Then I click the "Clip to Bounding Box" link
         And I click the "map" at "100","100"
-        And I click the "map" at "-100","-100"
+        And I click the "map" at "400","400"
         Then I wait 5 "seconds" to see "Enter Coordinates for Clip Bounding Box"
         Then I press "big.loud" span with text "Next"
 
@@ -60,4 +58,3 @@ Feature: Clip Dataset
         And I click the "Delete (1)" context menu item
         And I accept the alert
         Then I wait 30 "seconds" to not see "CucumberClip_BB"
-

test-files/ui/features/clip.feature

@@ -9,17 +9,7 @@ Feature: Conflate and Export OSM API Database Dataset
     And I press "Add Layer"
     Then I wait 30 "seconds" to see "DcTigerRoadsCucumber"
     And I press "Add Secondary Dataset"
-    And I click the "OSM_API_DB_osmapi_test" Dataset
-    And I press "Add Layer"
-    Then I wait 30 "seconds" to see "OSM_API_DB_osmapi_test"
-    Then I wait 30 "seconds" to see "Conflate"
-    And I press "Conflate"
-    And I scroll element into view and press "conflate2"
-    # I couldn't figure out how to do a "wait to see" step def for an alert...if possible, would speed this
-    # and the other ones like it in this file up quite a bit.
-    And I wait 30 seconds
-    Then I should see an alert containing "OSM API database not allowed as secondary layer input"
-    Then I accept the alert
+    And I should not see "OSM_API_DB_osmapi_test"
 
   Scenario: Conflate an OSM API Database Dataset with a Hootenanny Dataset and Export the Conflated Result Back Into the OSM API Database
     Given I am on Hootenanny
@@ -36,7 +26,7 @@ Feature: Conflate and Export OSM API Database Dataset
     Then I wait 30 "seconds" to see "Conflate"
     And I press "Conflate"
     And I scroll element into view and press "conflate2"
-    Then I wait 30 "seconds" to see "Conflating …"
+    Then I wait 60 "seconds" to see "Conflating …"
     Then I wait 3 "minutes" to see "osmapi_test_AllDataTypesBCucumber"
     Then I should see "Complete Review"
     Then I wait 30 "seconds" to see "Reviews remaining:"