Skip to content

[stable18] Fix default internal expiration date #24161

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

Jump to bottom
Merged
rullzer merged 16 commits into from
Nov 16, 2020
Merged

[stable18] Fix default internal expiration date #24161

rullzer merged 16 commits into from
Nov 16, 2020

Conversation

@danxuliu
Copy link
Member

@danxuliu danxuliu commented Nov 16, 2020

Backport of #24069

ChristophWurst and others added 16 commits November 16, 2020 15:35
@ChristophWurst @danxuliu
Use the shorter phpunit syntax for mocked return values in ManagerTest
1d0a70e 
Signed-off-by: Christoph Wurst <[email protected]>
@danxuliu
Fix typos in method names
f592384 
Signed-off-by: Daniel Calviño Sánchez <[email protected]>
@danxuliu
Fix typo in variable name
e9dfa13 
Signed-off-by: Daniel Calviño Sánchez <[email protected]>
@danxuliu
Remove extra spaces
66eb123 
Signed-off-by: Daniel Calviño Sánchez <[email protected]>
@danxuliu
Remove wrong and misleading comment
4789709 
Signed-off-by: Daniel Calviño Sánchez <[email protected]>
@danxuliu
Add unit tests to enforce a relaxed default share expiration date
aaeaed0 
Signed-off-by: Daniel Calviño Sánchez <[email protected]>
@danxuliu
Fix unit test for verifying enforced expire date too far in the future
f4f39fc 
The test should fail if no exception was thrown, and no exception was
thrown due to a missing configuration parameter. However, the use of
"addToAssertionCount(1)" made the test pass even if no exception was
thrown and, therefore, to silently fail.

Now the missing configuration parameter was added and the test will fail
if the expected exception is not thrown.

Signed-off-by: Daniel Calviño Sánchez <[email protected]>
@danxuliu
Fix unit test for verifying enforced valid expiration date.
eae5fa8 
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 <[email protected]>
@danxuliu
Fix unit test method name
6cf3c29 
Signed-off-by: Daniel Calviño Sánchez <[email protected]>
@danxuliu
Fix unit test for expiration date without date but with default
2f8f06f 
The expiration date was explicitly given, so it was not testing what it
should. Moreover, "link_defaultExpDays" needs to be mapped when testing
the default value (even if it will just fallback to the value of
"shareapi_expire_after_n_days").

Signed-off-by: Daniel Calviño Sánchez <[email protected]>
@danxuliu
Add unit test for expiration date with date and with default
c138d2d 
This adds back what was being actually tested in the unit test fixed in
the previous commit.

Signed-off-by: Daniel Calviño Sánchez <[email protected]>
@danxuliu
Add explicit time to test date for clarity
713e879 
This shows in a clearer way that the expected expiration date is the
original one, but without time.

Signed-off-by: Daniel Calviño Sánchez <[email protected]>
@danxuliu
Fix default internal expiration date
bae712b 
The default expiration date for internal shares was set from the default
link expiration date instead of the internal one.

Signed-off-by: Daniel Calviño Sánchez <[email protected]>
@danxuliu
Add unit tests for "validateExpirationDateInternal"
68f67d9 
They were copied and adjusted as needed from the tests for
"validateExpirationDate".

Signed-off-by: Daniel Calviño Sánchez <[email protected]>
@danxuliu
Reset app configs by deleting the values instead of setting the defaults
aadd0ab 
This avoids the need to keep the default values in the integration tests
in sync with the code, and also makes possible to reset values with
"dynamic" defaults (defaults that depend on other values).

Signed-off-by: Daniel Calviño Sánchez <[email protected]>
@danxuliu
Add integration tests for creating shares with default expiration dates
47ca9e3 
Signed-off-by: Daniel Calviño Sánchez <[email protected]>
@danxuliu danxuliu added this to the Nextcloud 18.0.11 milestone Nov 16, 2020
@rullzer rullzer mentioned this pull request Nov 16, 2020
Merged
1 task
@faily-bot
Copy link

faily-bot bot commented Nov 16, 2020

🤖 beep boop beep 🤖

Here are the logs for the failed build:

Status of 35588: failure

handlebars

acceptance-users

  • tests/acceptance/features/users.feature:47
Show full log 
  Scenario: users navigation without disabled users                 # /drone/src/tests/acceptance/features/users.feature:47
    Given I act as Jane                                             # ActorContext::iActAs()
    And I am logged in as the admin                                 # LoginPageContext::iAmLoggedInAsTheAdmin()
    And I open the User settings                                    # SettingsMenuContext::iOpenTheUserSettings()
    And I open the "Disabled users" section                         # AppNavigationContext::iOpenTheSection()
    And I see that the list of users contains the user disabledUser # UsersSettingsContext::iSeeThatTheListOfUsersContainsTheUser()
    And I open the actions menu for the user disabledUser           # UsersSettingsContext::iOpenTheActionsMenuOf()
      Row for user disabledUser in Users Settings could not be found
      Actions menu for user disabledUser in Users Settings could not be found (NoSuchElementException)

@danxuliu
Copy link
Member Author

danxuliu commented Nov 16, 2020

Test failures are unrelated.

@rullzer rullzer merged commit 93b9cab into stable18 Nov 16, 2020
@rullzer rullzer deleted the backport/24069/stable18-fix-default-internal-expiration-date branch November 16, 2020 18:17
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@rullzer rullzer rullzer approved these changes

@ChristophWurst ChristophWurst Awaiting requested review from ChristophWurst

@skjnldsv skjnldsv Awaiting requested review from skjnldsv

Assignees

No one assigned

Labels

3. to review Waiting for reviews bug feature: sharing

Projects

None yet

Milestone

Nextcloud 18.0.11

Development

Successfully merging this pull request may close these issues.

4 participants

@danxuliu @rullzer @ChristophWurst