From 3000c964dd6fed0588d1c104eab5d48c735db1e6 Mon Sep 17 00:00:00 2001 From: Benedikt Kulmann Date: Thu, 10 Feb 2022 16:30:07 +0100 Subject: [PATCH] Fix link resolving in tests --- packages/web-app-files/src/views/PrivateLink.vue | 8 ++++---- packages/web-app-files/src/views/PublicLink.vue | 10 +++++----- .../tests/unit/views/PrivateLink.spec.js | 4 ++-- .../web-app-files/tests/unit/views/PublicLink.spec.js | 8 ++++---- .../unit/views/__snapshots__/PrivateLink.spec.js.snap | 6 ++++-- .../unit/views/__snapshots__/PublicLink.spec.js.snap | 6 ++++-- .../webUIPrivateLinks/accessingPrivateLinks.feature | 4 ++-- .../sharingPublicSession.feature | 4 ++-- .../acceptance/pageObjects/publicLinkPasswordPage.js | 11 +++++------ tests/acceptance/stepDefinitions/generalContext.js | 6 +++--- tests/acceptance/stepDefinitions/publicLinkContext.js | 2 +- 11 files changed, 36 insertions(+), 33 deletions(-) diff --git a/packages/web-app-files/src/views/PrivateLink.vue b/packages/web-app-files/src/views/PrivateLink.vue index 3049529bb0d..4462c0d20c0 100644 --- a/packages/web-app-files/src/views/PrivateLink.vue +++ b/packages/web-app-files/src/views/PrivateLink.vue @@ -4,7 +4,7 @@
diff --git a/packages/web-app-files/src/views/PublicLink.vue b/packages/web-app-files/src/views/PublicLink.vue index 01388c68d2e..c6bd6a47383 100644 --- a/packages/web-app-files/src/views/PublicLink.vue +++ b/packages/web-app-files/src/views/PublicLink.vue @@ -4,7 +4,7 @@
@@ -88,7 +88,7 @@ export default { return this.$gettext('Enter password for public link') } }, - mounted() { + created() { this.resolvePublicLink() }, methods: { diff --git a/packages/web-app-files/tests/unit/views/PrivateLink.spec.js b/packages/web-app-files/tests/unit/views/PrivateLink.spec.js index 6ae4c231df9..33e97a8ea53 100644 --- a/packages/web-app-files/tests/unit/views/PrivateLink.spec.js +++ b/packages/web-app-files/tests/unit/views/PrivateLink.spec.js @@ -22,7 +22,7 @@ const $route = { const selectors = { pageTitle: 'h1.oc-invisible-sr', loader: '.oc-card-body', - errorMessage: '.oc-link-resolve-error' + errorTitle: '.oc-link-resolve-error-title' } describe('PrivateLink view', () => { @@ -62,7 +62,7 @@ describe('PrivateLink view', () => { await new Promise((resolve) => { setTimeout(() => { - expect(wrapper.find(selectors.errorMessage)).toMatchSnapshot() + expect(wrapper.find(selectors.errorTitle)).toMatchSnapshot() resolve() }, 1) }) diff --git a/packages/web-app-files/tests/unit/views/PublicLink.spec.js b/packages/web-app-files/tests/unit/views/PublicLink.spec.js index f2a22500cab..55beca506ec 100644 --- a/packages/web-app-files/tests/unit/views/PublicLink.spec.js +++ b/packages/web-app-files/tests/unit/views/PublicLink.spec.js @@ -19,7 +19,7 @@ const selectors = { cardFooter: '.oc-card-footer', cardBody: '.oc-card-body', submitButton: '.oc-login-authorize-button', - errorMessage: '.oc-link-resolve-error', + errorTitle: '.oc-link-resolve-error-title', publicLinkPasswordRequired: 'form > .oc-card-title' } @@ -49,7 +49,7 @@ describe('PublicLink', () => { expect(loading).toMatchSnapshot() }) it('should not display the error message', () => { - expect(wrapper.find(selectors.errorMessage).exists()).toBeFalsy() + expect(wrapper.find(selectors.errorTitle).exists()).toBeFalsy() }) it('should not display the password required form', () => { expect(wrapper.find(selectors.publicLinkPasswordRequired).exists()).toBeFalsy() @@ -67,8 +67,8 @@ describe('PublicLink', () => { const wrapper = getWrapper({ loading: false }) await wrapper.setData({ errorMessage: 'some-error-message' }) - expect(wrapper.find(selectors.errorMessage).exists()).toBeTruthy() - expect(wrapper.find(selectors.errorMessage)).toMatchSnapshot() + expect(wrapper.find(selectors.errorTitle).exists()).toBeTruthy() + expect(wrapper.find(selectors.errorTitle)).toMatchSnapshot() }) describe('and when "passwordRequired" is set as true', () => { diff --git a/packages/web-app-files/tests/unit/views/__snapshots__/PrivateLink.spec.js.snap b/packages/web-app-files/tests/unit/views/__snapshots__/PrivateLink.spec.js.snap index 853061a51b0..0629dea6c24 100644 --- a/packages/web-app-files/tests/unit/views/__snapshots__/PrivateLink.spec.js.snap +++ b/packages/web-app-files/tests/unit/views/__snapshots__/PrivateLink.spec.js.snap @@ -23,7 +23,9 @@ exports[`PrivateLink view when the view is still loading should display the load `; exports[`PrivateLink view when there was an error should display the error message 1`] = ` -
-

Error: some error

+
+

+ An error occurred while resolving the private link +

`; diff --git a/packages/web-app-files/tests/unit/views/__snapshots__/PublicLink.spec.js.snap b/packages/web-app-files/tests/unit/views/__snapshots__/PublicLink.spec.js.snap index 08261456235..5b626340090 100644 --- a/packages/web-app-files/tests/unit/views/__snapshots__/PublicLink.spec.js.snap +++ b/packages/web-app-files/tests/unit/views/__snapshots__/PublicLink.spec.js.snap @@ -49,8 +49,10 @@ exports[`PublicLink when the view is not loading anymore and when "passwordRequi `; exports[`PublicLink when the view is not loading anymore should display the error message if "errorMessage" is not empty 1`] = ` -
-

some-error-message

+
+

+ An error occurred while loading the public link +

`; diff --git a/tests/acceptance/features/webUIPrivateLinks/accessingPrivateLinks.feature b/tests/acceptance/features/webUIPrivateLinks/accessingPrivateLinks.feature index 59f683d1178..9d83029ee00 100644 --- a/tests/acceptance/features/webUIPrivateLinks/accessingPrivateLinks.feature +++ b/tests/acceptance/features/webUIPrivateLinks/accessingPrivateLinks.feature @@ -36,12 +36,12 @@ Feature: Access private link Given user "Brian" has been created with default attributes and without skeleton files in the server And user "Brian" has logged in using the webUI When the user navigates to the private link created by user "Alice" for file "lorem.txt" - Then the user should see the following error message on the login card dialog + Then the user should see the following error message on the link resolve page """ An error occurred while resolving the private link - Error: Unknown error """ + Scenario: Access the private link anonymously When an anonymous user tries to navigate to the private link created by user "Alice" for file "lorem.txt" Then the user should be redirected to the IdP login page diff --git a/tests/acceptance/features/webUISharingPublicManagement/sharingPublicSession.feature b/tests/acceptance/features/webUISharingPublicManagement/sharingPublicSession.feature index 883f132529a..181088bec94 100644 --- a/tests/acceptance/features/webUISharingPublicManagement/sharingPublicSession.feature +++ b/tests/acceptance/features/webUISharingPublicManagement/sharingPublicSession.feature @@ -37,8 +37,8 @@ Feature: Session storage for public link And user "Alice" has created file "simple-folder/lorem.txt" in the server And user "Alice" has shared folder "simple-folder" with link with "read" permissions and password "pass123" in the server When the public uses the webUI to access the last public link created by user "Alice" with password "pass123" - And user "Alice" changes the password of last public link to "newpass" using the Sharing API in the server Then file "lorem.txt" should be listed on the webUI + And user "Alice" changes the password of last public link to "newpass" using the Sharing API in the server When the user reloads the current page of the webUI Then the password input for the public link should appear on the webUI When the user accesses the public link with password "newpass" using the webUI @@ -49,8 +49,8 @@ Feature: Session storage for public link Given user "Alice" has created file "lorem.txt" in the server And user "Alice" has shared folder "lorem.txt" with link with "read" permissions and password "pass123" in the server When the public uses the webUI to access the last public link created by user "Alice" with password "pass123" - And user "Alice" changes the password of last public link to "newpass" using the Sharing API in the server Then file "lorem.txt" should be listed on the webUI + And user "Alice" changes the password of last public link to "newpass" using the Sharing API in the server When the user reloads the current page of the webUI Then the password input for the public link should appear on the webUI When the user accesses the public link with password "newpass" using the webUI diff --git a/tests/acceptance/pageObjects/publicLinkPasswordPage.js b/tests/acceptance/pageObjects/publicLinkPasswordPage.js index 312d6cb72ea..8cad2dd4001 100644 --- a/tests/acceptance/pageObjects/publicLinkPasswordPage.js +++ b/tests/acceptance/pageObjects/publicLinkPasswordPage.js @@ -54,19 +54,18 @@ module.exports = { selector: '.oc-login-authorize-button' }, resourceProtectedText: { - selector: '//h2[@class="oc-login-card-title"]/span', + selector: '//*[@class="oc-card-header"]', locateStrategy: 'xpath' }, loadingPublicLink: { - selector: "//div[@class='oc-login-card oc-position-center']//span[.='Loading public link…']", + selector: "//*[@class='oc-card' and text()='Loading public link…']", locateStrategy: 'xpath' }, - loginCardDialogBox: { - selector: '.oc-login-card-body' + linkResolveErrorTitle: { + selector: '.oc-link-resolve-error-title' }, publicLinkPasswordSection: { - selector: - '//div[@class="oc-login-card-body"]//h2[@class="oc-login-card-title"]/span[text()="This resource is password-protected."]', + selector: '//*[@class="oc-card-header" and text()="This resource is password-protected"]', locateStrategy: 'xpath' } } diff --git a/tests/acceptance/stepDefinitions/generalContext.js b/tests/acceptance/stepDefinitions/generalContext.js index b379bcbc96f..d007db15caf 100644 --- a/tests/acceptance/stepDefinitions/generalContext.js +++ b/tests/acceptance/stepDefinitions/generalContext.js @@ -101,12 +101,12 @@ Then( ) Then( - 'the user should see the following error message on the login card dialog', + 'the user should see the following error message on the link resolve page', function (message) { return client.page .publicLinkPasswordPage() - .waitForElementVisible('@loginCardDialogBox') - .expect.element('@loginCardDialogBox') + .waitForElementVisible('@linkResolveErrorTitle') + .expect.element('@linkResolveErrorTitle') .text.to.equal(message) } ) diff --git a/tests/acceptance/stepDefinitions/publicLinkContext.js b/tests/acceptance/stepDefinitions/publicLinkContext.js index 0544eedb982..851eac0a8ed 100644 --- a/tests/acceptance/stepDefinitions/publicLinkContext.js +++ b/tests/acceptance/stepDefinitions/publicLinkContext.js @@ -107,7 +107,7 @@ Then('the public should not get access to the publicly shared file', async funct .submitLinkPasswordForm() // form is submitted as password input is filled in the step before this particular step in 'when' part .getResourceAccessDeniedMsg() return assert.strictEqual( - 'This resource is password-protected.', + 'This resource is password-protected', message, 'Resource protected message invalid, Found: ', message