Add latest changes from gitlab-org/gitlab@master

spec/graphql/types/error_tracking/sentry_error_collection_type_spec.rb

@@ -15,7 +15,7 @@ describe GitlabSchema.types['SentryErrorCollection'] do
       error_stack_trace
     ]
-    is_expected.to have_graphql_fields(*expected_fields)
+    expect(described_class).to have_graphql_fields(*expected_fields)
   end
   describe 'errors field' do

spec/graphql/types/error_tracking/sentry_error_stack_trace_entry_type_spec.rb

@@ -14,6 +14,6 @@ describe GitlabSchema.types['SentryErrorStackTraceEntry'] do
       trace_context
     ]
-    is_expected.to have_graphql_fields(*expected_fields)
+    expect(described_class).to have_graphql_fields(*expected_fields)
   end
 end

spec/graphql/types/error_tracking/sentry_error_stack_trace_type_spec.rb

@@ -14,6 +14,6 @@ describe GitlabSchema.types['SentryErrorStackTrace'] do
       stack_trace_entries
     ]
-    is_expected.to have_graphql_fields(*expected_fields)
+    expect(described_class).to have_graphql_fields(*expected_fields)
   end
 end

spec/graphql/types/error_tracking/sentry_error_type_spec.rb

@@ -26,6 +26,6 @@ describe GitlabSchema.types['SentryError'] do
       frequency
     ]
-    is_expected.to have_graphql_fields(*expected_fields)
+    expect(described_class).to have_graphql_fields(*expected_fields)
   end
 end

spec/graphql/types/grafana_integration_type_spec.rb

@@ -18,5 +18,5 @@ describe GitlabSchema.types['GrafanaIntegration'] do
   it { expect(described_class).to require_graphql_authorizations(:admin_operations) }
-  it { is_expected.to have_graphql_fields(*expected_fields) }
+  it { expect(described_class).to have_graphql_fields(*expected_fields) }
 end

spec/graphql/types/group_type_spec.rb

@@ -19,7 +19,7 @@ describe GitlabSchema.types['Group'] do
       mentions_disabled parent boards
     ]
-    is_expected.to include_graphql_fields(*expected_fields)
+    expect(described_class).to include_graphql_fields(*expected_fields)
   end
   describe 'boards field' do

spec/graphql/types/issue_type_spec.rb

@@ -9,7 +9,7 @@ describe GitlabSchema.types['Issue'] do
   it { expect(described_class).to require_graphql_authorizations(:read_issue) }
-  it { expect(described_class.interfaces).to include(Types::Notes::NoteableType.to_graphql) }
+  it { expect(described_class.interfaces).to include(Types::Notes::NoteableType) }
   it 'has specific fields' do
     fields = %i[iid title description state reference author assignees participants labels milestone due_date

spec/graphql/types/label_type_spec.rb

@@ -5,8 +5,8 @@ describe GitlabSchema.types['Label'] do
   it 'has the correct fields' do
     expected_fields = [:id, :description, :description_html, :title, :color, :text_color]
-    is_expected.to have_graphql_fields(*expected_fields)
+    expect(described_class).to have_graphql_fields(*expected_fields)
   end
-  it { is_expected.to require_graphql_authorizations(:read_label) }
+  it { expect(described_class).to require_graphql_authorizations(:read_label) }
 end

spec/graphql/types/merge_request_type_spec.rb

@@ -7,7 +7,7 @@ describe GitlabSchema.types['MergeRequest'] do
   it { expect(described_class).to require_graphql_authorizations(:read_merge_request) }
-  it { expect(described_class.interfaces).to include(Types::Notes::NoteableType.to_graphql) }
+  it { expect(described_class.interfaces).to include(Types::Notes::NoteableType) }
   it 'has the expected fields' do
     expected_fields = %w[
@@ -25,6 +25,6 @@ describe GitlabSchema.types['MergeRequest'] do
       total_time_spent reference
     ]
-    is_expected.to have_graphql_fields(*expected_fields)
+    expect(described_class).to have_graphql_fields(*expected_fields)
   end
 end

spec/graphql/types/metadata_type_spec.rb

@@ -4,5 +4,5 @@ require 'spec_helper'
 describe GitlabSchema.types['Metadata'] do
   it { expect(described_class.graphql_name).to eq('Metadata') }
-  it { is_expected.to require_graphql_authorizations(:read_instance_metadata) }
+  it { expect(described_class).to require_graphql_authorizations(:read_instance_metadata) }
 end

spec/graphql/types/namespace_type_spec.rb

@@ -11,8 +11,8 @@ describe GitlabSchema.types['Namespace'] do
       lfs_enabled request_access_enabled projects root_storage_statistics
     ]
-    is_expected.to have_graphql_fields(*expected_fields)
+    expect(described_class).to have_graphql_fields(*expected_fields)
   end
-  it { is_expected.to require_graphql_authorizations(:read_namespace) }
+  it { expect(described_class).to require_graphql_authorizations(:read_namespace) }
 end

spec/graphql/types/notes/diff_position_type_spec.rb

@@ -7,6 +7,6 @@ describe GitlabSchema.types['DiffPosition'] do
                        :new_path, :position_type, :old_line, :new_line, :x, :y,
                        :width, :height]
-    is_expected.to have_graphql_fields(*expected_fields)
+    expect(described_class).to have_graphql_fields(*expected_fields)
   end
 end

spec/graphql/types/notes/discussion_type_spec.rb

@@ -2,7 +2,7 @@
 require 'spec_helper'
 describe GitlabSchema.types['Discussion'] do
-  it { is_expected.to have_graphql_fields(:id, :created_at, :notes, :reply_id) }
-  it { is_expected.to require_graphql_authorizations(:read_note) }
+  it { expect(described_class).to have_graphql_fields(:id, :created_at, :notes, :reply_id) }
+  it { expect(described_class).to require_graphql_authorizations(:read_note) }
 end

spec/graphql/types/notes/note_type_spec.rb

@@ -7,9 +7,9 @@ describe GitlabSchema.types['Note'] do
                        :updated_at, :discussion, :resolvable, :position, :user_permissions,
                        :resolved_by, :resolved_at, :system, :body_html]
-    is_expected.to have_graphql_fields(*expected_fields)
+    expect(described_class).to have_graphql_fields(*expected_fields)
   end
-  it { is_expected.to expose_permissions_using(Types::PermissionTypes::Note) }
-  it { is_expected.to require_graphql_authorizations(:read_note) }
+  it { expect(described_class).to expose_permissions_using(Types::PermissionTypes::Note) }
+  it { expect(described_class).to require_graphql_authorizations(:read_note) }
 end

spec/graphql/types/notes/noteable_type_spec.rb

@@ -2,7 +2,7 @@
 require 'spec_helper'
 describe Types::Notes::NoteableType do
-  it { is_expected.to have_graphql_fields(:notes, :discussions) }
+  it { expect(described_class).to have_graphql_fields(:notes, :discussions) }
   describe ".resolve_type" do
     it 'knows the correct type for objects' do

spec/graphql/types/permission_types/base_permission_type_spec.rb

@@ -19,13 +19,13 @@ describe Types::PermissionTypes::BasePermissionType do
   describe '.permission_field' do
     it 'adds a field for the required permission' do
-      is_expected.to have_graphql_field(:do_stuff)
+      expect(test_type).to have_graphql_field(:do_stuff)
     end
   end
   describe '.ability_field' do
     it 'adds a field for the required permission' do
-      is_expected.to have_graphql_field(:read_issue)
+      expect(test_type).to have_graphql_field(:read_issue)
     end
     it 'does not add a resolver block if another resolving param is passed' do
@@ -44,7 +44,7 @@ describe Types::PermissionTypes::BasePermissionType do
   describe '.abilities' do
     it 'adds a field for the passed permissions' do
-      is_expected.to have_graphql_field(:admin_issue)
+      expect(test_type).to have_graphql_field(:admin_issue)
     end
   end
 end

spec/graphql/types/permission_types/note_spec.rb

@@ -8,6 +8,6 @@ describe GitlabSchema.types['NotePermissions'] do
       :read_note, :create_note, :admin_note, :resolve_note, :award_emoji
     ]
-    is_expected.to have_graphql_fields(expected_permissions)
+    expect(described_class).to have_graphql_fields(expected_permissions)
   end
 end

spec/graphql/types/project_statistics_type_spec.rb

@@ -4,7 +4,7 @@ require 'spec_helper'
 describe GitlabSchema.types['ProjectStatistics'] do
   it "has all the required fields" do
-    is_expected.to have_graphql_fields(:storage_size, :repository_size, :lfs_objects_size,
+    expect(described_class).to have_graphql_fields(:storage_size, :repository_size, :lfs_objects_size,
                                        :build_artifacts_size, :packages_size, :commit_count,
                                        :wiki_size)
   end

spec/graphql/types/project_type_spec.rb

@@ -27,7 +27,7 @@ describe GitlabSchema.types['Project'] do
       boards
     ]
-    is_expected.to include_graphql_fields(*expected_fields)
+    expect(described_class).to include_graphql_fields(*expected_fields)
   end
   describe 'issue field' do

spec/graphql/types/repository_type_spec.rb

@@ -7,7 +7,7 @@ describe GitlabSchema.types['Repository'] do
   it { expect(described_class).to require_graphql_authorizations(:download_code) }
-  it { is_expected.to have_graphql_field(:root_ref) }
-  it { is_expected.to have_graphql_field(:tree) }
+  it { expect(described_class).to have_graphql_field(:root_ref) }
+  it { expect(described_class).to have_graphql_field(:tree) }
 end