Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[tests-only][full-ci] bump ocis commit id - master #11366

Merged
merged 2 commits into from
Aug 19, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .drone.env
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
# The version of OCIS to use in pipelines that test against OCIS
OCIS_COMMITID=8019bc916f3f74c0e34425d3c3091dc0165e0bc5
OCIS_COMMITID=b4dab08608d5ff5bb8ab81da312a24e49c7a0bb6
OCIS_BRANCH=master
3 changes: 2 additions & 1 deletion tests/e2e/cucumber/features/app-provider/urlJourneys.feature
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ Feature: url stability for mobile and desktop client
# This is a minimal test for the integration of ocis with different online office suites like Collabora and OnlyOffice
# Check that the file can be opened in collabora or onlyoffice using the url. https://github.com/owncloud/web/issues/9897


Scenario: open office suite files with Collabora and onlyOffice
Given "Admin" creates following users using API
| id |
Expand All @@ -18,6 +18,7 @@ Feature: url stability for mobile and desktop client
And "Alice" creates the following resources
| resource | type | content |
| MicrosoftWord.docx | Microsoft Word | Microsoft Word Content |
And for "Alice" file "MicrosoftWord.docx" should not be locked
And "Alice" opens the "files" app

# desktop feature
Expand Down
8 changes: 5 additions & 3 deletions tests/e2e/cucumber/steps/ui/resources.ts
Original file line number Diff line number Diff line change
Expand Up @@ -838,7 +838,8 @@ Then(

actionType === 'should'
? await expect(lockLocator).toBeVisible()
: await expect(lockLocator).not.toBeVisible()
: // can take more than 5 seconds for lock to be released in case of OnlyOffice
await expect(lockLocator).not.toBeVisible({ timeout: config.timeout })
}
)

Expand Down Expand Up @@ -926,10 +927,11 @@ Then(
const { page } = this.actorsEnvironment.getActor({ key: stepUser })
const resourceObject = new objects.applicationFiles.Resource({ page })
for (const info of stepTable.hashes()) {
const actions = await resourceObject.getAllAvailableActions({ resource })
if (actionType === 'should') {
expect(await resourceObject.getAllAvailableActions({ resource })).toContain(info.action)
expect(actions.some((action) => action.startsWith(info.action))).toBe(true)
} else {
expect(await resourceObject.getAllAvailableActions({ resource })).not.toContain(info.action)
expect(actions.some((action) => action.startsWith(info.action))).toBe(false)
}
}
}
Expand Down