diff options
author | Ian Baum <ibaum@gitlab.com> | 2018-02-12 20:21:32 +0000 |
---|---|---|
committer | Ian Baum <ibaum@gitlab.com> | 2018-02-12 20:21:32 +0000 |
commit | 07ccc89cdf70abdbb97327f78a04c8374eff50c5 (patch) | |
tree | 599ce1f90a6576e7b6cd11b4e240a9933111dfd8 /spec/lib | |
parent | 0c3722711eef68255b4ded94ff88d05d999f73cc (diff) | |
parent | 04b642889a0459ff38cca043c5898ba4647d2fc6 (diff) | |
download | gitlab-ce-07ccc89cdf70abdbb97327f78a04c8374eff50c5.tar.gz |
Merge branch 'sh-disable-query-limiter' into 'master'
Disable query limiting warnings for now on GitLab.com
See merge request gitlab-org/gitlab-ce!17067
Diffstat (limited to 'spec/lib')
-rw-r--r-- | spec/lib/gitlab/query_limiting_spec.rb | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/spec/lib/gitlab/query_limiting_spec.rb b/spec/lib/gitlab/query_limiting_spec.rb index 2eddab0b8c3..42877b1e2dd 100644 --- a/spec/lib/gitlab/query_limiting_spec.rb +++ b/spec/lib/gitlab/query_limiting_spec.rb @@ -12,14 +12,16 @@ describe Gitlab::QueryLimiting do expect(described_class.enable?).to eq(true) end - it 'returns true on GitLab.com' do + it 'returns false on GitLab.com' do + expect(Rails.env).to receive(:development?).and_return(false) + expect(Rails.env).to receive(:test?).and_return(false) allow(Gitlab).to receive(:com?).and_return(true) - expect(described_class.enable?).to eq(true) + expect(described_class.enable?).to eq(false) end - it 'returns true in a non GitLab.com' do - expect(Gitlab).to receive(:com?).and_return(false) + it 'returns false in a non GitLab.com' do + allow(Gitlab).to receive(:com?).and_return(false) expect(Rails.env).to receive(:development?).and_return(false) expect(Rails.env).to receive(:test?).and_return(false) |