diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-08-31 09:08:50 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-08-31 09:08:50 +0300 |
commit | 8d15913bc406fea50faf8f80abf129e2e9a5f847 (patch) | |
tree | cd4e2e3c9549a5cfe1a514073ff01a284945ded2 /spec/support_specs/database | |
parent | 854fe23e65f5bc867a8538fc73e6fee0a6efd592 (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/support_specs/database')
-rw-r--r-- | spec/support_specs/database/prevent_cross_joins_spec.rb | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/spec/support_specs/database/prevent_cross_joins_spec.rb b/spec/support_specs/database/prevent_cross_joins_spec.rb index dd4ed9c40b8..b26b862b34b 100644 --- a/spec/support_specs/database/prevent_cross_joins_spec.rb +++ b/spec/support_specs/database/prevent_cross_joins_spec.rb @@ -3,7 +3,7 @@ require 'spec_helper' RSpec.describe Database::PreventCrossJoins do - context 'when running in :prevent_cross_joins scope', :prevent_cross_joins do + context 'when running in a default scope' do context 'when only non-CI tables are used' do it 'does not raise exception' do expect { main_only_query }.not_to raise_error @@ -32,14 +32,6 @@ RSpec.describe Database::PreventCrossJoins do end end - context 'when running in a default scope' do - context 'when CI and non-CI tables are used' do - it 'does not raise exception' do - expect { main_and_ci_query }.not_to raise_error - end - end - end - private def main_only_query |