Skip to content

[stable31] enh: Fix display default expire date, add tests & tiny refactors #50695

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.

Sign up for GitHub

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

Merged
AndyScherzinger merged 6 commits into from
Feb 6, 2025
Merged

[stable31] enh: Fix display default expire date, add tests & tiny refactors #50695

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
ba2a1ec
refactor: Remove some deprecated containers and exceptions
nfebe Feb 4, 2025
8460252
fix: Show default expiration date before create link share
nfebe Feb 4, 2025
fe08fd0
test(files_sharing): Check that default expiration date is shown b4 c…
nfebe Feb 5, 2025
6c231b6
fix(files_sharing): Update `QuickShareSelect` if share is modified
nfebe Feb 5, 2025
08f50dc
fix(files_sharing): Hide internal recommendations in external share i…
nfebe Feb 5, 2025
ba7411f
chore(assets): Recompile assets
nextcloud-command Feb 6, 2025
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
Prev Previous commit
Next Next commit
test(files_sharing): Check that default expiration date is shown b4 c… 
…reate share

Signed-off-by: nfebe <[email protected]>
  • Loading branch information
@nfebe @backportbot
nfebe authored and backportbot[bot] committed Feb 6, 2025
commit fe08fd0dbe9baeafbbaa29a9eebf37b2aba9e886
1 change: 1 addition & 0 deletions apps/files_sharing/src/components/SharingEntryLink.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,6 +92,7 @@

<!-- expiration date -->
<NcActionInput v-if="(pendingDefaultExpirationDate || pendingEnforcedExpirationDate) && defaultExpirationDateEnabled"
data-cy-files-sharing-expiration-date-input
class="share-link-expire-date"
:label="pendingEnforcedExpirationDate ? t('files_sharing', 'Enter expiration date (enforced)') : t('files_sharing', 'Enter expiration date')"
:disabled="saving"
Expand Down
19 changes: 14 additions & 5 deletions cypress/e2e/files_sharing/public-share/setup-public-share.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,9 +51,9 @@ export function setupData(user: User, shareName: string): void {
*/
function checkPasswordState(enforced: boolean, alwaysAskForPassword: boolean) {
if (enforced) {
cy.contains('Password protection (enforced)').should('exist')
cy.contains('Password protection (enforced)').should('exist')
} else if (alwaysAskForPassword) {
cy.contains('Password protection').should('exist')
cy.contains('Password protection').should('exist')
}
cy.contains('Enter a password')
.should('exist')
Expand All @@ -68,13 +68,22 @@ function checkPasswordState(enforced: boolean, alwaysAskForPassword: boolean) {
*/
function checkExpirationDateState(enforced: boolean, hasDefault: boolean) {
if (enforced) {
cy.contains('Enable link expiration (enforced)').should('exist')
cy.contains('Enable link expiration (enforced)').should('exist')
} else if (hasDefault) {
cy.contains('Enable link expiration').should('exist')
cy.contains('Enable link expiration').should('exist')
}
cy.contains('Enter expiration date')
.should('exist')
.and('not.be.disabled')
cy.get('input[data-cy-files-sharing-expiration-date-input]').should('exist')
cy.get('input[data-cy-files-sharing-expiration-date-input]')
.invoke('val')
.then((val) => {
const expectedDate = new Date()
expectedDate.setDate(expectedDate.getDate() + 2)
expect(new Date(val).toDateString()).to.eq(expectedDate.toDateString())
})

}

/**
Expand All @@ -90,7 +99,7 @@ export function createShare(context: ShareContext, shareName: string, options: S

cy.intercept('POST', '**/ocs/v2.php/apps/files_sharing/api/v1/shares').as('createShare')
cy.findByRole('button', { name: 'Create a new share link' }).click()
// Conduct optional checks based on the provided options
// Conduct optional checks based on the provided options
if (options) {
cy.get('.sharing-entry__actions').should('be.visible') // Wait for the dialog to open
checkPasswordState(options.enforcePassword ?? false, options.alwaysAskForPassword ?? false)
Expand Down