summaryrefslogtreecommitdiff
path: root/qa/qa/resource/merge_request.rb
diff options
context:
space:
mode:
Diffstat (limited to 'qa/qa/resource/merge_request.rb')
-rw-r--r--qa/qa/resource/merge_request.rb10
1 files changed, 9 insertions, 1 deletions
diff --git a/qa/qa/resource/merge_request.rb b/qa/qa/resource/merge_request.rb
index fd5f454f134..fb450a61c9a 100644
--- a/qa/qa/resource/merge_request.rb
+++ b/qa/qa/resource/merge_request.rb
@@ -75,7 +75,7 @@ module QA
Page::MergeRequest::New.perform do |new_page|
new_page.fill_title(@title)
new_page.choose_template(@template) if @template
- new_page.fill_description(@description) unless @template
+ new_page.fill_description(@description) if @description && !@template
new_page.choose_milestone(@milestone) if @milestone
new_page.assign_to_me if @assignee == 'me'
labels.each do |label|
@@ -140,6 +140,14 @@ module QA
end
end
+ def reload!
+ # Refabricate so that we can return a new object with updated attributes
+ self.class.fabricate_via_api! do |resource|
+ resource.project = project
+ resource.id = api_resource[:iid]
+ end
+ end
+
private
def transform_api_resource(api_resource)