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

Add activities for group membership changes #14502

Merged

Conversation

nickvergessen
Copy link
Member

Signed-off-by: Joas Schilling coding@schilljs.com

Signed-off-by: Joas Schilling <coding@schilljs.com>
@nickvergessen
Copy link
Member Author

/backport to stable15

Copy link
Member

@ChristophWurst ChristophWurst left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good!

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
Copy link
Member

@MorrisJobke MorrisJobke left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nice and working 👍

bildschirmfoto 2019-03-05 um 10 47 37

@MorrisJobke MorrisJobke added 4. to release Ready to be released and/or waiting for tests to finish and removed 3. to review Waiting for reviews labels Mar 5, 2019
@skjnldsv
Copy link
Member

skjnldsv commented Mar 5, 2019

Nice and working

Though design is off, is it related to this pr?

@MorrisJobke
Copy link
Member

Though design is off, is it related to this pr?

Was due to resizing and juggling with the window. :/

@faily-bot
Copy link

faily-bot bot commented Mar 5, 2019

🤖 beep boop beep 🤖

Here are the logs for the failed build:

Status of 16742: failure

  • DB=sqlite, ENABLE_REDIS=false, PHP=7.2
Show full log
There were 3 failures:

1) Tests\Core\Command\Config\AppsEnableTest::testCommandInput with data set #8 (array('updatenotification', 'contacts'), array('admin'), 0, 'updatenotification enabled fo... admin')
Failed asserting that 'updatenotification enabled for groups: admin\n
Could not download app contacts\n
' contains "updatenotification enabled for groups: admin
contacts enabled for groups: admin".

/drone/src/github.com/nextcloud/server/tests/Core/Command/Apps/AppsEnableTest.php:69

2) Tests\Core\Command\Config\AppsEnableTest::testCommandInput with data set #10 (array('updatenotification', 'contacts'), array('admin', 'invalid_group'), 0, 'updatenotification enabled fo... admin')
Failed asserting that 'updatenotification enabled for groups: admin\n
Could not download app contacts\n
' contains "updatenotification enabled for groups: admin
contacts enabled for groups: admin".

/drone/src/github.com/nextcloud/server/tests/Core/Command/Apps/AppsEnableTest.php:69

3) Tests\Core\Command\Config\AppsEnableTest::testCommandInput with data set #11 (array('updatenotification', 'contacts', 'invalid_app'), array('admin', 'invalid_group'), 1, 'updatenotification enabled fo...id_app')
Failed asserting that 'updatenotification enabled for groups: admin\n
Could not download app contacts\n
Could not download app invalid_app\n
' contains "updatenotification enabled for groups: admin
contacts enabled for groups: admin
Could not download app invalid_app".

/drone/src/github.com/nextcloud/server/tests/Core/Command/Apps/AppsEnableTest.php:69

--

There was 1 risky test:

1) OCA\TwoFactorBackupCodes\Tests\Db\BackupCodeMapperTest::testInsertArgonEncryptedCodes
This test did not perform any assertions

  • DB=mysqlmb4, ENABLE_REDIS=false, PHP=7.3
Show full log
There was 1 failure:

1) Tests\Core\Command\Config\AppsEnableTest::testCommandInput with data set #8 (array('updatenotification', 'contacts'), array('admin'), 0, 'updatenotification enabled fo... admin')
Failed asserting that 'updatenotification enabled for groups: admin\n
Could not download app contacts\n
' contains "updatenotification enabled for groups: admin
contacts enabled for groups: admin".

/drone/src/github.com/nextcloud/server/tests/Core/Command/Apps/AppsEnableTest.php:69

--

There was 1 risky test:

1) OCA\TwoFactorBackupCodes\Tests\Db\BackupCodeMapperTest::testInsertArgonEncryptedCodes
This test did not perform any assertions

  • TESTS=acceptance, TESTS-ACCEPTANCE=app-comments
    • tests/acceptance/features/app-comments.feature:222
    • tests/acceptance/features/app-comments.feature:249
Show full log
  Scenario: search a comment                                      # /drone/src/github.com/nextcloud/server/tests/acceptance/features/app-comments.feature:222
    Given I am logged in                                          # LoginPageContext::iAmLoggedIn()
    And I open the details view for "welcome.txt"                 # FileListContext::iOpenTheDetailsViewFor()
    And I open the "Comments" tab in the details view             # FilesAppContext::iOpenTheTabInTheDetailsView()
    And I create a new comment with "Hello world" as message      # CommentsAppContext::iCreateANewCommentWithAsMessage()
    And I see a comment with "Hello world" as message             # CommentsAppContext::iSeeACommentWithAsMessage()
    When I search for "hello"                                     # SearchContext::iSearchFor()
    Then I see that the search result 1 is "user0Hello world"     # SearchContext::iSeeThatTheSearchResultIs()
      Failed asserting that two strings are equal.
      --- Expected
      +++ Actual
      @@ @@
      -'user0Hello world'
      +'Hello world'
    And I see that the search result 1 was found in "welcome.txt" # SearchContext::iSeeThatTheSearchResultWasFoundIn()
  Scenario: search a comment by a another user                   # /drone/src/github.com/nextcloud/server/tests/acceptance/features/app-comments.feature:249
    Given I act as John                                          # ActorContext::iActAs()
    And I am logged in as the admin                              # LoginPageContext::iAmLoggedInAsTheAdmin()
    And I act as Jane                                            # ActorContext::iActAs()
    And I am logged in                                           # LoginPageContext::iAmLoggedIn()
      User name field in Login page could not be found after 100 seconds (NoSuchElementException)
    And I act as John                                            # ActorContext::iActAs()
    And I rename "welcome.txt" to "shared.txt"                   # FileListContext::iRenameTo()
    And I share "shared.txt" with "user0"                        # FilesAppSharingContext::iShareWith()
    And I see that the file is shared with "user0"               # FilesAppSharingContext::iSeeThatTheFileIsSharedWith()
    And I act as Jane                                            # ActorContext::iActAs()
    And I open the Files app                                     # FilesAppContext::iOpenTheFilesApp()
    And I open the details view for "shared.txt"                 # FileListContext::iOpenTheDetailsViewFor()
    And I open the "Comments" tab in the details view            # FilesAppContext::iOpenTheTabInTheDetailsView()
    And I create a new comment with "Hello world" as message     # CommentsAppContext::iCreateANewCommentWithAsMessage()
    And I see a comment with "Hello world" as message            # CommentsAppContext::iSeeACommentWithAsMessage()
    When I act as John                                           # ActorContext::iActAs()
    And I search for "hello"                                     # SearchContext::iSearchFor()
    Then I see that the search result 1 is "user0Hello world"    # SearchContext::iSeeThatTheSearchResultIs()
    And I see that the search result 1 was found in "shared.txt" # SearchContext::iSeeThatTheSearchResultWasFoundIn()
sh: 1: kill: No such process
  • TESTS=acceptance, TESTS-ACCEPTANCE=login
    • tests/acceptance/features/login.feature:38
Show full log
  Scenario: log in with invalid user once fixed by admin              # /drone/src/github.com/nextcloud/server/tests/acceptance/features/login.feature:38
    Given I act as John                                               # ActorContext::iActAs()
    And I can not log in with user unknownUser and password 123456acb # LoginPageContext::iCanNotLogInWithUserAndPassword()
    When 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 click the New user button                                   # UsersSettingsContext::iClickTheNewUserButton()
    And I see that the new user form is shown                         # UsersSettingsContext::iSeeThatTheNewUserFormIsShown()
    And I create user unknownUser with password 123456acb             # UsersSettingsContext::iCreateUserWithPassword()
    And I see that the list of users contains the user unknownUser    # UsersSettingsContext::iSeeThatTheListOfUsersContainsTheUser()
    And I act as John                                                 # ActorContext::iActAs()
    And I log in with user unknownUser and password 123456acb         # LoginPageContext::iLogInWithUserAndPassword()
    Then I see that the current page is the Files app                 # FilesAppContext::iSeeThatTheCurrentPageIsTheFilesApp()
      Failed asserting that 'http://acceptance-login/index.php/login?user=unknownUser' starts with "http://acceptance-login/index.php/apps/files/".
  • TESTS=acceptance, TESTS-ACCEPTANCE=users
    • tests/acceptance/features/users.feature:13
    • tests/acceptance/features/users.feature:25
    • tests/acceptance/features/users.feature:35
    • tests/acceptance/features/users.feature:47
Show full log
  Scenario: create a new user with a custom display name                       # /drone/src/github.com/nextcloud/server/tests/acceptance/features/users.feature:13
    Given I am logged in as the admin                                          # LoginPageContext::iAmLoggedInAsTheAdmin()
    And I open the User settings                                               # SettingsMenuContext::iOpenTheUserSettings()
    When I click the New user button                                           # UsersSettingsContext::iClickTheNewUserButton()
    And I see that the new user form is shown                                  # UsersSettingsContext::iSeeThatTheNewUserFormIsShown()
    And I set the user name for the new user to "test"                         # UsersSettingsContext::iSetTheUserNameForTheNewUserTo()
    And I set the display name for the new user to "Test display name"         # UsersSettingsContext::iSetTheDisplayNameForTheNewUserTo()
    And I set the password for the new user to "123456acb"                     # UsersSettingsContext::iSetThePasswordForTheNewUserTo()
    And I create the new user                                                  # UsersSettingsContext::iCreateTheNewUser()
    Then I see that the list of users contains the user "test"                 # UsersSettingsContext::iSeeThatTheListOfUsersContainsTheUser()
    And I see that the display name for the user "test" is "Test display name" # UsersSettingsContext::iSeeThatTheDisplayNameForTheUserIs()
      Row for user test in Users Settings could not be found after 100 seconds
      displayName cell for user test in Users Settings could not be found after 100 seconds
      displayName input for user test in Users Settings could not be found after 100 seconds (NoSuchElementException)
  Scenario: delete a user                                                      # /drone/src/github.com/nextcloud/server/tests/acceptance/features/users.feature:25
    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 see that the list of users contains the user user0                   # UsersSettingsContext::iSeeThatTheListOfUsersContainsTheUser()
    And I open the actions menu for the user user0                             # UsersSettingsContext::iOpenTheActionsMenuOf()
    And I see that the "Delete user" action in the user0 actions menu is shown # UsersSettingsContext::iSeeTheAction()
      Failed asserting that false is true.
    When I click the "Delete user" action in the user0 actions menu            # UsersSettingsContext::iClickTheAction()
    Then I see that the list of users does not contains the user user0         # UsersSettingsContext::iSeeThatTheListOfUsersDoesNotContainsTheUser()
  Scenario: disable a user                                                      # /drone/src/github.com/nextcloud/server/tests/acceptance/features/users.feature:35
    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 see that the list of users contains the user user0                    # UsersSettingsContext::iSeeThatTheListOfUsersContainsTheUser()
    And I open the actions menu for the user user0                              # UsersSettingsContext::iOpenTheActionsMenuOf()
    And I see that the "Disable user" action in the user0 actions menu is shown # UsersSettingsContext::iSeeTheAction()
      Failed asserting that false is true.
    When I click the "Disable user" action in the user0 actions menu            # UsersSettingsContext::iClickTheAction()
    Then I see that the list of users does not contains the user user0          # UsersSettingsContext::iSeeThatTheListOfUsersDoesNotContainsTheUser()
    When I open the "Disabled users" section                                    # AppNavigationContext::iOpenTheSection()
    Then I see that the list of users contains the user user0                   # UsersSettingsContext::iSeeThatTheListOfUsersContainsTheUser()
  Scenario: users navigation without disabled users                                   # /drone/src/github.com/nextcloud/server/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()
    And I see that the "Enable user" action in the disabledUser actions menu is shown # UsersSettingsContext::iSeeTheAction()
      Failed asserting that false is true.
    When I click the "Enable user" action in the disabledUser actions menu            # UsersSettingsContext::iClickTheAction()
    Then I see that the section "Disabled users" is not shown                         # AppNavigationContext::iSeeThatTheSectionIsNotShown()
    When I open the User settings                                                     # SettingsMenuContext::iOpenTheUserSettings()
    Then I see that the section "Disabled users" is not shown                         # AppNavigationContext::iSeeThatTheSectionIsNotShown()
  • TESTS=acceptance, TESTS-ACCEPTANCE=apps
    • tests/acceptance/features/apps.feature:75
Show full log
  Scenario: View app details for app store apps   # /drone/src/github.com/nextcloud/server/tests/acceptance/features/apps.feature:75
    Given I act as Jane                           # ActorContext::iActAs()
    And I am logged in as the admin               # LoginPageContext::iAmLoggedInAsTheAdmin()
    And I open the Apps management                # SettingsMenuContext::iOpenTheAppsManagement()
    And I open the "Tools" section                # AppNavigationContext::iOpenTheSection()
      Tools section item in App Navigation could not be found after 100 seconds (NoSuchElementException)
    When I click on the "Antivirus for files" app # AppsManagementContext::iClickOnTheApp()
    Then I see that the app details are shown     # AppsManagementContext::iSeeThatTheAppDetailsAreShown()

@MorrisJobke MorrisJobke merged commit c91ae11 into master Mar 5, 2019
@MorrisJobke MorrisJobke deleted the feature/noid/add-activities-for-group-membership-changes branch March 5, 2019 10:22
@backportbot-nextcloud
Copy link

The backport to stable15 failed. Please do this backport manually.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
4. to release Ready to be released and/or waiting for tests to finish feature: activity and notification feature: users and groups
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants