From 3c0caec19d361e9d93d744094b85f9f11135486d Mon Sep 17 00:00:00 2001 From: Sergio Bertolin Date: Tue, 9 May 2017 16:11:03 +0000 Subject: [PATCH] Maintenance tests now live in their own feature --- .../features/bootstrap/CommandLineContext.php | 2 +- .../features/maintenance-mode.feature | 16 ++++++++++++++++ .../features/webdav-related-new-endpoint.feature | 7 ------- .../features/webdav-related-old-endpoint.feature | 5 ----- 4 files changed, 17 insertions(+), 13 deletions(-) create mode 100644 tests/integration/features/maintenance-mode.feature diff --git a/tests/integration/features/bootstrap/CommandLineContext.php b/tests/integration/features/bootstrap/CommandLineContext.php index 8896af439c54..ab0a9bc4240c 100644 --- a/tests/integration/features/bootstrap/CommandLineContext.php +++ b/tests/integration/features/bootstrap/CommandLineContext.php @@ -123,7 +123,7 @@ public function maintenanceModeIs($state) { } /** - * @AfterScenario + * @AfterScenario @maintenance_mode * * Disables maintenance mode in case it was enabled. */ diff --git a/tests/integration/features/maintenance-mode.feature b/tests/integration/features/maintenance-mode.feature new file mode 100644 index 000000000000..ad323ad2befd --- /dev/null +++ b/tests/integration/features/maintenance-mode.feature @@ -0,0 +1,16 @@ +Feature: maintenance-mode + Background: + Given using api version "1" + And maintenance mode is enabled + + @maintenance_mode + Scenario: Maintenance mode new dav path + Given using new dav path + When Connecting to dav endpoint as user "admin" + Then the HTTP status code should be "503" + + @maintenance_mode + Scenario: Maintenance mode old dav path + Given using old dav path + When Connecting to dav endpoint as user "admin" + Then the HTTP status code should be "503" diff --git a/tests/integration/features/webdav-related-new-endpoint.feature b/tests/integration/features/webdav-related-new-endpoint.feature index c3a696205802..d7dd4703305c 100644 --- a/tests/integration/features/webdav-related-new-endpoint.feature +++ b/tests/integration/features/webdav-related-new-endpoint.feature @@ -543,10 +543,3 @@ Feature: webdav-related-new-endpoint And user "user0" uploads new chunk file "3" with "CCCCC" to id "chunking-42" When user "user0" moves new chunk file with id "chunking-42" to "/existingFile.txt" Then User "user0" checks id of file "/existingFile.txt" - - Scenario: Maintenance mode - Given using new dav path - And maintenance mode is enabled - When Connecting to dav endpoint as user "admin" - Then the HTTP status code should be "503" - diff --git a/tests/integration/features/webdav-related-old-endpoint.feature b/tests/integration/features/webdav-related-old-endpoint.feature index 1b85cb310dad..7d74121ca9e7 100644 --- a/tests/integration/features/webdav-related-old-endpoint.feature +++ b/tests/integration/features/webdav-related-old-endpoint.feature @@ -487,8 +487,3 @@ Feature: webdav-related-old-endpoint And Downloading file "/myChunkedFile.txt" Then Downloaded content should be "AAAAABBBBBCCCCC" - Scenario: Maintenance mode - Given maintenance mode is enabled - When Connecting to dav endpoint as user "admin" - Then the HTTP status code should be "503" -