combine steps (#10841)

owncloud · Apr 29, 2024 · e487111 · e487111
1 parent 0c02eff
commit e487111
Show file tree

Hide file tree

Showing 18 changed files with 2 additions and 47 deletions.
diff --git a/tests/e2e/cucumber/features/app-provider/lock.feature b/tests/e2e/cucumber/features/app-provider/lock.feature
@@ -22,7 +22,6 @@ Feature: lock
       | test.odt | Brian     | user | Can edit |
 
     And "Brian" logs in
-    And "Brian" opens the "files" app
     And "Brian" navigates to the shared with me page
     When "Brian" opens the following file in Collabora
       | resource |

diff --git a/tests/e2e/cucumber/features/journeys/kindergarten.feature b/tests/e2e/cucumber/features/journeys/kindergarten.feature
@@ -20,7 +20,6 @@ Feature: Kindergarten can use web to organize a day
 
   Scenario: Alice can share this weeks meal plan with all parents
     When "Alice" logs in
-    And "Alice" opens the "files" app
     And "Alice" navigates to the personal space page
     And "Alice" creates the following resources
       | resource                             | type   |
@@ -63,15 +62,13 @@ Feature: Kindergarten can use web to organize a day
       | groups/Teddy Bear Daycare/meal plan/data.zip       | Carol     | user  | Can edit | file         |
     # Then what do we check for to be confident that the above things done by Alice have worked?
     When "Brian" logs in
-    And "Brian" opens the "files" app
     And "Brian" navigates to the shared with me page
     And "Brian" downloads the following resources using the sidebar panel
       | resource | from      | type |
       | data.zip | meal plan | file |
     # Then what do we check for to be confident that the above things done by Brian have worked?
     # Then the downloaded zip should contain... ?
     When "Carol" logs in
-    And "Carol" opens the "files" app
     And "Carol" navigates to the shared with me page
     And "Carol" downloads the following resources using the sidebar panel
       | resource      | from      | type   |

diff --git a/tests/e2e/cucumber/features/search/fullTextSearch.feature b/tests/e2e/cucumber/features/search/fullTextSearch.feature
@@ -15,7 +15,6 @@ Feature: Search
     And "Alice" uploads the following local file into personal space using API
       | localFile                   | to              |
       | filesForUpload/textfile.txt | fileToShare.txt |
-    And "Alice" opens the "files" app
     And "Alice" adds the following tags for the following resources using API
       | resource        | tags      |
       | fileToShare.txt | alice tag |
@@ -42,7 +41,6 @@ Feature: Search
     And "Brian" creates the following file in space "FullTextSearch" using API
       | name                          | content                   |
       | spaceFolder/spaceTextfile.txt | This is test file. Cheers |
-    And "Brian" opens the "files" app
     And "Brian" adds the following tags for the following resources using API
       | resource        | tags  |
       | fileWithTag.txt | tag 1 |

diff --git a/tests/e2e/cucumber/features/search/searchProjectSpace.feature b/tests/e2e/cucumber/features/search/searchProjectSpace.feature
@@ -11,8 +11,6 @@ Feature: Search in the project space
     And "Alice" creates the following project space using API
       | name | id     |
       | team | team.1 |
-    And "Alice" opens the "files" app
-    And "Alice" navigates to the projects space page
     And "Alice" navigates to the project space "team.1"
     And "Alice" creates the following resources
       | resource                   | type   |

diff --git a/tests/e2e/cucumber/features/shares/internalLink.feature b/tests/e2e/cucumber/features/shares/internalLink.feature
@@ -20,7 +20,6 @@ Feature: internal link share
     When "Alice" edits the public link named "Link" of resource "myfolder" changing role to "Invited people"
     And "Brian" opens the public link "Link"
     And "Brian" logs in from the internal link
-    And "Brian" opens the "files" app
     And "Brian" navigates to the shared with me page
     And "Brian" uploads the following resource
       | resource   | to       |

diff --git a/tests/e2e/cucumber/features/shares/share.feature b/tests/e2e/cucumber/features/shares/share.feature
@@ -27,7 +27,6 @@ Feature: share
       | shared_folder      | Brian     | user | Can edit   | folder       |
       | folder_to_shared_2 | Brian     | user | Can edit   | folder       |
 
-    And "Brian" opens the "files" app
     And "Brian" navigates to the shared with me page
     And "Brian" enables the sync for the following shares
       | name               |
@@ -93,7 +92,6 @@ Feature: share
       | simple.pdf       | Brian     | user | Can edit | file         |
       | sharedFile.txt   | Brian     | user | Can edit | file         |
 
-    And "Brian" opens the "files" app
     And "Brian" navigates to the shared with me page
     And "Brian" disables the sync for the following share
       | name           |

diff --git a/tests/e2e/cucumber/features/smoke/createSpaceFromSelection.feature b/tests/e2e/cucumber/features/smoke/createSpaceFromSelection.feature
@@ -19,7 +19,6 @@ Feature: create Space shortcut
       | lorem.txt         | spaceFolder  |
     And "Alice" navigates to the personal space page
     And "Alice" creates space "folderSpace" from folder "spaceFolder" using the context menu
-    And "Alice" navigates to the projects space page
     And "Alice" navigates to the project space "folderSpace"
     Then following resources should be displayed in the files list for user "Alice"
       | resource  |
@@ -48,7 +47,6 @@ Feature: create Space shortcut
       | resource                |
       | resourceFolder          |
       | lorem.txt               |
-    And "Alice" navigates to the projects space page
     And "Alice" navigates to the project space "resourceSpace"
     Then following resources should be displayed in the files list for user "Alice"
       | resource        |

diff --git a/tests/e2e/cucumber/features/smoke/groupActions.feature b/tests/e2e/cucumber/features/smoke/groupActions.feature
@@ -57,7 +57,6 @@ Feature: Group actions
       | sharedFolder | finance   | group | Can edit |
       | sharedFolder | security  | group | Can edit |
 
-    And "Brian" opens the "files" app
     And "Brian" navigates to the shared with me page
 
     And "Brian" enables the sync for all shares using the batch actions

diff --git a/tests/e2e/cucumber/features/smoke/notifications.feature b/tests/e2e/cucumber/features/smoke/notifications.feature
@@ -41,7 +41,6 @@ Feature: Notifications
     When "Alice" removes following sharee
       | resource         | recipient |
       | folder_to_shared | Brian     |
-    And "Alice" navigates to the projects space page
     And "Alice" navigates to the project space "team.1"
     And "Alice" adds following users to the project space
       | user  | role     | kind |

diff --git a/tests/e2e/cucumber/features/smoke/rename.feature b/tests/e2e/cucumber/features/smoke/rename.feature
@@ -15,15 +15,13 @@ Feature: rename
     And "Alice" creates the following files into personal space using API
       | pathToFile         | content      |
       | folder/example.txt | example text |
-    And "Alice" opens the "files" app
     And "Alice" shares the following resource using API
       | resource | recipient | type | role     |
       | folder   | Brian     | user | Can edit |
     And "Alice" creates a public link creates a public link of following resource using the sidebar panel
       | resource | role     | password |
       | folder   | Can edit | %public% |
     And "Brian" logs in
-    And "Brian" opens the "files" app
     And "Brian" navigates to the shared with me page
     And "Brian" opens folder "folder"
 

diff --git a/tests/e2e/cucumber/features/spaces/downloadSpace.feature b/tests/e2e/cucumber/features/spaces/downloadSpace.feature
@@ -21,17 +21,13 @@ Feature: download space
     And "Alice" creates the following file in space "team" using API
       | name                  | content    |
       | spaceFolder/lorem.txt | space team |
-    And "Alice" opens the "files" app
-    And "Alice" navigates to the projects space page
     And "Alice" navigates to the project space "team.1"
     When "Alice" downloads the space "team.1"
     And "Alice" adds following users to the project space
       | user     | role     | kind  |
       | Brian    | Can edit | user  |
     And "Alice" logs out
     And "Brian" logs in
-    And "Brian" opens the "files" app
-    And "Brian" navigates to the projects space page
     And "Brian" navigates to the project space "team.1"
     When "Brian" downloads the space "team.1"
     And "Brian" logs out
diff --git a/tests/e2e/cucumber/features/spaces/internalLink.feature b/tests/e2e/cucumber/features/spaces/internalLink.feature
@@ -23,7 +23,6 @@ Feature: internal link share in project space
       | user  | role     | shareType |
       | Brian | Can edit | space     |
       | Carol | Can view | space     |
-    And "Alice" navigates to the projects space page
     And "Alice" navigates to the project space "marketing.1"
     # internal link to space
 

diff --git a/tests/e2e/cucumber/features/spaces/memberExpiry.feature b/tests/e2e/cucumber/features/spaces/memberExpiry.feature
@@ -12,18 +12,14 @@ Feature: spaces member expiry
     And "Alice" creates the following project space using API
       | name | id     |
       | team | team.1 |
-    When "Alice" opens the "files" app
-    And "Alice" navigates to the projects space page
     And "Alice" navigates to the project space "team.1"
     And "Alice" adds following users to the project space
       | user  | role     | kind |
       | Brian | Can edit | user |
     And "Alice" sets the expiration date of the member "Brian" of the project space to "+5 days"
     When "Brian" logs in
-    And "Brian" navigates to the projects space page
     And "Brian" navigates to the project space "team.1"
     And "Brian" logs out
-    When "Alice" navigates to the projects space page
     And "Alice" navigates to the project space "team.1"
     And "Alice" removes the expiration date of the member "Brian" of the project space
     And "Alice" logs out
diff --git a/tests/e2e/cucumber/features/spaces/pagination.feature b/tests/e2e/cucumber/features/spaces/pagination.feature
@@ -19,8 +19,6 @@ Feature: check files pagination in project space
     And "Alice" creates the following file in space "Developers" using API
       | name                 | content                |
       | .hidden-testFile.txt | This is a hidden file. |
-    And "Alice" opens the "files" app
-    And "Alice" navigates to the projects space page
     And "Alice" navigates to the project space "dev.1"
     When "Alice" navigates to page "2" of the project space files view
     Then "Alice" should see the text "112 items with 1 kB in total (56 files, 56 folders)" at the footer of the page

diff --git a/tests/e2e/cucumber/features/spaces/participantManagement.feature b/tests/e2e/cucumber/features/spaces/participantManagement.feature
@@ -23,8 +23,6 @@ Feature: spaces participant management
     And "Alice" creates the following project space using API
       | name | id     |
       | team | team.1 |
-    And "Alice" opens the "files" app
-    And "Alice" navigates to the projects space page
     And "Alice" navigates to the project space "team.1"
     And "Alice" adds following users to the project space
       | user     | role     | kind  |
@@ -33,7 +31,6 @@ Feature: spaces participant management
       | sales    | Can view | group |
       | security | Can edit | group |
     When "Brian" logs in
-    And "Brian" navigates to the projects space page
     And "Brian" navigates to the project space "team.1"
     And "Brian" creates the following resources
       | resource | type   |
@@ -42,12 +39,10 @@ Feature: spaces participant management
       | resource  | to     |
       | lorem.txt | parent |
     When "David" logs in
-    And "David" navigates to the projects space page
     And "David" navigates to the project space "team.1"
     Then "David" should see folder "parent" but should not be able to edit
     And "David" logs out
     When "Edith" logs in
-    And "Edith" navigates to the projects space page
     And "Edith" navigates to the project space "team.1"
     And "Edith" creates the following resources
       | resource | type   |
@@ -57,7 +52,6 @@ Feature: spaces participant management
       | lorem.txt | edith |
     And "Edith" logs out
     When "Carol" logs in
-    And "Carol" navigates to the projects space page
     And "Carol" navigates to the project space "team.1"
     Then "Carol" should see folder "parent" but should not be able to edit
     # page reload is necessary to fetch all the changes made by user Brian
@@ -92,12 +86,10 @@ Feature: spaces participant management
     And "Brian" should not be able to delete following resource from the trashbin
       | resource            |
       | parent/textfile.txt |
-    When "Alice" navigates to the projects space page
     And "Alice" navigates to the project space "team.1"
     And "Alice" removes access to following users from the project space
       | user  |
       | Brian |
-    When "Brian" navigates to the projects space page
     Then "Brian" should not be able to see space "team.1"
     And "Brian" logs out
     When "Alice" changes the roles of the following users in the project space

diff --git a/tests/e2e/cucumber/features/spaces/project.feature b/tests/e2e/cucumber/features/spaces/project.feature
@@ -60,7 +60,6 @@ Feature: spaces.personal
       | folder_to_shared | Brian     | user | Can edit | folder       |
 
     # team.2
-    And "Alice" navigates to the projects space page
     And "Alice" navigates to the project space "team.2"
     And "Alice" updates the space "team.2" name to "management team"
     And "Alice" updates the space "team.2" subtitle to "management team - subtitle"
@@ -100,7 +99,6 @@ Feature: spaces.personal
     And "Brian" uploads the following resource
       | resource   | to               |
       | simple.pdf | folder_to_shared |
-    And "Alice" navigates to the projects space page
     And "Alice" navigates to the project space "team.1"
     And "Alice" updates the space "team.1" image to "testavatar.jpeg"
     And "Alice" uploads the following resource
@@ -139,7 +137,6 @@ Feature: spaces.personal
     And "Alice" creates the following project space using API
       | name | id     |
       | team | team.1 |
-    And "Alice" navigates to the projects space page
     And "Alice" navigates to the project space "team.1"
     And "Alice" creates the following resources
       | resource            | type    | content             |
@@ -154,17 +151,13 @@ Feature: spaces.personal
     And "Alice" logs out
 
     When "Carol" logs in
-    And "Carol" opens the "files" app
-    And "Carol" navigates to the projects space page
     And "Carol" navigates to the project space "team.1"
     And "Carol" should not see the version of the file
       | resource     | to     |
       | textfile.txt | parent |
     And "Carol" logs out
 
     When "Brian" logs in
-    And "Brian" opens the "files" app
-    And "Brian" navigates to the projects space page
     And "Brian" navigates to the project space "team.1"
     And "Brian" downloads old version of the following resource
       | resource     | to     |

diff --git a/tests/e2e/cucumber/features/spaces/publicLink.feature b/tests/e2e/cucumber/features/spaces/publicLink.feature
@@ -26,7 +26,6 @@ Feature: spaces public link
       | Brian | Can edit   | space     |
       | Carol | Can view   | space     |
       | David | Can manage | space     |
-    And "Alice" navigates to the projects space page
     And "Alice" navigates to the project space "team.1"
     And "Alice" uploads the following resources via drag-n-drop
       | resource       |
@@ -108,7 +107,6 @@ Feature: spaces public link
     And "Alice" creates the following file in space "team" using API
       | name     | content   |
       | file.txt | some text |
-    And "Alice" navigates to the projects space page
     And "Alice" navigates to the project space "team.1"
     When "Alice" creates quick link of the resource "file.txt" with password "%public%" from the context menu
     And "Anonymous" opens the public link "Link"
@@ -132,7 +130,6 @@ Feature: spaces public link
     And "Alice" creates the following file in space "team" using API
       | name        | content   |
       | example.txt | some text |
-    And "Alice" navigates to the projects space page
     And "Alice" navigates to the project space "team.1"
     And "Alice" creates a public link for the space with password "%public%" using the sidebar panel
     And "Alice" renames the most recently created public link of space to "spaceLink"

diff --git a/tests/e2e/cucumber/steps/ui/spaces.ts b/tests/e2e/cucumber/steps/ui/spaces.ts
@@ -39,7 +39,8 @@ When(
   async function (this: World, stepUser: string, key: string): Promise<void> {
     const { page } = this.actorsEnvironment.getActor({ key: stepUser })
     const spacesObject = new objects.applicationFiles.Spaces({ page })
-
+    const pageObject = new objects.applicationFiles.page.spaces.Projects({ page })
+    await pageObject.navigate()
     await spacesObject.open({ key })
   }
 )