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

Display breadcrumb if rootFolder is set with no value #2811

Merged
merged 1 commit into from
Jan 7, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion apps/files/src/components/FilesAppBar.vue
Original file line number Diff line number Diff line change
Expand Up @@ -255,7 +255,7 @@ export default {
})
: []

if (rootFolder !== '/') {
if (rootFolder && rootFolder !== '/') {
pathSplit.splice(0, 1)
baseUrl = `/files/list/${rootFolder}%2F`
}
Expand Down
6 changes: 2 additions & 4 deletions tests/acceptance/features/webUIFiles/breadcrumb.feature
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,11 @@ Feature: access breadcrumb
Background:
Given user "user1" has been created with default attributes

@issue-2538
Scenario: Check breadCrumb for folder one level below the root folder when rootFolder is set
Scenario: Check breadCrumb for folder one level below the root folder when rootFolder is set with no value
Given the property "rootFolder" has been set to "" in phoenix config file
And user "user1" has logged in using the webUI
When the user opens folder "simple-folder" using the webUI
# Then breadcrumb for folder "simple-folder" should be displayed on the webUI
Then there should be no breadcrumb displayed on the webUI
Then breadcrumb for folder "simple-folder" should be displayed on the webUI
When the user opens folder "simple-empty-folder" using the webUI
Copy link
Contributor Author

Choose a reason for hiding this comment

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

@haribhandari07 Should we still keep also the steps for "simple-empty-folder"? Or was it only temporarily until the issue is solved?

Copy link
Contributor

Choose a reason for hiding this comment

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

@LukasHirt I think we can remove steps for simple-empty-folder as the scenario is only for folder one level below the root folder

Then breadcrumb for folder "simple-empty-folder" should be displayed on the webUI

Expand Down