Download as
Browse Code »

Commit a90574fab290233225375b1c9e9c232b0e540b52

Authored by Robert Speicher
1 parent 53d3294d
Exists in spb-stable and in 3 other branches 6-8-stable, 7-0-stable, 7-0-stable-spb

Speed up finders/merge_requests_finder_spec 

Uses the :simple merge request factory trait introduced by d166e70; cuts
execution time of this spec in half.
Showing 1 changed file with 7 additions and 11 deletions   Show diff stats
spec/finders/merge_requests_finder_spec.rb
  Diff comments   View file @a90574f
1 require 'spec_helper' 1 require 'spec_helper'
2 2
3 describe MergeRequestsFinder do 3 describe MergeRequestsFinder do
4 - let(:user) { create :user } 4 + let(:user) { create :user }
5 let(:user2) { create :user } 5 let(:user2) { create :user }
  6 +
6 let(:project1) { create(:project) } 7 let(:project1) { create(:project) }
7 let(:project2) { create(:project) } 8 let(:project2) { create(:project) }
8 - let(:merge_request1) { create(:merge_request, author: user, source_project: project1, target_project: project2) }  
9 - let(:merge_request2) { create(:merge_request, author: user, source_project: project2, target_project: project1) }  
10 - let(:merge_request3) { create(:merge_request, author: user, source_project: project2, target_project: project2) } 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) }
  12 + let!(:merge_request3) { create(:merge_request, :simple, author: user, source_project: project2, target_project: project2) }
11 13
12 before do 14 before do
13 project1.team << [user, :master] 15 project1.team << [user, :master]
@@ -15,13 +17,7 @@ describe MergeRequestsFinder do @@ -15,13 +17,7 @@ describe MergeRequestsFinder do
15 project2.team << [user2, :developer] 17 project2.team << [user2, :developer]
16 end 18 end
17 19
18 - describe :execute do  
19 - before :each do  
20 - merge_request1  
21 - merge_request2  
22 - merge_request3  
23 - end  
24 - 20 + describe "#execute" do
25 it 'should filter by scope' do 21 it 'should filter by scope' do
26 params = { scope: 'authored', state: 'opened' } 22 params = { scope: 'authored', state: 'opened' }
27 merge_requests = MergeRequestsFinder.new.execute(user, params) 23 merge_requests = MergeRequestsFinder.new.execute(user, params)