diff options
author | Walmyr Lima e Silva Filho <walmyr@gitlab.com> | 2019-09-09 22:06:39 +0000 |
---|---|---|
committer | Walmyr Lima e Silva Filho <walmyr@gitlab.com> | 2019-09-09 22:06:39 +0000 |
commit | 8ce331c206dd97bbfc672a554afb8bc0f8039983 (patch) | |
tree | f5b13cce17836e1f2fcf90448bf2265142175959 | |
parent | 71e44e7ce3e2b0359b13d417162cb5a483e27242 (diff) | |
parent | 404950f1cd40339ff732a2e8ba007ff52adb5be2 (diff) | |
download | gitlab-ce-8ce331c206dd97bbfc672a554afb8bc0f8039983.tar.gz |
Merge branch 'qa/e2e-tests-for-issue-weights' into 'master'
Backport of end-to-end test for visualizing issue weight on different pages
See merge request gitlab-org/gitlab-ce!32766
-rw-r--r-- | app/views/shared/issuable/_sidebar.html.haml | 2 | ||||
-rw-r--r-- | qa/qa/page/project/issue/show.rb | 5 | ||||
-rw-r--r-- | qa/qa/page/project/milestone/index.rb | 2 | ||||
-rw-r--r-- | qa/qa/resource/issue.rb | 3 |
4 files changed, 10 insertions, 2 deletions
diff --git a/app/views/shared/issuable/_sidebar.html.haml b/app/views/shared/issuable/_sidebar.html.haml index 837707707a9..3b26b8df8a1 100644 --- a/app/views/shared/issuable/_sidebar.html.haml +++ b/app/views/shared/issuable/_sidebar.html.haml @@ -41,7 +41,7 @@ = link_to _('Edit'), '#', class: 'js-sidebar-dropdown-toggle edit-link float-right', data: { track_label: "right_sidebar", track_property: "milestone", track_event: "click_edit_button", track_value: "" } .value.hide-collapsed - if milestone.present? - = link_to milestone[:title], milestone[:web_url], class: "bold has-tooltip", title: sidebar_milestone_remaining_days(milestone), data: { container: "body", html: 'true', boundary: 'viewport' } + = link_to milestone[:title], milestone[:web_url], class: "bold has-tooltip", title: sidebar_milestone_remaining_days(milestone), data: { container: "body", html: 'true', boundary: 'viewport', qa_selector: 'milestone_link' } - else %span.no-value = _('None') diff --git a/qa/qa/page/project/issue/show.rb b/qa/qa/page/project/issue/show.rb index 52929ece9ed..e5e26b1864b 100644 --- a/qa/qa/page/project/issue/show.rb +++ b/qa/qa/page/project/issue/show.rb @@ -35,12 +35,17 @@ module QA element :labels_block element :edit_link_labels element :dropdown_menu_labels + element :milestone_link end view 'app/views/shared/issuable/_close_reopen_button.html.haml' do element :reopen_issue_button end + def click_milestone_link + click_element(:milestone_link) + end + # Adds a comment to an issue # attachment option should be an absolute path def comment(text, attachment: nil, filter: :all_activities) diff --git a/qa/qa/page/project/milestone/index.rb b/qa/qa/page/project/milestone/index.rb index 6895c44f72f..8ad7689ce70 100644 --- a/qa/qa/page/project/milestone/index.rb +++ b/qa/qa/page/project/milestone/index.rb @@ -17,3 +17,5 @@ module QA end end end + +QA::Page::Project::Milestone::Index.prepend_if_ee('QA::EE::Page::Project::Milestone::Index') diff --git a/qa/qa/resource/issue.rb b/qa/qa/resource/issue.rb index 16ab59352f3..8539eaeb337 100644 --- a/qa/qa/resource/issue.rb +++ b/qa/qa/resource/issue.rb @@ -3,7 +3,7 @@ module QA module Resource class Issue < Base - attr_writer :description, :milestone + attr_writer :description, :milestone, :weight attribute :project do Project.fabricate! do |resource| @@ -46,6 +46,7 @@ module QA title: title }.tap do |hash| hash[:milestone_id] = @milestone.id if @milestone + hash[:weight] = @weight if @weight end end end |