Merge pull request #3765 from owncloud/mergeSimilarscenarios

[Tests-Only]Merge similar scenarios after the issue is solved and skip tags are removed
owncloud · Jul 13, 2020 · 604e8b5 · 604e8b5
2 parents 18852c1 + 33aaeee
commit 604e8b5
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 48 deletions.
diff --git a/tests/acceptance/features/webUICreateFilesFolders/createFolderEdgeCases.feature b/tests/acceptance/features/webUICreateFilesFolders/createFolderEdgeCases.feature
@@ -22,15 +22,6 @@ Feature: create folder
       | "+-{$(882)"                |
       | "home"                     |
       | "Sample,Folder,With,Comma" |
-
-  # Merge with the scenario above once the issue is resolved
-  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
-    When the user reloads the current page of the webUI
-    Then folder <folder_name> should be listed on the webUI
-    Examples:
-      | folder_name              |
       | 'सिमप्ले फोल्देर $%#?&@' |
 
   @issue-2467 @ocis-reva-issue-106

diff --git a/tests/acceptance/features/webUIRenameFiles/renameFiles.feature b/tests/acceptance/features/webUIRenameFiles/renameFiles.feature
@@ -20,28 +20,8 @@ Feature: rename files
       | '"quotes1"'            |
       | "\"quote\"d-folders'"  |
       | "'quotes2'"            |
-
-  # Merge with scenario above once the issue is resolved
-  @smokeTest
-  Scenario Outline: Rename a file
-    When the user renames file "lorem.txt" to <to_file_name> using the webUI
-    Then file <to_file_name> should be listed on the webUI
-    When the user reloads the current page of the webUI
-    Then file <to_file_name> should be listed on the webUI
-    Examples:
-      | to_file_name           |
       | "लोरेम।तयक्स्त? $%#&@" |
 
-  Scenario Outline: Rename a file that has special characters in its name
-    When the user renames file <from_name> to <to_name> using the webUI
-    Then file <to_name> should be listed on the webUI
-    When the user reloads the current page of the webUI
-    Then file <to_name> should be listed on the webUI
-    Examples:
-      | from_name                               | to_name                               |
-      | "'single'quotes.txt"                    | "single-quotes.txt"                   |
-
-  # Merge with scenario above once the issue is resolved
   Scenario Outline: Rename a file that has special characters in its name
     Given the user has created file "sämple,1.txt"
     And the user has reloaded the current page of the webUI
@@ -51,6 +31,7 @@ Feature: rename files
     Then file <to_name> should be listed on the webUI
     Examples:
       | from_name                               | to_name                               |
+      | "'single'quotes.txt"                    | "single-quotes.txt"                   |
       | "strängé filename (duplicate #2 &).txt" | "strängé filename (duplicate #3).txt" |
       | "sämple,1.txt"                          | "file,with,commä,.txt"                |
 

diff --git a/tests/acceptance/features/webUIRenameFolders/renameFolders.feature b/tests/acceptance/features/webUIRenameFolders/renameFolders.feature
@@ -19,27 +19,8 @@ Feature: rename folders
       | '"quotes1"'             |
       | "'quotes2'"             |
       | "home"                  |
-
-  # Merge with scenario above once the issue is resolved
-  Scenario Outline: Rename a folder
-    When the user renames folder "simple-folder" to <to_folder_name> using the webUI
-    Then folder <to_folder_name> should be listed on the webUI
-    When the user reloads the current page of the webUI
-    Then folder <to_folder_name> should be listed on the webUI
-    Examples:
-      | to_folder_name          |
       | 'सिमप्ले फोल्देर$%#?&@'      |
 
-  Scenario Outline: Rename a folder that has special characters in its name
-    When the user renames folder <from_name> to <to_name> using the webUI
-    Then folder <to_name> should be listed on the webUI
-    When the user reloads the current page of the webUI
-    Then folder <to_name> should be listed on the webUI
-    Examples:
-      | from_name               | to_name                     |
-      | "'single'quotes"        | "single-quotes"             |
-
-  # Merge with scenario above once the issue is resolved
   Scenario Outline: Rename a folder that has special characters in its name
     Given the user has created file "Sample,Folder,With,Comma"
     And the user has reloaded the current page of the webUI
@@ -49,6 +30,7 @@ Feature: rename folders
     Then folder <to_name> should be listed on the webUI
     Examples:
       | from_name                  | to_name                     |
+      | "'single'quotes"           | "single-quotes"             |
       | "strängé नेपाली folder"    | "strängé नेपाली folder-#?2" |
       | "Sample,Folder,With,Comma" | "Simple,Folder,With,Commä"  |