diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-08-30 12:09:12 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-08-30 12:09:12 +0300 |
commit | 4ac9f1b8eaef29daa484b27a3113505cfa6a6dcb (patch) | |
tree | bda090fb8cf7c97765ee891bd58f7f9ee4271301 /spec/support_specs/database | |
parent | abbedc2027e64b11b03be4639411f1943b81f7ce (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, 9 insertions, 1 deletions
diff --git a/spec/support_specs/database/prevent_cross_joins_spec.rb b/spec/support_specs/database/prevent_cross_joins_spec.rb index b26b862b34b..dd4ed9c40b8 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 a default scope' do + context 'when running in :prevent_cross_joins scope', :prevent_cross_joins 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,6 +32,14 @@ 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 |