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

[stable15] prevent recursion when moving a file to the trashbin #14661

Merged
merged 1 commit into from Mar 13, 2019

Conversation

Projects
None yet
3 participants
@backportbot-nextcloud
Copy link

backportbot-nextcloud bot commented Mar 13, 2019

backport of #14656

prevent recursion when moving a file to the trashbin
Signed-off-by: Robin Appelman <robin@icewind.nl>
@MorrisJobke
Copy link
Member

MorrisJobke left a comment

Code makes sense 👍

@faily-bot

This comment has been minimized.

Copy link

faily-bot bot commented Mar 13, 2019

🤖 beep boop beep 🤖

Here are the logs for the failed build:

Status of 16965: failure

TESTS=acceptance, TESTS-ACCEPTANCE=app-comments

  • cancelled - typically means that the tests took longer than the drone CI allows them to run

TESTS=acceptance, TESTS-ACCEPTANCE=app-files

  • cancelled - typically means that the tests took longer than the drone CI allows them to run

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

  • cancelled - typically means that the tests took longer than the drone CI allows them to run

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

  • tests/acceptance/features/app-files-tags.feature:42
Show full log
  Scenario: add tags using the dropdown in the details view                                 # /drone/src/github.com/nextcloud/server/tests/acceptance/features/app-files-tags.feature:42
    Given I am logged in as the admin                                                       # LoginPageContext::iAmLoggedInAsTheAdmin()
    And I visit the settings page                                                           # SettingsMenuContext::iVisitTheSettingsPage()
    And I open the "Workflow" 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()
    When 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()
    Then I see that the tag "tag2" in the dropdown for tags in the details view is checked  # FilesAppContext::iSeeThatTheTagInTheDropdownForTagsInTheDetailsViewIsChecked()
    And I see that the tag "tag4" 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 contains the tag "tag2"     # FilesAppContext::iSeeThatTheInputFieldForTagsInTheDetailsViewContainsTheTag()
      Failed asserting that false is true.
    And I see that the input field for tags in the details view contains the tag "tag4"     # FilesAppContext::iSeeThatTheInputFieldForTagsInTheDetailsViewContainsTheTag()

TESTS=acceptance, TESTS-ACCEPTANCE=apps

  • tests/acceptance/features/apps.feature:83
Show full log
  Scenario: Install an app from the app store                     # /drone/src/github.com/nextcloud/server/tests/acceptance/features/apps.feature:83
    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)
    And I click on the "Antivirus for files" app                  # AppsManagementContext::iClickOnTheApp()
    And I see that the app details are shown                      # AppsManagementContext::iSeeThatTheAppDetailsAreShown()
    Then I download and enable the "Antivirus for files" app      # AppsManagementContext::iDownloadAndEnableTheApp()
    And I see that the "Antivirus for files" app has been enabled # AppsManagementContext::iSeeThatTheAppHasBeenEnabled()

@rullzer rullzer merged commit cdb3602 into stable15 Mar 13, 2019

1 check failed

continuous-integration/drone/pr the build failed
Details

@rullzer rullzer deleted the backport/14656/stable15 branch Mar 13, 2019

@rullzer rullzer referenced this pull request Mar 29, 2019

Merged

15.0.6 RC 1 #14909

1 of 1 task complete
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.