Merge pull request #12104 from nextcloud/move-acceptance-tests-that-crash-the-php-built-in-server-to-apache

Move acceptance tests that crash the PHP built-in server to Apache

7 files changed, 132 insertions, 92 deletions

diff --git a/.drone.yml b/.drone.yml
index 2ceccc4de9a..98576332c9d 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -703,6 +703,13 @@ pipeline:
       when:
         matrix:
           TESTS-ACCEPTANCE: app-files
+  acceptance-app-files-tags:
+      image: nextcloudci/acceptance-php7.1:acceptance-php7.1-2
+      commands:
+        - tests/acceptance/run-local.sh --timeout-multiplier 10 --nextcloud-server-domain acceptance-app-files-tags --selenium-server selenium:4444 allow-git-repository-modifications features/app-files-tags.feature
+      when:
+        matrix:
+          TESTS-ACCEPTANCE: app-files-tags
   acceptance-app-theming:
       image: nextcloudci/acceptance-php7.1:acceptance-php7.1-2
       commands:
@@ -951,6 +958,8 @@ matrix:
     - TESTS: acceptance
       TESTS-ACCEPTANCE: app-files
     - TESTS: acceptance
+      TESTS-ACCEPTANCE: app-files-tags
+    - TESTS: acceptance
       TESTS-ACCEPTANCE: app-theming
     - TESTS: acceptance
       TESTS-ACCEPTANCE: header
diff --git a/tests/acceptance/config/behat.yml b/tests/acceptance/config/behat.yml
index e1248e18a81..d1489a00864 100644
--- a/tests/acceptance/config/behat.yml
+++ b/tests/acceptance/config/behat.yml
@@ -23,6 +23,34 @@ default:
         - SettingsMenuContext
         - ThemingAppContext
         - UsersSettingsContext
+      filters:
+        tags: "~@apache"
+    apache:
+      paths:
+        - %paths.base%/../features
+      contexts:
+        - ActorContext
+        - NextcloudTestServerContext:
+            nextcloudTestServerHelper: NextcloudTestServerLocalApacheHelper
+
+        - AppNavigationContext
+        - AppSettingsContext
+        - AppsManagementContext
+        - CommentsAppContext
+        - ContactsMenuContext
+        - DialogContext
+        - FeatureContext
+        - FileListContext
+        - FilesAppContext
+        - FilesSharingAppContext
+        - LoginPageContext
+        - NotificationContext
+        - SettingsContext
+        - SettingsMenuContext
+        - ThemingAppContext
+        - UsersSettingsContext
+      filters:
+        tags: "@apache"
   extensions:
     Behat\MinkExtension:
       sessions:
diff --git a/tests/acceptance/features/app-files-tags.feature b/tests/acceptance/features/app-files-tags.feature
new file mode 100644
index 00000000000..3da24b7e1c2
--- /dev/null
+++ b/tests/acceptance/features/app-files-tags.feature
@@ -0,0 +1,90 @@
+@apache
+Feature: app-files-tags
+
+  Scenario: show the input field for tags in the details view
+    Given I am logged in
+    And I open the details view for "welcome.txt"
+    And I see that the details view is open
+    When I open the input field for tags in the details view
+    Then I see that the input field for tags in the details view is shown
+
+  Scenario: show the input field for tags in the details view after the sharing tab has loaded
+    Given I am logged in
+    And I open the details view for "welcome.txt"
+   And I see that the details view is open
+    And I open the "Sharing" tab in the details view
+    And I see that the "Sharing" tab in the details view is eventually loaded
+    When I open the input field for tags in the details view
+    Then I see that the input field for tags in the details view is shown
+
+  Scenario: create tags using the Administration settings
+    Given I am logged in as the admin
+    And I visit the settings page
+    And I open the "Workflow" section
+    # The "create" button does nothing before JavaScript was initialized, and
+    # the only way to detect that is waiting for the button to select tags to be
+    # shown.
+    And I see that the button to select tags is shown
+    When I create the tag "tag1" in the settings
+    Then I see that the dropdown for tags in the settings eventually contains the tag "tag1"
+
+  Scenario: add tags using the dropdown in the details view
+    Given I am logged in as the admin
+    And I visit the settings page
+    And I open the "Workflow" section
+    # The "create" button does nothing before JavaScript was initialized, and
+    # the only way to detect that is waiting for the button to select tags to be
+    # shown.
+    And I see that the button to select tags is shown
+    And I create the tag "tag1" in the settings
+    And I create the tag "tag2" in the settings
+    And I create the tag "tag3" in the settings
+    And I create the tag "tag4" in the settings
+    And I see that the dropdown for tags in the settings eventually contains the tag "tag1"
+    And I see that the dropdown for tags in the settings eventually contains the tag "tag2"
+    And I see that the dropdown for tags in the settings eventually contains the tag "tag3"
+    And I see that the dropdown for tags in the settings eventually contains the tag "tag4"
+    And I log out
+    And I am logged in
+    And I open the details view for "welcome.txt"
+    And I open the input field for tags in the details view
+    # When the input field is opened the dropdown is also opened automatically.
+    When I check the tag "tag2" in the dropdown for tags in the details view
+    And I check the tag "tag4" in the dropdown for tags in the details view
+    Then I see that the tag "tag2" in the dropdown for tags in the details view is checked
+    And I see that the tag "tag4" in the dropdown for tags in the details view is checked
+    And I see that the input field for tags in the details view contains the tag "tag2"
+    And I see that the input field for tags in the details view contains the tag "tag4"
+
+  Scenario: remove tags using the dropdown in the details view
+    Given I am logged in as the admin
+    And I visit the settings page
+    And I open the "Workflow" section
+    # The "create" button does nothing before JavaScript was initialized, and
+    # the only way to detect that is waiting for the button to select tags to be
+    # shown.
+    And I see that the button to select tags is shown
+    And I create the tag "tag1" in the settings
+    And I create the tag "tag2" in the settings
+    And I create the tag "tag3" in the settings
+    And I create the tag "tag4" in the settings
+    And I see that the dropdown for tags in the settings eventually contains the tag "tag1"
+    And I see that the dropdown for tags in the settings eventually contains the tag "tag2"
+    And I see that the dropdown for tags in the settings eventually contains the tag "tag3"
+    And I see that the dropdown for tags in the settings eventually contains the tag "tag4"
+    And I log out
+    And I am logged in
+    And I open the details view for "welcome.txt"
+    And I open the input field for tags in the details view
+    # When the input field is opened the dropdown is also opened automatically.
+    And I check the tag "tag2" in the dropdown for tags in the details view
+    And I check the tag "tag4" in the dropdown for tags in the details view
+    And I check the tag "tag3" in the dropdown for tags in the details view
+    When I uncheck the tag "tag2" in the dropdown for tags in the details view
+    And I uncheck the tag "tag4" in the dropdown for tags in the details view
+    Then I see that the tag "tag2" in the dropdown for tags in the details view is not checked
+    And I see that the tag "tag4" in the dropdown for tags in the details view is not checked
+    And I see that the tag "tag3" in the dropdown for tags in the details view is checked
+    And I see that the input field for tags in the details view does not contain the tag "tag2"
+    And I see that the input field for tags in the details view does not contain the tag "tag4"
+    And I see that the input field for tags in the details view contains the tag "tag3"
diff --git a/tests/acceptance/features/app-files.feature b/tests/acceptance/features/app-files.feature
index 3bded3fef11..74490180ad3 100644
--- a/tests/acceptance/features/app-files.feature
+++ b/tests/acceptance/features/app-files.feature
@@ -228,94 +228,6 @@ Feature: app-files
     # download starts no page redirection
     And I see that the current page is the Authenticate page for the direct download shared link I wrote down
 
-  Scenario: show the input field for tags in the details view
-    Given I am logged in
-    And I open the details view for "welcome.txt"
-    And I see that the details view is open
-    When I open the input field for tags in the details view
-    Then I see that the input field for tags in the details view is shown
-
-  Scenario: show the input field for tags in the details view after the sharing tab has loaded
-    Given I am logged in
-    And I open the details view for "welcome.txt"
-   And I see that the details view is open
-    And I open the "Sharing" tab in the details view
-    And I see that the "Sharing" tab in the details view is eventually loaded
-    When I open the input field for tags in the details view
-    Then I see that the input field for tags in the details view is shown
-
-  Scenario: create tags using the Administration settings
-    Given I am logged in as the admin
-    And I visit the settings page
-    And I open the "Workflow" section
-    # The "create" button does nothing before JavaScript was initialized, and
-    # the only way to detect that is waiting for the button to select tags to be
-    # shown.
-    And I see that the button to select tags is shown
-    When I create the tag "tag1" in the settings
-    Then I see that the dropdown for tags in the settings eventually contains the tag "tag1"
-
-  Scenario: add tags using the dropdown in the details view
-    Given I am logged in as the admin
-    And I visit the settings page
-    And I open the "Workflow" section
-    # The "create" button does nothing before JavaScript was initialized, and
-    # the only way to detect that is waiting for the button to select tags to be
-    # shown.
-    And I see that the button to select tags is shown
-    And I create the tag "tag1" in the settings
-    And I create the tag "tag2" in the settings
-    And I create the tag "tag3" in the settings
-    And I create the tag "tag4" in the settings
-    And I see that the dropdown for tags in the settings eventually contains the tag "tag1"
-    And I see that the dropdown for tags in the settings eventually contains the tag "tag2"
-    And I see that the dropdown for tags in the settings eventually contains the tag "tag3"
-    And I see that the dropdown for tags in the settings eventually contains the tag "tag4"
-    And I log out
-    And I am logged in
-    And I open the details view for "welcome.txt"
-    And I open the input field for tags in the details view
-    # When the input field is opened the dropdown is also opened automatically.
-    When I check the tag "tag2" in the dropdown for tags in the details view
-    And I check the tag "tag4" in the dropdown for tags in the details view
-    Then I see that the tag "tag2" in the dropdown for tags in the details view is checked
-    And I see that the tag "tag4" in the dropdown for tags in the details view is checked
-    And I see that the input field for tags in the details view contains the tag "tag2"
-    And I see that the input field for tags in the details view contains the tag "tag4"
-
-  Scenario: remove tags using the dropdown in the details view
-    Given I am logged in as the admin
-    And I visit the settings page
-    And I open the "Workflow" section
-    # The "create" button does nothing before JavaScript was initialized, and
-    # the only way to detect that is waiting for the button to select tags to be
-    # shown.
-    And I see that the button to select tags is shown
-    And I create the tag "tag1" in the settings
-    And I create the tag "tag2" in the settings
-    And I create the tag "tag3" in the settings
-    And I create the tag "tag4" in the settings
-    And I see that the dropdown for tags in the settings eventually contains the tag "tag1"
-    And I see that the dropdown for tags in the settings eventually contains the tag "tag2"
-    And I see that the dropdown for tags in the settings eventually contains the tag "tag3"
-    And I see that the dropdown for tags in the settings eventually contains the tag "tag4"
-    And I log out
-    And I am logged in
-    And I open the details view for "welcome.txt"
-    And I open the input field for tags in the details view
-    # When the input field is opened the dropdown is also opened automatically.
-    And I check the tag "tag2" in the dropdown for tags in the details view
-    And I check the tag "tag4" in the dropdown for tags in the details view
-    And I check the tag "tag3" in the dropdown for tags in the details view
-    When I uncheck the tag "tag2" in the dropdown for tags in the details view
-    And I uncheck the tag "tag4" in the dropdown for tags in the details view
-    Then I see that the tag "tag2" in the dropdown for tags in the details view is not checked
-    And I see that the tag "tag4" in the dropdown for tags in the details view is not checked
-    And I see that the tag "tag3" in the dropdown for tags in the details view is checked
-    And I see that the input field for tags in the details view does not contain the tag "tag2"
-    And I see that the input field for tags in the details view does not contain the tag "tag4"
-    And I see that the input field for tags in the details view contains the tag "tag3"
-
   Scenario: marking a file as favorite causes the file list to be sorted again
     Given I am logged in
     And I create a new folder named "A name alphabetically lower than welcome.txt"
diff --git a/tests/acceptance/features/app-theming.feature b/tests/acceptance/features/app-theming.feature
index 268b9a04a2f..01c7d8df8dd 100644
--- a/tests/acceptance/features/app-theming.feature
+++ b/tests/acceptance/features/app-theming.feature
@@ -1,3 +1,4 @@
+@apache
 Feature: app-theming
 
   Scenario: changing the color updates the header color
diff --git a/tests/acceptance/run-local.sh b/tests/acceptance/run-local.sh
index 7ae6705000c..548e9e9ceae 100755
--- a/tests/acceptance/run-local.sh
+++ b/tests/acceptance/run-local.sh
@@ -189,6 +189,10 @@ composer install
 
 cd ../../
 
+# Link the default Apache directory to the root directory of the Nextcloud
+# server to make possible to run the Nextcloud server on Apache if needed.
+ln --symbolic $(pwd) /var/www/html
+
 INSTALL_AND_CONFIGURE_SERVER_PARAMETERS=""
 if [ "$NEXTCLOUD_SERVER_DOMAIN" != "$DEFAULT_NEXTCLOUD_SERVER_DOMAIN" ]; then
 	INSTALL_AND_CONFIGURE_SERVER_PARAMETERS+="--nextcloud-server-domain $NEXTCLOUD_SERVER_DOMAIN"
diff --git a/tests/acceptance/run.sh b/tests/acceptance/run.sh
index 3ed1207e379..366e7a67bf5 100755
--- a/tests/acceptance/run.sh
+++ b/tests/acceptance/run.sh
@@ -153,10 +153,6 @@ function prepareDocker() {
 	docker exec $NEXTCLOUD_LOCAL_CONTAINER mkdir /nextcloud
 	docker cp - $NEXTCLOUD_LOCAL_CONTAINER:/nextcloud/ < "$NEXTCLOUD_LOCAL_TAR"
 
-	# Link the default Apache directory to the root directory of the Nextcloud
-	# server to make possible to run the Nextcloud server on Apache if needed.
-	docker exec $NEXTCLOUD_LOCAL_CONTAINER ln --symbolic /nextcloud /var/www/html
-
 	# run-local.sh expects a Git repository to be available in the root of the
 	# Nextcloud server, but it was excluded when the Git working directory was
 	# copied to the container to avoid copying the large and unneeded history of