From 1813fbf910a1c966ecf970599ceba500808d68a4 Mon Sep 17 00:00:00 2001 From: Walmyr Lima Date: Fri, 6 Sep 2019 18:06:08 +0200 Subject: [PATCH 1/4] Update view for testability --- app/views/shared/issuable/_sidebar.html.haml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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') From c63c86fbf1972459b1b378c02dd057c07c5c5c64 Mon Sep 17 00:00:00 2001 From: Walmyr Lima Date: Fri, 6 Sep 2019 18:07:52 +0200 Subject: [PATCH 2/4] Update page object with new element and method --- qa/qa/page/project/issue/show.rb | 5 +++++ 1 file changed, 5 insertions(+) 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) From fce0bf4ab7896852df364ebecee50fe0935fb23a Mon Sep 17 00:00:00 2001 From: Walmyr Lima Date: Fri, 6 Sep 2019 18:09:18 +0200 Subject: [PATCH 3/4] Prepend ee page object on its counterpart --- qa/qa/page/project/milestone/index.rb | 2 ++ 1 file changed, 2 insertions(+) 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') From 404950f1cd40339ff732a2e8ba007ff52adb5be2 Mon Sep 17 00:00:00 2001 From: Walmyr Lima Date: Fri, 6 Sep 2019 18:10:19 +0200 Subject: [PATCH 4/4] Update issue resource to allow for adding weight --- qa/qa/resource/issue.rb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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