Commit 660b9c45 authored by Stan Hu's avatar Stan Hu

Merge branch 'mk/fix-geo-tests' into 'master'

Use geo tag, especially to avoid MySQL

See merge request gitlab-org/gitlab-ee!11288
parents 59dadb96 067c83ad
require 'spec_helper' require 'spec_helper'
describe 'GEO Nodes' do describe 'GEO Nodes', :geo do
include ::EE::GeoHelpers include ::EE::GeoHelpers
set(:user) { create(:user) } set(:user) { create(:user) }
......
require 'rails_helper' require 'rails_helper'
describe 'Geo clone instructions', :js do describe 'Geo clone instructions', :geo, :js do
include Devise::Test::IntegrationHelpers include Devise::Test::IntegrationHelpers
include ::EE::GeoHelpers include ::EE::GeoHelpers
......
require 'rails_helper' require 'rails_helper'
describe 'Geo read-only message' do describe 'Geo read-only message', :geo do
include ::EE::GeoHelpers include ::EE::GeoHelpers
set(:user) { create(:user) } set(:user) { create(:user) }
......
...@@ -5,7 +5,7 @@ require 'spec_helper' ...@@ -5,7 +5,7 @@ require 'spec_helper'
describe ApplicationHelper do describe ApplicationHelper do
include EE::GeoHelpers include EE::GeoHelpers
describe '#read_only_message' do describe '#read_only_message', :geo do
context 'when not in a Geo secondary' do context 'when not in a Geo secondary' do
it 'returns a fallback message if database is readonly' do it 'returns a fallback message if database is readonly' do
expect(Gitlab::Database).to receive(:read_only?) { true } expect(Gitlab::Database).to receive(:read_only?) { true }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment