Download as
Browse Code »

Commit db10e6aaa6e592bd6ebca94d7fc879da26079826

Authored by Dmitriy Zaporozhets
1 parent eb7072de
Exists in master and in 4 other branches 6-8-stable, 7-0-stable, 7-0-stable-spb, spb-stable

Fix merge request model spec

Showing 1 changed file with 2 additions and 2 deletions   Show diff stats
spec/models/merge_request_spec.rb
  Diff comments   View file @db10e6a
... ... @@ -49,8 +49,8 @@ describe MergeRequest do
49 49  
50 50 before do
51 51 merge_request.stub(:commits) { [merge_request.source_project.repository.commit] }
52   - create(:note, commit_id: merge_request.commits.first.id, noteable_type: 'Commit')
53   - create(:note, noteable: merge_request)
  52 + create(:note, commit_id: merge_request.commits.first.id, noteable_type: 'Commit', project: merge_request.project)
  53 + create(:note, noteable: merge_request, project: merge_request.project)
54 54 end
55 55  
56 56 it "should include notes for commits" do
... ...