Download as
Browse Code »

Commit c31b703110620c438d724561ab6d5a5a44b08e19

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

Fix tests that dont respect project-fork relation 

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Showing 2 changed files with 5 additions and 5 deletions   Show diff stats
spec/finders/merge_requests_finder_spec.rb
  Diff comments   View file @c31b703
... ... @@ -5,10 +5,10 @@ describe MergeRequestsFinder do
5 5 let(:user2) { create :user }
6 6  
7 7 let(:project1) { create(:project) }
8   - let(:project2) { create(:project) }
  8 + let(:project2) { create(:project, forked_from_project: project1) }
9 9  
10   - let!(:merge_request1) { create(:merge_request, :simple, author: user, source_project: project1, target_project: project2) }
11   - let!(:merge_request2) { create(:merge_request, :simple, author: user, source_project: project2, target_project: project1) }
  10 + let!(:merge_request1) { create(:merge_request, :simple, author: user, source_project: project2, target_project: project1) }
  11 + let!(:merge_request2) { create(:merge_request, :simple, author: user, source_project: project2, target_project: project1, state: 'closed') }
12 12 let!(:merge_request3) { create(:merge_request, :simple, author: user, source_project: project2, target_project: project2) }
13 13  
14 14 before do
... ... @@ -21,7 +21,7 @@ describe MergeRequestsFinder do
21 21 it 'should filter by scope' do
22 22 params = { scope: 'authored', state: 'opened' }
23 23 merge_requests = MergeRequestsFinder.new.execute(user, params)
24   - merge_requests.size.should == 3
  24 + merge_requests.size.should == 2
25 25 end
26 26  
27 27 it 'should filter by project' do
... ...
spec/models/note_spec.rb
  Diff comments   View file @c31b703
... ... @@ -209,7 +209,7 @@ describe Note do
209 209 let(:project) { create(:project) }
210 210 let(:author) { create(:user) }
211 211 let(:issue) { create(:issue, project: project) }
212   - let(:mergereq) { create(:merge_request, target_project: project) }
  212 + let(:mergereq) { create(:merge_request, :simple, target_project: project, source_project: project) }
213 213 let(:commit) { project.repository.commit }
214 214  
215 215 # Test all of {issue, merge request, commit} in both the referenced and referencing
... ...