Add latest changes from gitlab-org/gitlab@master

3 files changed, 15 insertions, 15 deletions

diff --git a/spec/graphql/gitlab_schema_spec.rb b/spec/graphql/gitlab_schema_spec.rb
index 2e0711fe18c..885bbc82ecc 100644
--- a/spec/graphql/gitlab_schema_spec.rb
+++ b/spec/graphql/gitlab_schema_spec.rb
@@ -3,7 +3,7 @@
 require 'spec_helper'
 
 RSpec.describe GitlabSchema do
-  let_it_be(:connections) { GitlabSchema.connections.all_wrappers }
+  let_it_be(:connections) { described_class.connections.all_wrappers }
   let_it_be(:tracers) { described_class.tracers }
 
   let(:user) { build :user }
diff --git a/spec/graphql/graphql_triggers_spec.rb b/spec/graphql/graphql_triggers_spec.rb
index 864818351a1..3f58f2678d8 100644
--- a/spec/graphql/graphql_triggers_spec.rb
+++ b/spec/graphql/graphql_triggers_spec.rb
@@ -20,7 +20,7 @@ RSpec.describe GraphqlTriggers, feature_category: :shared do
         issuable
       )
 
-      GraphqlTriggers.issuable_assignees_updated(issuable)
+      described_class.issuable_assignees_updated(issuable)
     end
   end
 
@@ -32,7 +32,7 @@ RSpec.describe GraphqlTriggers, feature_category: :shared do
         issuable
       ).and_call_original
 
-      GraphqlTriggers.issuable_title_updated(issuable)
+      described_class.issuable_title_updated(issuable)
     end
   end
 
@@ -44,7 +44,7 @@ RSpec.describe GraphqlTriggers, feature_category: :shared do
         issuable
       ).and_call_original
 
-      GraphqlTriggers.issuable_description_updated(issuable)
+      described_class.issuable_description_updated(issuable)
     end
   end
 
@@ -62,7 +62,7 @@ RSpec.describe GraphqlTriggers, feature_category: :shared do
         issuable
       )
 
-      GraphqlTriggers.issuable_labels_updated(issuable)
+      described_class.issuable_labels_updated(issuable)
     end
   end
 
@@ -74,7 +74,7 @@ RSpec.describe GraphqlTriggers, feature_category: :shared do
         issuable
       ).and_call_original
 
-      GraphqlTriggers.issuable_dates_updated(issuable)
+      described_class.issuable_dates_updated(issuable)
     end
   end
 
@@ -86,7 +86,7 @@ RSpec.describe GraphqlTriggers, feature_category: :shared do
         issuable
       ).and_call_original
 
-      GraphqlTriggers.issuable_milestone_updated(issuable)
+      described_class.issuable_milestone_updated(issuable)
     end
   end
 
@@ -100,7 +100,7 @@ RSpec.describe GraphqlTriggers, feature_category: :shared do
         merge_request
       ).and_call_original
 
-      GraphqlTriggers.merge_request_reviewers_updated(merge_request)
+      described_class.merge_request_reviewers_updated(merge_request)
     end
   end
 
@@ -114,7 +114,7 @@ RSpec.describe GraphqlTriggers, feature_category: :shared do
         merge_request
       ).and_call_original
 
-      GraphqlTriggers.merge_request_merge_status_updated(merge_request)
+      described_class.merge_request_merge_status_updated(merge_request)
     end
   end
 
@@ -128,7 +128,7 @@ RSpec.describe GraphqlTriggers, feature_category: :shared do
         merge_request
       ).and_call_original
 
-      GraphqlTriggers.merge_request_approval_state_updated(merge_request)
+      described_class.merge_request_approval_state_updated(merge_request)
     end
   end
 
@@ -140,7 +140,7 @@ RSpec.describe GraphqlTriggers, feature_category: :shared do
         issuable
       ).and_call_original
 
-      GraphqlTriggers.work_item_updated(issuable)
+      described_class.work_item_updated(issuable)
     end
 
     context 'when triggered with an Issue' do
@@ -154,7 +154,7 @@ RSpec.describe GraphqlTriggers, feature_category: :shared do
           work_item
         ).and_call_original
 
-        GraphqlTriggers.work_item_updated(issue)
+        described_class.work_item_updated(issue)
       end
     end
   end
diff --git a/spec/graphql/types/global_id_type_spec.rb b/spec/graphql/types/global_id_type_spec.rb
index fa0b34113bc..8ce0bc2b70a 100644
--- a/spec/graphql/types/global_id_type_spec.rb
+++ b/spec/graphql/types/global_id_type_spec.rb
@@ -105,12 +105,12 @@ RSpec.describe Types::GlobalIDType do
       around do |example|
         # Unset all previously memoized GlobalIDTypes to allow us to define one
         # that will use the constants stubbed in the `before` block.
-        previous_id_types = Types::GlobalIDType.instance_variable_get(:@id_types)
-        Types::GlobalIDType.instance_variable_set(:@id_types, {})
+        previous_id_types = described_class.instance_variable_get(:@id_types)
+        described_class.instance_variable_set(:@id_types, {})
 
         example.run
       ensure
-        Types::GlobalIDType.instance_variable_set(:@id_types, previous_id_types)
+        described_class.instance_variable_set(:@id_types, previous_id_types)
       end
 
       before do