Bug 1415247: Adding behat step to confirm file deletion

Change-Id: Iaee6116f6220227325d5ead4ec548a8f8df26797
Signed-off-by: Robert Lyon <robertl@catalyst.net.nz>

htdocs/testing/frameworks/behat/classes/BehatGeneral.php

@@ -441,7 +441,7 @@ class BehatGeneral extends BehatBase {
         $xpath = "//div[contains(concat(' ', normalize-space(@class), ' '), concat(' ', 'list-group-item', ' '))" .
             " and contains(normalize-space(.), " . $rowtextliteral . ")]//button[starts-with(@id, 'delete_')]" .
             "|" .
-            "//tr[contains(normalize-space(.), " . $rowtextliteral . ")]//button[starts-with(@id, 'delete_')]";
+            "//tr[contains(normalize-space(.), " . $rowtextliteral . ")]//button[starts-with(@id, 'delete_') or starts-with(@name, 'files_filebrowser_delete')]";
         $deletenode = $this->find('xpath', $xpath, $exception);
 
         $this->ensure_node_is_visible($deletenode);

test/behat/features/artefact/collections/adding_pages_collection.feature

@@ -25,6 +25,7 @@ Scenario: Creating a collection AND adding pages
     # Adding page 1, 2 & 3 to the collection
     And I press "Next: Edit collection pages"
     And I follow "All"
+    And I wait "1" seconds
     Then I press "Add pages"
     # Verifying that the pages were added
     And I should see "Testing page 1"

test/behat/features/artefact/collections/files_add_edit.feature

@@ -35,6 +35,9 @@ Scenario: Creating sub folder and attaching files (Bug 1426983)
     And I attach the file "Image3.png" to "File"
     # Confirming upload was successful
     And I should see "Upload of Image3.png to Subfolder2 complete"
+    # Confirming deletion of upload
+    And I delete the "Image3.png" row
+    And I should see "Image Image3.png deleted"
     # Verifying you can move from subfolder2 to Home
     And I follow "Home"
     # Verifying all 2 folders are still there