Download as
Browse Code »

Commit 09d5868c2286f927ce2cc23dfcc2c446723985b3

Authored by Dmitriy Zaporozhets
1 parent 0de6e2da
Exists in spb-stable and in 3 other branches 6-8-stable, 7-0-stable, 7-0-stable-spb

Fix mr controller specs 

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Showing 2 changed files with 7 additions and 6 deletions   Show diff stats
app/models/merge_request.rb
  Diff comments   View file @09d5868
... ... @@ -214,8 +214,8 @@ class MergeRequest &lt; ActiveRecord::Base
214 214 self.merge
215 215 end
216 216  
217   - def automerge!(current_user, merge_commit_message = nil)
218   - if Gitlab::Satellite::MergeAction.new(current_user, self).merge!(merge_commit_message) && self.unmerged_commits.empty?
  217 + def automerge!(current_user, commit_message = nil)
  218 + if Gitlab::Satellite::MergeAction.new(current_user, self).merge!(commit_message) && self.unmerged_commits.empty?
219 219 self.merge!(current_user.id)
220 220 true
221 221 end
... ... @@ -322,9 +322,10 @@ class MergeRequest &lt; ActiveRecord::Base
322 322 def merge_commit_message
323 323 message = "Merge branch '#{source_branch}' into '#{target_branch}'"
324 324 message << "\n\n"
325   - message << title
  325 + message << title.to_s
326 326 message << "\n\n"
327   - message << description
  327 + message << description.to_s
  328 + message
328 329 end
329 330  
330 331 private
... ...
spec/controllers/merge_requests_controller_spec.rb
  Diff comments   View file @09d5868
... ... @@ -3,7 +3,7 @@ require &#39;spec_helper&#39;
3 3 describe Projects::MergeRequestsController do
4 4 let(:project) { create(:project_with_code) }
5 5 let(:user) { create(:user) }
6   - let(:merge_request) { create(:merge_request_with_diffs, target_project: project, source_project: project, target_branch: "bcf03b5d~3", source_branch: "bcf03b5d") }
  6 + let(:merge_request) { create(:merge_request_with_diffs, target_project: project, source_project: project, target_branch: "stable", source_branch: "master") }
7 7  
8 8 before do
9 9 sign_in(user)
... ... @@ -61,7 +61,7 @@ describe Projects::MergeRequestsController do
61 61 it "should really be a git email patch with commit" do
62 62 get :show, project_id: project.to_param, id: merge_request.iid, format: format
63 63  
64   - expect(response.body[0..100]).to start_with("From #{merge_request.commits.last.id}")
  64 + expect(response.body[0..100]).to start_with("From 6ea87c47f0f8a24ae031c3fff17bc913889ecd00")
65 65 end
66 66  
67 67 it "should contain git diffs" do
... ...