seperate steps used to check file/folder listed in trashbin

owncloud · Feb 18, 2020 · fb6fd97 · fb6fd97
1 parent 1801537
commit fb6fd97
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 17 deletions.
diff --git a/tests/acceptance/features/webUICreateFilesFolders/createFolderEdgeCases.feature b/tests/acceptance/features/webUICreateFilesFolders/createFolderEdgeCases.feature
@@ -8,13 +8,6 @@ Feature: create folder
     And user "user1" has logged in using the webUI
     And the user has browsed to the files page
 
-  Scenario: Create a folder using special characters
-    When the user creates a folder with the name '"somequotes1"' using the webUI
-    Then folder '"somequotes1"' should be listed on the webUI
-    When the user reloads the current page of the webUI
-    Then folder '"somequotes1"' should be listed on the webUI
-
-
   Scenario Outline: Create a folder using special characters
     When the user creates a folder with the name <folder_name> using the webUI
     Then folder <folder_name> should be listed on the webUI

diff --git a/tests/acceptance/features/webUITrashbin/trashbinRestore.feature b/tests/acceptance/features/webUITrashbin/trashbinRestore.feature
@@ -128,11 +128,11 @@ Feature: Restore deleted files/folders
     When the user browses to the trashbin page
     And the user restores file "lorem.txt" from the trashbin using the webUI
     Then the success message "lorem.txt was restored successfully" should be displayed on the webUI
-    And file "lorem.txt" should not be listed on the webUI
-    And folder "lorem.txt" should be listed on the webUI
+    And "file" "lorem.txt" should not be listed on the webUI
+    And "folder" "lorem.txt" should be listed on the webUI
     When the user browses to the files page using the webUI
-    Then file "lorem.txt" should be listed on the webUI
-    And folder "lorem.txt" should not be listed on the webUI
+    Then "file" "lorem.txt" should be listed on the webUI
+    And "folder" "lorem.txt" should not be listed on the webUI
 
   Scenario: Delete and restore a folder that has the same name like a deleted file
     Given the user has created file "lorem.txt"
@@ -146,8 +146,8 @@ Feature: Restore deleted files/folders
     When the user browses to the trashbin page
     And the user restores folder "lorem.txt" from the trashbin using the webUI
     Then the success message "lorem.txt was restored successfully" should be displayed on the webUI
-    And folder "lorem.txt" should not be listed on the webUI
-    And file "lorem.txt" should be listed on the webUI
+    And "folder" "lorem.txt" should not be listed on the webUI
+    And "file" "lorem.txt" should be listed on the webUI
     When the user browses to the files page using the webUI
-    Then folder "lorem.txt" should be listed on the webUI
-    And file "lorem.txt" should not be listed on the webUI
+    Then "folder" "lorem.txt" should be listed on the webUI
+    And "file" "lorem.txt" should not be listed on the webUI
diff --git a/tests/acceptance/pageObjects/FilesPageElement/filesList.js b/tests/acceptance/pageObjects/FilesPageElement/filesList.js
@@ -391,6 +391,7 @@ module.exports = {
      */
     waitForFileVisible: async function (fileName, elementType = 'file') {
       const linkSelector = this.getFileLinkSelectorByFileName(fileName, elementType)
+
       await this.waitForElementPresent('@filesTableContainer')
       await this.filesListScrollToTop()
       await this.findItemInFilesList(fileName)

diff --git a/tests/acceptance/stepDefinitions/filesContext.js b/tests/acceptance/stepDefinitions/filesContext.js
@@ -340,7 +340,14 @@ Then('there should be no files/folders/resources listed on the webUI', async fun
   assert.ok(allRowsResult.value.length === 0, `No resources are listed, ${allRowsResult.length} found`)
 })
 
-Then(/^(file|folder) ("([^"]*)"|'([^"]*)') should be listed on the webUI$/, (elementType, folder) => {
+Then('file/folder {string} should be listed on the webUI', function (folder) {
+  return client
+    .page
+    .FilesPageElement.filesList()
+    .waitForFileVisible(folder)
+})
+
+Then('{string} {string} should be listed on the webUI', (elementType, folder) => {
   return client
     .page
     .FilesPageElement.filesList()
@@ -364,7 +371,14 @@ Then('the last uploaded folder should be listed on the webUI', async function ()
   return client
 })
 
-Then(/^(file|folder) "([^"]*)" should not be listed on the webUI$/, async (elementType, folder) => {
+Then('file/folder {string} should not be listed on the webUI', async function (folder) {
+  const state = await client.page.FilesPageElement.filesList().isElementListed(folder)
+  return client.assert.ok(
+    !state, `Error: Resource ${folder} is listed on the filesList`
+  )
+})
+
+Then('{string} {string} should not be listed on the webUI', async (elementType, folder) => {
   const state = await client.page.FilesPageElement.filesList().isElementListed(folder, elementType)
   return client.assert.ok(
     !state, `Error: Resource ${folder} is listed on the filesList`