diff options
author | Walmyr Lima e Silva Filho <walmyr@gitlab.com> | 2019-09-06 16:48:55 +0000 |
---|---|---|
committer | Walmyr Lima e Silva Filho <walmyr@gitlab.com> | 2019-09-06 16:48:55 +0000 |
commit | fade24e959839bfbfef1508438d79ad4134474ff (patch) | |
tree | 457f538cfd9ec63720d3b56d9f7ade26efc4dee7 | |
parent | 05df1b6d23260b54760ddba4dc9039e3af52f8dc (diff) | |
parent | 89eb449fc96473e5b45cc83cb000650cdb07a809 (diff) | |
download | gitlab-ce-fade24e959839bfbfef1508438d79ad4134474ff.tar.gz |
Merge branch 'qa/e2e-tests-for-multiple-boards-on-group-level' into 'master'
Update view for testability
See merge request gitlab-org/gitlab-ce!32644
-rw-r--r-- | app/assets/javascripts/boards/components/boards_selector.vue | 1 | ||||
-rw-r--r-- | app/views/layouts/nav/sidebar/_group.html.haml | 6 |
2 files changed, 4 insertions, 3 deletions
diff --git a/app/assets/javascripts/boards/components/boards_selector.vue b/app/assets/javascripts/boards/components/boards_selector.vue index 7296426549a..ebb2f5b23e4 100644 --- a/app/assets/javascripts/boards/components/boards_selector.vue +++ b/app/assets/javascripts/boards/components/boards_selector.vue @@ -245,6 +245,7 @@ export default { <div v-if="!loading" ref="content" + data-qa-selector="boards_dropdown_content" class="dropdown-content flex-fill" @scroll.passive="throttledSetScrollFade" > diff --git a/app/views/layouts/nav/sidebar/_group.html.haml b/app/views/layouts/nav/sidebar/_group.html.haml index c1f4b3adfec..7cc7d1783c4 100644 --- a/app/views/layouts/nav/sidebar/_group.html.haml +++ b/app/views/layouts/nav/sidebar/_group.html.haml @@ -48,14 +48,14 @@ - if group_sidebar_link?(:issues) = nav_link(path: group_issues_sub_menu_items) do - = link_to issues_group_path(@group) do + = link_to issues_group_path(@group), data: { qa_selector: 'group_issues_item' } do .nav-icon-container = sprite_icon('issues') %span.nav-item-name = _('Issues') %span.badge.badge-pill.count= number_with_delimiter(issues_count) - %ul.sidebar-sub-level-items + %ul.sidebar-sub-level-items{ data: { qa_selector: 'group_issues_sidebar_submenu'} } = nav_link(path: ['groups#issues', 'labels#index', 'milestones#index'], html_options: { class: "fly-out-top-item" } ) do = link_to issues_group_path(@group) do %strong.fly-out-top-item-name @@ -70,7 +70,7 @@ - if group_sidebar_link?(:boards) = nav_link(path: ['boards#index', 'boards#show']) do - = link_to group_boards_path(@group), title: boards_link_text do + = link_to group_boards_path(@group), title: boards_link_text, data: { qa_selector: 'group_issue_boards_link' } do %span = boards_link_text |