Skip to content

Conversation

@georgehrke
Copy link
Member

fixes #20919

requires #21971

@georgehrke georgehrke added the 2. developing Work in progress label Jul 27, 2020
@georgehrke georgehrke added this to the Nextcloud 20 milestone Jul 29, 2020
@georgehrke georgehrke force-pushed the feature/20919/contacts_search branch from 39d98cd to 7ee97f5 Compare July 30, 2020 13:46
@georgehrke
Copy link
Member Author

@skjnldsv Can i hand this PR over to you?
It's done except for the deep linking to the Contacts app, which requires a new route.

@georgehrke georgehrke force-pushed the feature/20919/contacts_search branch from 7ee97f5 to 6887d48 Compare July 30, 2020 13:50
@skjnldsv
Copy link
Member

Awesome thanks :)

@skjnldsv skjnldsv self-assigned this Jul 30, 2020
@skjnldsv skjnldsv force-pushed the feature/20919/contacts_search branch from 7357ef4 to 29fbfa9 Compare August 3, 2020 09:41
@skjnldsv skjnldsv added 3. to review Waiting for reviews and removed 2. developing Work in progress labels Aug 3, 2020
@skjnldsv skjnldsv force-pushed the feature/20919/contacts_search branch 2 times, most recently from 46b9c5c to 0e50084 Compare August 3, 2020 12:30
@skjnldsv skjnldsv force-pushed the feature/20919/contacts_search branch from 0e50084 to 8aadd0a Compare August 3, 2020 12:43
@skjnldsv
Copy link
Member

skjnldsv commented Aug 3, 2020

Done @georgehrke

@georgehrke
Copy link
Member Author

Can't approve, because i created this PR, but 👍

@skjnldsv skjnldsv force-pushed the feature/20919/contacts_search branch from 8aadd0a to 55ee612 Compare August 3, 2020 12:48
@skjnldsv skjnldsv added 4. to release Ready to be released and/or waiting for tests to finish feature: dav feature: search and removed 3. to review Waiting for reviews labels Aug 3, 2020
@skjnldsv skjnldsv mentioned this pull request Aug 3, 2020
23 tasks
@skjnldsv skjnldsv force-pushed the feature/20919/contacts_search branch from 55ee612 to 5fb2562 Compare August 3, 2020 14:29
@skjnldsv
Copy link
Member

skjnldsv commented Aug 3, 2020

1) OCA\DAV\Tests\unit\ContactsSearchProviderTest::testGetId
259 | Failed asserting that two strings are equal.
260 | --- Expected
261 | +++ Actual
262 | @@ @@
263 | -'dav-contacts'
264 | +'contacts-dav'
265 |  
266 | /drone/src/apps/dav/tests/unit/Search/ContactsSearchProviderTest.php:91

Fixed

@faily-bot
Copy link

faily-bot bot commented Aug 3, 2020

🤖 beep boop beep 🤖

Here are the logs for the failed build:

Status of 31318: failure

acceptance-app-files-sharing

  • tests/acceptance/features/app-files-sharing.feature:23
Show full log
  Scenario: share a file with another user that needs to accept shares        # /drone/src/tests/acceptance/features/app-files-sharing.feature:23
    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()
    And I visit the settings page                                             # SettingsMenuContext::iVisitTheSettingsPage()
    And I open the "Sharing" section                                          # AppNavigationContext::iOpenTheSection()
    And I disable accepting the shares by default                             # SettingsContext::iDisableAcceptingTheSharesByDefault()
    And I see that shares are not accepted by default                         # SettingsContext::iSeeThatSharesAreNotAcceptedByDefault()
    And I act as John                                                         # ActorContext::iActAs()
    And I rename "welcome.txt" to "farewell.txt"                              # FileListContext::iRenameTo()
    And I see that the file list contains a file named "farewell.txt"         # FileListContext::iSeeThatTheFileListContainsAFileNamed()
    When I share "farewell.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 see that the file list does not contain a file named "farewell.txt" # FileListContext::iSeeThatTheFileListDoesNotContainAFileNamed()
    And I accept the share for "/farewell.txt" in the notifications           # NotificationsContext::iAcceptTheShareForInTheNotifications()
      Notifications button in the header could not be found after 100 seconds (NoSuchElementException)
    And I open the Files app                                                  # FilesAppContext::iOpenTheFilesApp()
    Then I see that the file list contains a file named "farewell.txt"        # FileListContext::iSeeThatTheFileListContainsAFileNamed()
    And I open the details view for "farewell.txt"                            # FileListContext::iOpenTheDetailsViewFor()
    And I see that the details view is open                                   # FilesAppContext::iSeeThatTheDetailsViewIsOpen()
    And I open the "Sharing" tab in the details view                          # FilesAppContext::iOpenTheTabInTheDetailsView()
    And I see that the "Sharing" tab in the details view is eventually loaded # FilesAppContext::iSeeThatTheTabInTheDetailsViewIsEventuallyLoaded()
    And I see that the file is shared with me by "admin"                      # FilesAppSharingContext::iSeeThatTheFileIsSharedWithMeBy()

@skjnldsv skjnldsv merged commit 03778d6 into master Aug 3, 2020
@skjnldsv skjnldsv deleted the feature/20919/contacts_search branch August 3, 2020 16:17
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: dav feature: search

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Unified search for addressbooks / contacts

4 participants