Add latest changes from gitlab-org/gitlab@master

9 files changed, 11 insertions, 11 deletions

diff --git a/qa/spec/resource/api_fabricator_spec.rb b/qa/spec/resource/api_fabricator_spec.rb
index a5ed4422f6e..eb2bdd1be64 100644
--- a/qa/spec/resource/api_fabricator_spec.rb
+++ b/qa/spec/resource/api_fabricator_spec.rb
@@ -120,7 +120,7 @@ describe QA::Resource::ApiFabricator do
         end
       end
 
-      context '#transform_api_resource' do
+      describe '#transform_api_resource' do
         let(:resource) do
           Class.new do
             def self.name
diff --git a/qa/spec/scenario/test/integration/github_spec.rb b/qa/spec/scenario/test/integration/github_spec.rb
index 6112ba7c694..b2d577bd552 100644
--- a/qa/spec/scenario/test/integration/github_spec.rb
+++ b/qa/spec/scenario/test/integration/github_spec.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 describe QA::Scenario::Test::Integration::Github do
-  context '#perform' do
+  describe '#perform' do
     let(:env) { spy('Runtime::Env') }
 
     before do
diff --git a/qa/spec/scenario/test/integration/instance_saml_spec.rb b/qa/spec/scenario/test/integration/instance_saml_spec.rb
index cb8a6a630cc..15f15b2e643 100644
--- a/qa/spec/scenario/test/integration/instance_saml_spec.rb
+++ b/qa/spec/scenario/test/integration/instance_saml_spec.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 describe QA::Scenario::Test::Integration::InstanceSAML do
-  context '#perform' do
+  describe '#perform' do
     it_behaves_like 'a QA scenario class' do
       let(:tags) { [:instance_saml] }
     end
diff --git a/qa/spec/scenario/test/integration/kubernetes_spec.rb b/qa/spec/scenario/test/integration/kubernetes_spec.rb
index cb43994b229..51ee7b9acff 100644
--- a/qa/spec/scenario/test/integration/kubernetes_spec.rb
+++ b/qa/spec/scenario/test/integration/kubernetes_spec.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 describe QA::Scenario::Test::Integration::Kubernetes do
-  context '#perform' do
+  describe '#perform' do
     it_behaves_like 'a QA scenario class' do
       let(:tags) { [:kubernetes] }
     end
diff --git a/qa/spec/scenario/test/integration/ldap_spec.rb b/qa/spec/scenario/test/integration/ldap_spec.rb
index 86747cd8eb7..c493cde6c7a 100644
--- a/qa/spec/scenario/test/integration/ldap_spec.rb
+++ b/qa/spec/scenario/test/integration/ldap_spec.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 describe QA::Scenario::Test::Integration::LDAPNoTLS do
-  context '#perform' do
+  describe '#perform' do
     it_behaves_like 'a QA scenario class' do
       let(:tags) { [:ldap_no_tls] }
     end
@@ -9,7 +9,7 @@ describe QA::Scenario::Test::Integration::LDAPNoTLS do
 end
 
 describe QA::Scenario::Test::Integration::LDAPNoServer do
-  context '#perform' do
+  describe '#perform' do
     it_behaves_like 'a QA scenario class' do
       let(:tags) { [:ldap_no_server] }
     end
@@ -17,7 +17,7 @@ describe QA::Scenario::Test::Integration::LDAPNoServer do
 end
 
 describe QA::Scenario::Test::Integration::LDAPTLS do
-  context '#perform' do
+  describe '#perform' do
     it_behaves_like 'a QA scenario class' do
       let(:tags) { [:ldap_tls] }
     end
diff --git a/qa/spec/scenario/test/integration/mattermost_spec.rb b/qa/spec/scenario/test/integration/mattermost_spec.rb
index 4e75e72f4d2..4452e890ebe 100644
--- a/qa/spec/scenario/test/integration/mattermost_spec.rb
+++ b/qa/spec/scenario/test/integration/mattermost_spec.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 describe QA::Scenario::Test::Integration::Mattermost do
-  context '#perform' do
+  describe '#perform' do
     it_behaves_like 'a QA scenario class' do
       let(:args) { %w[gitlab_address mattermost_address] }
       let(:args) do
diff --git a/qa/spec/scenario/test/integration/oauth_spec.rb b/qa/spec/scenario/test/integration/oauth_spec.rb
index c1c320be576..ab7ea905a29 100644
--- a/qa/spec/scenario/test/integration/oauth_spec.rb
+++ b/qa/spec/scenario/test/integration/oauth_spec.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 describe QA::Scenario::Test::Integration::OAuth do
-  context '#perform' do
+  describe '#perform' do
     it_behaves_like 'a QA scenario class' do
       let(:tags) { [:oauth] }
     end
diff --git a/qa/spec/scenario/test/integration/object_storage_spec.rb b/qa/spec/scenario/test/integration/object_storage_spec.rb
index 2b7188223e0..8b4367bee32 100644
--- a/qa/spec/scenario/test/integration/object_storage_spec.rb
+++ b/qa/spec/scenario/test/integration/object_storage_spec.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 describe QA::Scenario::Test::Integration::ObjectStorage do
-  context '#perform' do
+  describe '#perform' do
     it_behaves_like 'a QA scenario class' do
       let(:tags) { [:object_storage] }
     end
diff --git a/qa/spec/specs/runner_spec.rb b/qa/spec/specs/runner_spec.rb
index 3d98f03a982..1a3efe0b46c 100644
--- a/qa/spec/specs/runner_spec.rb
+++ b/qa/spec/specs/runner_spec.rb
@@ -11,7 +11,7 @@ describe QA::Specs::Runner do
     end
   end
 
-  context '#perform' do
+  describe '#perform' do
     before do
       allow(QA::Runtime::Browser).to receive(:configure!)
     end