diff options
author | John Cai <jcai@gitlab.com> | 2019-07-02 10:48:13 -0700 |
---|---|---|
committer | John Cai <jcai@gitlab.com> | 2019-07-02 17:07:33 -0700 |
commit | 2ceffce190165321a1818801e245456870c4708a (patch) | |
tree | c9ed1afe9b18c24f56bc92d2efcfe7abe3c745d2 /spec/services/branches | |
parent | c6861b189b7faaf385bd397fd41ba93ed5649f25 (diff) | |
download | gitlab-ce-2ceffce190165321a1818801e245456870c4708a.tar.gz |
Deprecate diverging commit count with max parameterjc-deprecate-diverging-count-with-max
In 12.0, we turned the feature flag on that effectively turned off the
--max-count flag for the count diverging commits call. Since we have
commit graphs turned on, this did not affect preformance negatively.
Thus, we want to deprecate the call that passes --max-count
Diffstat (limited to 'spec/services/branches')
-rw-r--r-- | spec/services/branches/diverging_commit_counts_service_spec.rb | 33 |
1 files changed, 6 insertions, 27 deletions
diff --git a/spec/services/branches/diverging_commit_counts_service_spec.rb b/spec/services/branches/diverging_commit_counts_service_spec.rb index bfdbebdb7c1..370da773ab2 100644 --- a/spec/services/branches/diverging_commit_counts_service_spec.rb +++ b/spec/services/branches/diverging_commit_counts_service_spec.rb @@ -19,34 +19,13 @@ describe Branches::DivergingCommitCountsService do expect(result).to eq(behind: 29, ahead: 2) end - context 'when gitaly_count_diverging_commits_no_max is enabled' do - before do - stub_feature_flags(gitaly_count_diverging_commits_no_max: true) - end - - it 'calls diverging_commit_count without max count' do - expect(repository.raw_repository) - .to receive(:diverging_commit_count) - .with(root_ref_sha, diverged_branch_sha) - .and_return([29, 2]) - - service.call(diverged_branch) - end - end - - context 'when gitaly_count_diverging_commits_no_max is disabled' do - before do - stub_feature_flags(gitaly_count_diverging_commits_no_max: false) - end - - it 'calls diverging_commit_count with max count' do - expect(repository.raw_repository) - .to receive(:diverging_commit_count) - .with(root_ref_sha, diverged_branch_sha, max_count: Repository::MAX_DIVERGING_COUNT) - .and_return([29, 2]) + it 'calls diverging_commit_count without max count' do + expect(repository.raw_repository) + .to receive(:diverging_commit_count) + .with(root_ref_sha, diverged_branch_sha) + .and_return([29, 2]) - service.call(diverged_branch) - end + service.call(diverged_branch) end end end |