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

allow grouping of activity settings #22117

Merged
merged 1 commit into from
Aug 11, 2020
Merged

Conversation

icewind1991
Copy link
Member

@icewind1991 icewind1991 commented Aug 5, 2020

Allow apps to group their activity settings, includes a group for "Files" as example

settings frontend here: nextcloud/activity#477

@faily-bot
Copy link

faily-bot bot commented Aug 5, 2020

🤖 beep boop beep 🤖

Here are the logs for the failed build:

Status of 31420: failure

mysql8.0-php7.2

Show full log
There were 2 warnings:

1) Test\Files\ViewTest::testRenameFailDeleteTargetKeepSource
Trying to configure method "writeStream" which cannot be configured because it does not exist, has not been specified, is final, or is static

2) Test\Files\ViewTest::testCopyFailDeleteTargetKeepSource
Trying to configure method "writeStream" which cannot be configured because it does not exist, has not been specified, is final, or is static

--

There was 1 failure:

1) Test\Files\ObjectStore\ObjectStoreStorageTest::testCopy with data set #2 ('/source with space.txt', '/target.txt')
Expected /target.txt to be a copy of /drone/src/tests/data/lorem.txt
Failed asserting that false matches expected 'Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.\n
Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat.\n
Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur.\n
Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.'.

/drone/src/tests/lib/Files/Storage/Storage.php:222
/drone/src/tests/lib/Files/Storage/Storage.php:235

acceptance-app-files

  • tests/acceptance/features/app-files.feature:262
Show full log
  Scenario: unmarking a file as favorite causes the file list to be sorted again                          # /drone/src/tests/acceptance/features/app-files.feature:262
    Given I am logged in                                                                                  # LoginPageContext::iAmLoggedIn()
    And I create a new folder named "A name alphabetically lower than welcome.txt"                        # FileListContext::iCreateANewFolderNamed()
    And I see that "A name alphabetically lower than welcome.txt" precedes "welcome.txt" in the file list # FileListContext::iSeeThatPrecedesInTheFileList()
    And I close the details view                                                                          # FilesAppContext::iCloseTheDetailsView()
    And I see that the details view is closed                                                             # FilesAppContext::iSeeThatTheDetailsViewIsClosed()
      │ Details view in Files app visibility could not be got
      │ Exception message: Element not found with xpath, (//html//*[@id="app-sidebar" or contains(@class, 'app-sidebar')])[1]
      │ 
      │ Unable to locate element: {"method":"xpath","selector":"(//html//*[@id=\"app-sidebar\" or contains(@class, 'app-sidebar')])[1]"}
      │ For documentation on this error, please visit: http://seleniumhq.org/exceptions/no_such_element.html
      │ Build info: version: '2.53.1', revision: 'a36b8b1', time: '2016-06-30 17:37:03'
      │ System info: host: 'ef657ed32765', ip: '192.168.224.2', os.name: 'Linux', os.arch: 'amd64', os.version: '4.15.0-88-generic', java.version: '1.8.0_91'
      │ Driver info: driver.version: unknown
      │ Trying again
      │ 
    And I mark "welcome.txt" as favorite                                                                  # FileListContext::iMarkAsFavorite()
    And I see that "welcome.txt" is marked as favorite                                                    # FileListContext::iSeeThatIsMarkedAsFavorite()
    And I see that "welcome.txt" precedes "A name alphabetically lower than welcome.txt" in the file list # FileListContext::iSeeThatPrecedesInTheFileList()
    When I unmark "welcome.txt" as favorite                                                               # FileListContext::iUnmarkAsFavorite()
    Then I see that "welcome.txt" is not marked as favorite                                               # FileListContext::iSeeThatIsNotMarkedAsFavorite()
      Not favorited state icon for file welcome.txt in file list could not be found after 100 seconds (NoSuchElementException)
    And I see that "A name alphabetically lower than welcome.txt" precedes "welcome.txt" in the file list # FileListContext::iSeeThatPrecedesInTheFileList()

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.

Tested and works 👍

@MorrisJobke
Copy link
Member

That's how it looks like:

Bildschirmfoto 2020-08-05 um 22 26 05

cc @jancborchardt

Copy link
Member

@jancborchardt jancborchardt left a comment

Choose a reason for hiding this comment

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

Regarding the wording, the spec says this:

  • Specific settings section "Notifications", not called "Activity" (All the settings go to Notifications, Activity has none as there you can filter in the interface)
  • Each setting has checkmarks for "Mail" and "Push" – and you can of course also leave both unchecked

Any specific reason why the wording is not like that?

@icewind1991
Copy link
Member Author

icewind1991 commented Aug 10, 2020

Adjusted the wording (change is in the activity repo),

not that the wording/merging/etc of the individual items are not in the scope of the PR and will be changed separately

@MorrisJobke
Copy link
Member

Now looks like this:

Bildschirmfoto 2020-08-11 um 11 22 30

@nickvergessen
Copy link
Member

regression:

  1. Test\Activity\ManagerTest::testGetConsumers
    Cannot stub or mock class or interface "Test\Activity\IL10N" which does not exist

  2. Test\Activity\ManagerTest::testGetConsumersInvalidConsumer
    Cannot stub or mock class or interface "Test\Activity\IL10N" which does not exist

  3. Test\Activity\ManagerTest::testGetUserFromTokenThrowInvalidToken with data set #0 (null, array())
    Cannot stub or mock class or interface "Test\Activity\IL10N" which does not exist

  4. Test\Activity\ManagerTest::testGetUserFromTokenThrowInvalidToken with data set Name the repository "server" #1 ('', array())
    Cannot stub or mock class or interface "Test\Activity\IL10N" which does not exist

  5. Test\Activity\ManagerTest::testGetUserFromTokenThrowInvalidToken with data set Some more links, structure adjustment and CoC #2 ('12345678901234567890123456789', array())
    Cannot stub or mock class or interface "Test\Activity\IL10N" which does not exist

  6. Test\Activity\ManagerTest::testGetUserFromTokenThrowInvalidToken with data set Use shields for IRC links #3 ('1234567890123456789012345678901', array())
    Cannot stub or mock class or interface "Test\Activity\IL10N" which does not exist

  7. Test\Activity\ManagerTest::testGetUserFromTokenThrowInvalidToken with data set File requests / Files Drop for the community #4 ('123456789012345678901234567890', array())
    Cannot stub or mock class or interface "Test\Activity\IL10N" which does not exist

  8. Test\Activity\ManagerTest::testGetUserFromTokenThrowInvalidToken with data set File view: Double click and right click #5 ('123456789012345678901234567890', array('user1', 'user2'))
    Cannot stub or mock class or interface "Test\Activity\IL10N" which does not exist

  9. Test\Activity\ManagerTest::testGetUserFromToken with data set #0 (null, '123456789012345678901234567890', 'user1')
    Cannot stub or mock class or interface "Test\Activity\IL10N" which does not exist

  10. Test\Activity\ManagerTest::testGetUserFromToken with data set Name the repository "server" #1 ('user2', null, 'user2')
    Cannot stub or mock class or interface "Test\Activity\IL10N" which does not exist

  11. Test\Activity\ManagerTest::testGetUserFromToken with data set Some more links, structure adjustment and CoC #2 ('user2', '123456789012345678901234567890', 'user2')
    Cannot stub or mock class or interface "Test\Activity\IL10N" which does not exist

  12. Test\Activity\ManagerTest::testPublishExceptionNoApp
    Cannot stub or mock class or interface "Test\Activity\IL10N" which does not exist

  13. Test\Activity\ManagerTest::testPublishExceptionNoType
    Cannot stub or mock class or interface "Test\Activity\IL10N" which does not exist

  14. Test\Activity\ManagerTest::testPublishExceptionNoAffectedUser
    Cannot stub or mock class or interface "Test\Activity\IL10N" which does not exist

  15. Test\Activity\ManagerTest::testPublishExceptionNoSubject
    Cannot stub or mock class or interface "Test\Activity\IL10N" which does not exist

  16. Test\Activity\ManagerTest::testPublish with data set #0 (null, '')
    Cannot stub or mock class or interface "Test\Activity\IL10N" which does not exist

  17. Test\Activity\ManagerTest::testPublish with data set Name the repository "server" #1 ('test_author', 'test_author')
    Cannot stub or mock class or interface "Test\Activity\IL10N" which does not exist

  18. Test\Activity\ManagerTest::testPublishAllManually
    Cannot stub or mock class or interface "Test\Activity\IL10N" which does not exist

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
3. to review Waiting for reviews
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants