Commit bb98addc authored by Mark Lapierre's avatar Mark Lapierre

Merge branch 'qa-no-monkey-patching-geo' into 'master'

Update geo tests to use outer describe

See merge request gitlab-org/gitlab!35647
parents 3383208e 49181fd9
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
require 'airborne' require 'airborne'
module QA module QA
context 'Geo', :orchestrated, :geo do RSpec.describe 'Geo', :orchestrated, :geo do
describe 'Geo Nodes API' do describe 'Geo Nodes API' do
before(:all) do before(:all) do
get_personal_access_token get_personal_access_token
......
# frozen_string_literal: true # frozen_string_literal: true
module QA module QA
context 'Geo', :orchestrated, :geo do RSpec.describe 'Geo', :orchestrated, :geo do
describe 'GitLab Geo attachment replication' do describe 'GitLab Geo attachment replication' do
let(:file_to_attach) { File.absolute_path(File.join('spec', 'fixtures', 'banana_sample.gif')) } let(:file_to_attach) { File.absolute_path(File.join('spec', 'fixtures', 'banana_sample.gif')) }
......
# frozen_string_literal: true # frozen_string_literal: true
module QA module QA
context 'Geo', :orchestrated, :geo do RSpec.describe 'Geo', :orchestrated, :geo do
describe 'GitLab Geo project deletion replication' do describe 'GitLab Geo project deletion replication' do
include Support::Api include Support::Api
......
# frozen_string_literal: true # frozen_string_literal: true
module QA module QA
context 'Geo', :orchestrated, :geo do RSpec.describe 'Geo', :orchestrated, :geo do
describe 'GitLab HTTP push' do describe 'GitLab HTTP push' do
let(:file_name) { 'README.md' } let(:file_name) { 'README.md' }
......
# frozen_string_literal: true # frozen_string_literal: true
module QA module QA
context 'Geo', :orchestrated, :geo do RSpec.describe 'Geo', :orchestrated, :geo do
let(:git_push_http_path_prefix) { '/-/push_from_secondary' } let(:git_push_http_path_prefix) { '/-/push_from_secondary' }
describe 'GitLab Geo HTTP push secondary' do describe 'GitLab Geo HTTP push secondary' do
......
# frozen_string_literal: true # frozen_string_literal: true
module QA module QA
context 'Geo', :orchestrated, :geo do RSpec.describe 'Geo', :orchestrated, :geo do
describe 'GitLab Geo project rename replication' do describe 'GitLab Geo project rename replication' do
it 'user renames project' do it 'user renames project' do
original_project_name = 'geo-before-rename' original_project_name = 'geo-before-rename'
......
# frozen_string_literal: true # frozen_string_literal: true
module QA module QA
context 'Geo', :orchestrated, :geo do RSpec.describe 'Geo', :orchestrated, :geo do
describe 'GitLab SSH push' do describe 'GitLab SSH push' do
let(:file_name) { 'README.md' } let(:file_name) { 'README.md' }
......
# frozen_string_literal: true # frozen_string_literal: true
module QA module QA
context 'Geo', :orchestrated, :geo do RSpec.describe 'Geo', :orchestrated, :geo do
describe 'GitLab SSH push to secondary' do describe 'GitLab SSH push to secondary' do
let(:file_content_primary) { 'This is a Geo project! Commit from primary.' } let(:file_content_primary) { 'This is a Geo project! Commit from primary.' }
let(:file_content_secondary) { 'This is a Geo project! Commit from secondary.' } let(:file_content_secondary) { 'This is a Geo project! Commit from secondary.' }
......
# frozen_string_literal: true # frozen_string_literal: true
module QA module QA
context 'Geo', :orchestrated, :geo do RSpec.describe 'Geo', :orchestrated, :geo do
describe 'GitLab wiki HTTP push' do describe 'GitLab wiki HTTP push' do
context 'wiki commit' do context 'wiki commit' do
it 'is replicated to the secondary node' do it 'is replicated to the secondary node' do
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
module QA module QA
# https://gitlab.com/gitlab-org/gitlab/issues/35706 # https://gitlab.com/gitlab-org/gitlab/issues/35706
context 'Geo', :orchestrated, :geo do RSpec.describe 'Geo', :orchestrated, :geo do
describe 'GitLab Geo Wiki HTTP push secondary' do describe 'GitLab Geo Wiki HTTP push secondary' do
let(:wiki_content) { 'This tests wiki pushes via HTTP to secondary.' } let(:wiki_content) { 'This tests wiki pushes via HTTP to secondary.' }
let(:push_content_primary) { 'This is from the Geo wiki push to primary!' } let(:push_content_primary) { 'This is from the Geo wiki push to primary!' }
......
# frozen_string_literal: true # frozen_string_literal: true
module QA module QA
context 'Geo', :orchestrated, :geo do RSpec.describe 'Geo', :orchestrated, :geo do
describe 'GitLab wiki SSH push' do describe 'GitLab wiki SSH push' do
context 'wiki commit' do context 'wiki commit' do
it 'is replicated to the secondary' do it 'is replicated to the secondary' do
......
# frozen_string_literal: true # frozen_string_literal: true
module QA module QA
context 'Geo', :orchestrated, :geo do RSpec.describe 'Geo', :orchestrated, :geo do
describe 'GitLab wiki SSH push to secondary' do describe 'GitLab wiki SSH push to secondary' do
wiki_title = 'Geo Replication Wiki' wiki_title = 'Geo Replication Wiki'
wiki_content = 'This tests replication of wikis via SSH to secondary' wiki_content = 'This tests replication of wikis via SSH to secondary'
......
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