diff options
author | Rémy Coutable <remy@rymai.me> | 2019-08-22 17:56:41 +0300 |
---|---|---|
committer | Rémy Coutable <remy@rymai.me> | 2019-08-22 17:56:41 +0300 |
commit | 9f6ff5dca286b99a960e923efa5a24030de462ec (patch) | |
tree | 8cde22219b186ce30894e13e3b628985034db12c /qa | |
parent | 49e3e0429688aab38eca6214e18e9e4c5c5cc6a5 (diff) | |
parent | 126219850ef9e1016fa6c39e905745fb697aac09 (diff) |
Merge branch 'qa/issue-boards-e2e-tests' into 'master'
Backport of EE MR
See merge request gitlab-org/gitlab-ce!31903
Diffstat (limited to 'qa')
-rw-r--r-- | qa/qa/resource/issue.rb | 6 | ||||
-rw-r--r-- | qa/qa/resource/label.rb | 1 |
2 files changed, 5 insertions, 2 deletions
diff --git a/qa/qa/resource/issue.rb b/qa/qa/resource/issue.rb index 51b2af8b4ef..16ab59352f3 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 + attr_writer :description, :milestone attribute :project do Project.fabricate! do |resource| @@ -44,7 +44,9 @@ module QA { labels: labels, title: title - } + }.tap do |hash| + hash[:milestone_id] = @milestone.id if @milestone + end end end end diff --git a/qa/qa/resource/label.rb b/qa/qa/resource/label.rb index 3750725c440..b5e88d8aefc 100644 --- a/qa/qa/resource/label.rb +++ b/qa/qa/resource/label.rb @@ -7,6 +7,7 @@ module QA class Label < Base attr_accessor :description, :color + attribute :id attribute :title attribute :project do |