Skip to content

[stable20] Fix default internal expiration date #24159

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
danxuliu merged 15 commits into from
Nov 16, 2020
Merged

[stable20] Fix default internal expiration date #24159

Changes from 1 commit
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
446c908
Fix typos in method names
danxuliu Nov 11, 2020
76bbbca
Fix typo in variable name
danxuliu Nov 11, 2020
d6ba3b2
Remove extra spaces
danxuliu Nov 12, 2020
b75c171
Remove wrong and misleading comment
danxuliu Nov 11, 2020
22357a7
Add unit tests to enforce a relaxed default share expiration date
danxuliu Nov 11, 2020
20c72ac
Fix unit test for verifying enforced expire date too far in the future
danxuliu Nov 11, 2020
4e41810
Fix unit test for verifying enforced valid expiration date.
danxuliu Nov 12, 2020
eaa43d2
Fix unit test method name
danxuliu Nov 12, 2020
115a988
Fix unit test for expiration date without date but with default
danxuliu Nov 12, 2020
731cce4
Add unit test for expiration date with date and with default
danxuliu Nov 12, 2020
709abd4
Add explicit time to test date for clarity
danxuliu Nov 12, 2020
182e28b
Fix default internal expiration date
danxuliu Nov 12, 2020
1464ace
Add unit tests for "validateExpirationDateInternal"
danxuliu Nov 12, 2020
bf84456
Reset app configs by deleting the values instead of setting the defaults
danxuliu Nov 12, 2020
34a143b
Add integration tests for creating shares with default expiration dates
danxuliu Nov 12, 2020
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
Fix unit test for verifying enforced valid expiration date. 
The enforced expiration date was not actually enabled, as for that
"shareapi_default_expire_date" needs to be explicitly set to "yes".

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
  • Loading branch information
@danxuliu @backportbot
danxuliu authored and backportbot[bot] committed Nov 16, 2020
commit 4e418100bfd56fff0c7fb2a6010d760b42814389
1 change: 1 addition & 0 deletions tests/lib/Share20/ManagerTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -886,6 +886,7 @@ public function testValidateExpirationDateEnforceValid() {
->willReturnMap([
['core', 'shareapi_enforce_expire_date', 'no', 'yes'],
['core', 'shareapi_expire_after_n_days', '7', '3'],
['core', 'shareapi_default_expire_date', 'no', 'yes'],
]);

$hookListener = $this->getMockBuilder('Dummy')->setMethods(['listener'])->getMock();
Expand Down