diff options
Diffstat (limited to 'spec/finders/context_commits_finder_spec.rb')
-rw-r--r-- | spec/finders/context_commits_finder_spec.rb | 21 |
1 files changed, 12 insertions, 9 deletions
diff --git a/spec/finders/context_commits_finder_spec.rb b/spec/finders/context_commits_finder_spec.rb index c22675bc67d..3de1d29b695 100644 --- a/spec/finders/context_commits_finder_spec.rb +++ b/spec/finders/context_commits_finder_spec.rb @@ -26,27 +26,30 @@ RSpec.describe ContextCommitsFinder do end it 'returns commits based in author filter' do - params = { search: 'test text', author: 'Job van der Voort' } + params = { author: 'Job van der Voort' } commits = described_class.new(project, merge_request, params).execute expect(commits.length).to eq(1) expect(commits[0].id).to eq('b83d6e391c22777fca1ed3012fce84f633d7fed0') end - it 'returns commits based in before filter' do - params = { search: 'test text', committed_before: 1474828200 } + it 'returns commits based in committed before and after filter' do + params = { committed_before: 1471631400, committed_after: 1471458600 } # August 18, 2016 - # August 20, 2016 commits = described_class.new(project, merge_request, params).execute - expect(commits.length).to eq(1) - expect(commits[0].id).to eq('498214de67004b1da3d820901307bed2a68a8ef6') + expect(commits.length).to eq(2) + expect(commits[0].id).to eq('1b12f15a11fc6e62177bef08f47bc7b5ce50b141') + expect(commits[1].id).to eq('38008cb17ce1466d8fec2dfa6f6ab8dcfe5cf49e') end - it 'returns commits based in after filter' do - params = { search: 'test text', committed_after: 1474828200 } - commits = described_class.new(project, merge_request, params).execute + it 'returns commits from target branch if no filter is applied' do + expect(project.repository).to receive(:commits).with(merge_request.target_branch, anything).and_call_original - expect(commits.length).to eq(1) + commits = described_class.new(project, merge_request).execute + + expect(commits.length).to eq(37) expect(commits[0].id).to eq('b83d6e391c22777fca1ed3012fce84f633d7fed0') + expect(commits[1].id).to eq('498214de67004b1da3d820901307bed2a68a8ef6') end end end |