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.

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

Remove Google+ federation usersettings #14583

Merged
merged 3 commits into from
Mar 8, 2019
Merged

Remove Google+ federation usersettings #14583

merged 3 commits into from
Mar 8, 2019

Conversation

MariusBluem
Copy link
Member

Since Google+ will shutdown soon, we should remove this before releasing Nextcloud 16.

@MariusBluem
Remove G+ icon from Federated Files Sharing-usersettings
500986f 
Signed-off-by: Marius Blüm <marius@lineone.io>
@MariusBluem
Remove G+ code from Federated Files Sharing-usersettings
bdad72d 
Signed-off-by: Marius Blüm <marius@lineone.io>
@MariusBluem MariusBluem added the 3. to review Waiting for reviews label Mar 7, 2019
@MariusBluem MariusBluem added this to the Nextcloud 16 milestone Mar 7, 2019
rullzer
rullzer approved these changes Mar 7, 2019
View reviewed changes
Copy link
Member

@rullzer rullzer left a comment

Choose a reason for hiding this comment

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

fine by me

@nickvergessen
Copy link
Member

CSS removal is missing

@MariusBluem
Remove G+ CSS rule (Feedback from Joas)
993e15b 
Signed-off-by: Marius Blüm <marius@lineone.io>
@faily-bot
Copy link

faily-bot bot commented Mar 7, 2019

🤖 beep boop beep 🤖

Here are the logs for the failed build:

Status of 16852: failure

DB=sqlite, ENABLE_REDIS=false, PHP=7.3

Show full log 
There was 1 failure:

1) TrashbinTest::testExpireOldFiles
Failed asserting that null is identical to 'file2.txt'.

/drone/src/github.com/nextcloud/server/apps/files_trashbin/tests/TrashbinTest.php:186

--

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:10
Show full log 
  Scenario: open the comments for a different file           # /drone/src/github.com/nextcloud/server/tests/acceptance/features/app-comments.feature:10
    Given I am logged in                                     # LoginPageContext::iAmLoggedIn()
    And I create a new folder named "Folder"                 # FileListContext::iCreateANewFolderNamed()
    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()
      Comment with text "Hello world" in details view in Files app could not be found after 100 seconds (NoSuchElementException)
    When I open the details view for "Folder"                # FileListContext::iOpenTheDetailsViewFor()

TESTS=acceptance, TESTS-ACCEPTANCE=app-files

  • tests/acceptance/features/app-files.feature:72
Show full log 
  Scenario: show recent files                                                 # /drone/src/github.com/nextcloud/server/tests/acceptance/features/app-files.feature:72
    Given I am logged in                                                      # LoginPageContext::iAmLoggedIn()
    And I create a new folder named "Folder just created"                     # FileListContext::iCreateANewFolderNamed()
    When I open the "Recent" section                                          # AppNavigationContext::iOpenTheSection()
    Then I see that the current section is "Recent"                           # AppNavigationContext::iSeeThatTheCurrentSectionIs()
    Then I see that the file list contains a file named "Folder just created" # FileListContext::iSeeThatTheFileListContainsAFileNamed()
      Row for file Folder just created in file list could not be found after 100 seconds (NoSuchElementException)

TESTS=acceptance, TESTS-ACCEPTANCE=app-files-tags

  • tests/acceptance/features/app-files-tags.feature:4
  • tests/acceptance/features/app-files-tags.feature:11
  • tests/acceptance/features/app-files-tags.feature:70
Show full log 
  Scenario: show the input field for tags in the details view             # /drone/src/github.com/nextcloud/server/tests/acceptance/features/app-files-tags.feature:4
    Given I am logged in                                                  # LoginPageContext::iAmLoggedIn()
    And I open the details view for "welcome.txt"                         # FileListContext::iOpenTheDetailsViewFor()
    And I see that the details view is open                               # FilesAppContext::iSeeThatTheDetailsViewIsOpen()
    When I open the input field for tags in the details view              # FilesAppContext::iOpenTheInputFieldForTagsInTheDetailsView()
    Then I see that the input field for tags in the details view is shown # FilesAppContext::iSeeThatTheInputFieldForTagsInTheDetailsViewIsShown()
      Failed asserting that false is true.

  Scenario: show the input field for tags in the details view after closing and opening the details view again # /drone/src/github.com/nextcloud/server/tests/acceptance/features/app-files-tags.feature:11
    Given I am logged in                                                                                       # LoginPageContext::iAmLoggedIn()
    And I open the details view for "welcome.txt"                                                              # FileListContext::iOpenTheDetailsViewFor()
    And I see that the details view is open                                                                    # FilesAppContext::iSeeThatTheDetailsViewIsOpen()
    And I close the details view                                                                               # FilesAppContext::iCloseTheDetailsView()
    And I see that the details view is closed                                                                  # FilesAppContext::iSeeThatTheDetailsViewIsClosed()
    And I open the details view for "welcome.txt"                                                              # FileListContext::iOpenTheDetailsViewFor()
    And I see that the details view is open                                                                    # FilesAppContext::iSeeThatTheDetailsViewIsOpen()
    When I open the input field for tags in the details view                                                   # FilesAppContext::iOpenTheInputFieldForTagsInTheDetailsView()
    Then I see that the input field for tags in the details view is shown                                      # FilesAppContext::iSeeThatTheInputFieldForTagsInTheDetailsViewIsShown()
      Failed asserting that false is true.

  Scenario: remove tags using the dropdown in the details view                                  # /drone/src/github.com/nextcloud/server/tests/acceptance/features/app-files-tags.feature:70
    Given I am logged in as the admin                                                           # LoginPageContext::iAmLoggedInAsTheAdmin()
    And I visit the settings page                                                               # SettingsMenuContext::iVisitTheSettingsPage()
    And I open the "Tag management" section                                                     # AppNavigationContext::iOpenTheSection()
    And I see that the button to select tags is shown                                           # SettingsContext::iSeeThatTheButtonToSelectTagsIsShown()
    And I create the tag "tag1" in the settings                                                 # SettingsContext::iCreateTheTagInTheSettings()
    And I create the tag "tag2" in the settings                                                 # SettingsContext::iCreateTheTagInTheSettings()
    And I create the tag "tag3" in the settings                                                 # SettingsContext::iCreateTheTagInTheSettings()
    And I create the tag "tag4" in the settings                                                 # SettingsContext::iCreateTheTagInTheSettings()
    And I see that the dropdown for tags in the settings eventually contains the tag "tag1"     # SettingsContext::iSeeThatTheDropdownForTagsInTheSettingsEventuallyContainsTheTag()
    And I see that the dropdown for tags in the settings eventually contains the tag "tag2"     # SettingsContext::iSeeThatTheDropdownForTagsInTheSettingsEventuallyContainsTheTag()
    And I see that the dropdown for tags in the settings eventually contains the tag "tag3"     # SettingsContext::iSeeThatTheDropdownForTagsInTheSettingsEventuallyContainsTheTag()
    And I see that the dropdown for tags in the settings eventually contains the tag "tag4"     # SettingsContext::iSeeThatTheDropdownForTagsInTheSettingsEventuallyContainsTheTag()
    And I log out                                                                               # SettingsMenuContext::iLogOut()
    And I am logged in                                                                          # LoginPageContext::iAmLoggedIn()
    And I open the details view for "welcome.txt"                                               # FileListContext::iOpenTheDetailsViewFor()
    And I open the input field for tags in the details view                                     # FilesAppContext::iOpenTheInputFieldForTagsInTheDetailsView()
    And I check the tag "tag2" in the dropdown for tags in the details view                     # FilesAppContext::iCheckTheTagInTheDropdownForTagsInTheDetailsView()
    And I check the tag "tag4" in the dropdown for tags in the details view                     # FilesAppContext::iCheckTheTagInTheDropdownForTagsInTheDetailsView()
    And I check the tag "tag3" in the dropdown for tags in the details view                     # FilesAppContext::iCheckTheTagInTheDropdownForTagsInTheDetailsView()
    When I uncheck the tag "tag2" in the dropdown for tags in the details view                  # FilesAppContext::iUncheckTheTagInTheDropdownForTagsInTheDetailsView()
    And I uncheck the tag "tag4" in the dropdown for tags in the details view                   # FilesAppContext::iUncheckTheTagInTheDropdownForTagsInTheDetailsView()
    Then I see that the tag "tag2" in the dropdown for tags in the details view is not checked  # FilesAppContext::iSeeThatTheTagInTheDropdownForTagsInTheDetailsViewIsNotChecked()
    And I see that the tag "tag4" in the dropdown for tags in the details view is not checked   # FilesAppContext::iSeeThatTheTagInTheDropdownForTagsInTheDetailsViewIsNotChecked()
    And I see that the tag "tag3" in the dropdown for tags in the details view is checked       # FilesAppContext::iSeeThatTheTagInTheDropdownForTagsInTheDetailsViewIsChecked()
    And I see that the input field for tags in the details view does not contain the tag "tag2" # FilesAppContext::iSeeThatTheInputFieldForTagsInTheDetailsViewDoesNotContainTheTag()
      Failed asserting that false is true.
    And I see that the input field for tags in the details view does not contain the tag "tag4" # FilesAppContext::iSeeThatTheInputFieldForTagsInTheDetailsViewDoesNotContainTheTag()
    And I see that the input field for tags in the details view contains the tag "tag3"         # FilesAppContext::iSeeThatTheInputFieldForTagsInTheDetailsViewContainsTheTag()

TESTS=acceptance, TESTS-ACCEPTANCE=login

  • tests/acceptance/features/login.feature:9
  • tests/acceptance/features/login.feature:15
  • tests/acceptance/features/login.feature:26
  • tests/acceptance/features/login.feature:38
Show full log 
  Scenario: try to log in with valid user and invalid password # /drone/src/github.com/nextcloud/server/tests/acceptance/features/login.feature:9
    Given I visit the Home page                                # FeatureContext::iVisitTheHomePage()
    When I log in with user user0 and password 654321          # LoginPageContext::iLogInWithUserAndPassword()
    Then I see that the current page is the Login page         # LoginPageContext::iSeeThatTheCurrentPageIsTheLoginPage()
    And I see that a wrong password message is shown           # LoginPageContext::iSeeThatAWrongPasswordMessageIsShown()
      Wrong password message in Login page could not be found after 100 seconds (NoSuchElementException)

  Scenario: log in with valid user and invalid password once fixed by admin # /drone/src/github.com/nextcloud/server/tests/acceptance/features/login.feature:15
    Given I act as John                                                     # ActorContext::iActAs()
    And I can not log in with user user0 and password 654231                # LoginPageContext::iCanNotLogInWithUserAndPassword()
      Wrong password message in Login page could not be found after 100 seconds (NoSuchElementException)
    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 set the password for user0 to 654321                              # UsersSettingsContext::iSetTheFieldForUserTo()
    And I act as John                                                       # ActorContext::iActAs()
    And I log in with user user0 and password 654321                        # LoginPageContext::iLogInWithUserAndPassword()
    Then I see that the current page is the Files app                       # FilesAppContext::iSeeThatTheCurrentPageIsTheFilesApp()

  Scenario: try to log in with invalid user                    # /drone/src/github.com/nextcloud/server/tests/acceptance/features/login.feature:26
    Given I visit the Home page                                # FeatureContext::iVisitTheHomePage()
    When I log in with user unknownUser and password 123456acb # LoginPageContext::iLogInWithUserAndPassword()
    Then I see that the current page is the Login page         # LoginPageContext::iSeeThatTheCurrentPageIsTheLoginPage()
    And I see that a wrong password message is shown           # LoginPageContext::iSeeThatAWrongPasswordMessageIsShown()
      Wrong password message in Login page could not be found after 100 seconds (NoSuchElementException)

  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()
      Wrong password message in Login page could not be found after 100 seconds (NoSuchElementException)
    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()

@MorrisJobke MorrisJobke merged commit 3f8235d into master Mar 8, 2019
@MorrisJobke MorrisJobke deleted the remove-g+-federation branch March 8, 2019 08:04
@MorrisJobke
Copy link
Member

/backport to stable15

@MorrisJobke
Copy link
Member

/backport to stable14

@backportbot-nextcloud
Copy link

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

@backportbot-nextcloud
Copy link

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

This was referenced Mar 20, 2019
Merged
Merged
Merged
@MorrisJobke
Copy link
Member

Backports in #14855 and #14856

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

@MorrisJobke MorrisJobke MorrisJobke approved these changes

@nickvergessen nickvergessen Awaiting requested review from nickvergessen

@schiessle schiessle Awaiting requested review from schiessle

Assignees
No one assigned
Labels
3. to review Waiting for reviews feature: federation
Projects
None yet
Milestone
Nextcloud 16
Development

Successfully merging this pull request may close these issues.
4 participants
@MariusBluem @nickvergessen @MorrisJobke @rullzer