From f3157e5c2a60a561be91a5556a986d03d594dbd4 Mon Sep 17 00:00:00 2001 From: Artur Neumann Date: Fri, 18 Aug 2017 15:23:56 +0545 Subject: [PATCH 1/2] UI tests, testing renaming a file/folder into .htaccess --- tests/ui/features/files/renameFiles.feature | 7 +++++++ tests/ui/features/files/renameFolders.feature | 7 +++++++ 2 files changed, 14 insertions(+) diff --git a/tests/ui/features/files/renameFiles.feature b/tests/ui/features/files/renameFiles.feature index 84ea36d45ddb..d934e635da25 100644 --- a/tests/ui/features/files/renameFiles.feature +++ b/tests/ui/features/files/renameFiles.feature @@ -45,6 +45,13 @@ Feature: renameFiles |Could not rename "data.zip"| And the file "data.zip" should be listed + Scenario: Rename a file to a forbidden name + When I rename the file "data.zip" to one of these names + |.htaccess | + Then notifications should be displayed with the text + |Could not rename "data.zip"| + And the file "data.zip" should be listed + Scenario: Rename a file putting a name of a file which already exists When I rename the file "data.zip" to "lorem.txt" Then near the file "data.zip" a tooltip with the text 'lorem.txt already exists' should be displayed diff --git a/tests/ui/features/files/renameFolders.feature b/tests/ui/features/files/renameFolders.feature index 4a6f1c0fb762..0c52518532a9 100644 --- a/tests/ui/features/files/renameFolders.feature +++ b/tests/ui/features/files/renameFolders.feature @@ -44,6 +44,13 @@ Feature: renameFolders |Could not rename "simple-folder"| And the folder "simple-folder" should be listed + Scenario: Rename a folder to a forbidden name + When I rename the folder "simple-folder" to one of these names + |.htaccess | + Then notifications should be displayed with the text + |Could not rename "simple-folder"| + And the folder "simple-folder" should be listed + Scenario: Rename a folder putting a name of a file which already exists When I rename the folder "simple-folder" to "lorem.txt" Then near the folder "simple-folder" a tooltip with the text 'lorem.txt already exists' should be displayed From eb1b4e533b33d448ba42035ffebba7835b2b4e2a Mon Sep 17 00:00:00 2001 From: Artur Neumann Date: Fri, 18 Aug 2017 15:35:35 +0545 Subject: [PATCH 2/2] delete duplication --- tests/ui/features/files/renameFiles.feature | 2 -- tests/ui/features/files/renameFolders.feature | 2 -- 2 files changed, 4 deletions(-) diff --git a/tests/ui/features/files/renameFiles.feature b/tests/ui/features/files/renameFiles.feature index d934e635da25..4f160080fc48 100644 --- a/tests/ui/features/files/renameFiles.feature +++ b/tests/ui/features/files/renameFiles.feature @@ -36,13 +36,11 @@ Feature: renameFiles Scenario: Rename a file using forbidden characters When I rename the file "data.zip" to one of these names - |.htaccess | |lorem\txt | |\\.txt | Then notifications should be displayed with the text |Could not rename "data.zip"| |Could not rename "data.zip"| - |Could not rename "data.zip"| And the file "data.zip" should be listed Scenario: Rename a file to a forbidden name diff --git a/tests/ui/features/files/renameFolders.feature b/tests/ui/features/files/renameFolders.feature index 0c52518532a9..1e5fda6e20d7 100644 --- a/tests/ui/features/files/renameFolders.feature +++ b/tests/ui/features/files/renameFolders.feature @@ -35,13 +35,11 @@ Feature: renameFolders Scenario: Rename a folder using forbidden characters When I rename the folder "simple-folder" to one of these names - |.htaccess | |simple\folder | |\\simple-folder | Then notifications should be displayed with the text |Could not rename "simple-folder"| |Could not rename "simple-folder"| - |Could not rename "simple-folder"| And the folder "simple-folder" should be listed Scenario: Rename a folder to a forbidden name