enable tags e2e tests

owncloud · Dec 27, 2022 · 0492117 · 0492117
1 parent c2ec30b
commit 0492117
Show file tree

Hide file tree

Showing 3 changed files with 89 additions and 83 deletions.
diff --git a/changelog/unreleased/enhancement-tags-support b/changelog/unreleased/enhancement-tags-support
@@ -7,4 +7,6 @@ https://github.com/owncloud/web/pull/7385
 https://github.com/owncloud/web/pull/7442
 https://github.com/owncloud/web/pull/7754
 https://github.com/owncloud/web/pull/8067
+https://github.com/owncloud/web/pull/8157
 https://github.com/owncloud/web/issues/7134
+https://github.com/owncloud/web/issues/8149
diff --git a/packages/web-pkg/src/components/sideBar/CompareSaveDialog.vue b/packages/web-pkg/src/components/sideBar/CompareSaveDialog.vue
@@ -6,12 +6,17 @@
     </span>
     <span v-else class="state-indicator">{{ unsavedChangesText }}</span>
     <div>
-      <oc-button :disabled="!unsavedChanges" @click="$emit('revert')">
+      <oc-button
+        :disabled="!unsavedChanges"
+        class="compare-save-dialog-revert-btn"
+        @click="$emit('revert')"
+      >
         <span v-text="$gettext('Revert')" />
       </oc-button>
       <oc-button
         appearance="filled"
         variation="primary"
+        class="compare-save-dialog-confirm-btn"
         :disabled="!unsavedChanges || confirmButtonDisabled"
         @click="$emit('confirm')"
       >

diff --git a/tests/e2e/cucumber/features/smoke/tags.ocis.feature b/tests/e2e/cucumber/features/smoke/tags.ocis.feature
@@ -1,82 +1,81 @@
-# TODO: Enable as soon as oCIS supports tags
-# Feature: Users can use web to organize tags
-#
-#  Background:
-#    Given "Admin" creates following users
-#      | id    |
-#      | Alice |
-#      | Brian |
-#
-#  Scenario: Tag management
-#    When "Alice" logs in
-#    And "Alice" opens the "files" app
-#    And "Alice" uploads the following resource
-#      | resource  |
-#      | lorem.txt |
-#    And "Alice" adds the following tags for the following resources using the sidebar panel
-#      | resource  | tags         |
-#      | lorem.txt | tag 1, tag 2 |
-#    Then the following resources should contain the following tags in the files list for user "Alice"
-#      | resource  | tags         |
-#      | lorem.txt | tag 1, tag 2 |
-#    Then the following resources should contain the following tags in the details panel for user "Alice"
-#      | resource  | tags         |
-#      | lorem.txt | tag 1, tag 2 |
-#    When "Alice" removes the following tags for the following resources using the sidebar panel
-#      | resource  | tags  |
-#      | lorem.txt | tag 1 |
-#    Then the following resources should contain the following tags in the files list for user "Alice"
-#      | resource  | tags  |
-#      | lorem.txt | tag 2 |
-#    Then the following resources should contain the following tags in the details panel for user "Alice"
-#      | resource  | tags  |
-#      | lorem.txt | tag 2 |
-#    And "Alice" logs out
-#
-#
-#  Scenario: Tag search
-#    When "Alice" logs in
-#    And "Alice" opens the "files" app
-#    And "Alice" uploads the following resource
-#      | resource      |
-#      | lorem.txt     |
-#      | textfile.txt  |
-#    And "Alice" adds the following tags for the following resources using the sidebar panel
-#      | resource  | tags         |
-#      | lorem.txt | tag 1, tag 2 |
-#    And "Alice" clicks the tag "tag 1" on the resource "lorem.txt"
-#    Then the following resources should contain the following tags in the files list for user "Alice"
-#      | resource  | tags  |
-#      | lorem.txt | tag 1 |
-#    Then following resources should not be displayed in the files list for user "Alice"
-#      | resource     |
-#      | textfile.txt |
-#    And "Alice" logs out
-#
-#
-#  Scenario: Tag sharing
-#    When "Alice" logs in
-#    And "Alice" opens the "files" app
-#    And "Alice" creates the following resources
-#      | resource         | type   |
-#      | folder_to_shared | folder |
-#    And "Alice" uploads the following resource
-#      | resource  | to               |
-#      | lorem.txt | folder_to_shared |
-#    And "Alice" adds the following tags for the following resources using the sidebar panel
-#      | resource                   | tags         |
-#      | folder_to_shared/lorem.txt | tag 1, tag 2 |
-#    When "Alice" shares the following resource using the sidebar panel
-#      | resource         | recipient | type | role   |
-#      | folder_to_shared | Brian     | user | editor |
-#    And "Alice" logs out
-#
-#    And "Brian" logs in
-#    And "Brian" navigates to the shared with me page
-#    And "Brian" accepts the following share
-#      | name                 |
-#      | folder_to_shared     |
-#    Then the following resources should contain the following tags in the files list for user "Brian"
-#      | resource                   | tags         |
-#      | folder_to_shared/lorem.txt | tag 1, tag 2 |
-#    And "Brian" logs out
+Feature: Users can use web to organize tags
+
+  Background:
+    Given "Admin" creates following users
+      | id    |
+      | Alice |
+      | Brian |
+
+  Scenario: Tag management
+    When "Alice" logs in
+    And "Alice" opens the "files" app
+    And "Alice" uploads the following resource
+      | resource  |
+      | lorem.txt |
+    And "Alice" adds the following tags for the following resources using the sidebar panel
+      | resource  | tags         |
+      | lorem.txt | tag 1, tag 2 |
+    Then the following resources should contain the following tags in the files list for user "Alice"
+      | resource  | tags         |
+      | lorem.txt | tag 1, tag 2 |
+    Then the following resources should contain the following tags in the details panel for user "Alice"
+      | resource  | tags         |
+      | lorem.txt | tag 1, tag 2 |
+    When "Alice" removes the following tags for the following resources using the sidebar panel
+      | resource  | tags  |
+      | lorem.txt | tag 1 |
+    Then the following resources should contain the following tags in the files list for user "Alice"
+      | resource  | tags  |
+      | lorem.txt | tag 2 |
+    Then the following resources should contain the following tags in the details panel for user "Alice"
+      | resource  | tags  |
+      | lorem.txt | tag 2 |
+    And "Alice" logs out
+
+
+  Scenario: Tag search
+    When "Alice" logs in
+    And "Alice" opens the "files" app
+    And "Alice" uploads the following resource
+      | resource      |
+      | lorem.txt     |
+      | textfile.txt  |
+    And "Alice" adds the following tags for the following resources using the sidebar panel
+      | resource  | tags         |
+      | lorem.txt | tag 1, tag 2 |
+    And "Alice" clicks the tag "tag 1" on the resource "lorem.txt"
+    Then the following resources should contain the following tags in the files list for user "Alice"
+      | resource  | tags  |
+      | lorem.txt | tag 1 |
+    Then following resources should not be displayed in the files list for user "Alice"
+      | resource     |
+      | textfile.txt |
+    And "Alice" logs out
+
+
+  Scenario: Tag sharing
+    When "Alice" logs in
+    And "Alice" opens the "files" app
+    And "Alice" creates the following resources
+      | resource         | type   |
+      | folder_to_shared | folder |
+    And "Alice" uploads the following resource
+      | resource  | to               |
+      | lorem.txt | folder_to_shared |
+    And "Alice" adds the following tags for the following resources using the sidebar panel
+      | resource                   | tags         |
+      | folder_to_shared/lorem.txt | tag 1, tag 2 |
+    When "Alice" shares the following resource using the sidebar panel
+      | resource         | recipient | type | role   |
+      | folder_to_shared | Brian     | user | editor |
+    And "Alice" logs out
+
+    And "Brian" logs in
+    And "Brian" navigates to the shared with me page
+    And "Brian" accepts the following share
+      | name                 |
+      | folder_to_shared     |
+    Then the following resources should contain the following tags in the files list for user "Brian"
+      | resource                   | tags         |
+      | folder_to_shared/lorem.txt | tag 1, tag 2 |
+    And "Brian" logs out