summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGabriel Mazetto <brodock@gmail.com>2018-07-10 01:19:32 +0200
committerGabriel Mazetto <brodock@gmail.com>2018-07-10 01:22:12 +0200
commit7accc6976453bf4fe17c6d8881ad47337587ea01 (patch)
treebf161987d2a95ef74e0e7611abe3f40a4f0d9c36
parent067ac430cef8d6a12010fac6594a72b9bf331c40 (diff)
downloadgitlab-ce-48967-disable-statement-timeout.tar.gz
Fix migration_helpers_spec48967-disable-statement-timeout
-rw-r--r--spec/lib/gitlab/database/migration_helpers_spec.rb3
1 files changed, 2 insertions, 1 deletions
diff --git a/spec/lib/gitlab/database/migration_helpers_spec.rb b/spec/lib/gitlab/database/migration_helpers_spec.rb
index c993fa12803..28a03e6f6f6 100644
--- a/spec/lib/gitlab/database/migration_helpers_spec.rb
+++ b/spec/lib/gitlab/database/migration_helpers_spec.rb
@@ -48,7 +48,7 @@ describe Gitlab::Database::MigrationHelpers do
allow(model).to receive(:transaction_open?).and_return(false)
end
- context 'using PostgreSQL' do
+ context 'using PostgreSQL', :postgresql do
before do
allow(Gitlab::Database).to receive(:postgresql?).and_return(true)
allow(model).to receive(:disable_statement_timeout).and_call_original
@@ -224,6 +224,7 @@ describe Gitlab::Database::MigrationHelpers do
context 'using PostgreSQL' do
before do
+ allow(Gitlab::Database).to receive(:postgresql?).and_return(true)
allow(Gitlab::Database).to receive(:mysql?).and_return(false)
end