Add latest changes from gitlab-org/gitlab@master

3 files changed, 2 insertions, 23 deletions

diff --git a/spec/graphql/types/extended_issue_type_spec.rb b/spec/graphql/types/extended_issue_type_spec.rb
deleted file mode 100644
index 72ce53ae1be..00000000000
--- a/spec/graphql/types/extended_issue_type_spec.rb
+++ /dev/null
@@ -1,21 +0,0 @@
-# frozen_string_literal: true
-
-require 'spec_helper'
-
-describe GitlabSchema.types['ExtendedIssue'] do
-  it { expect(described_class).to expose_permissions_using(Types::PermissionTypes::Issue) }
-
-  it { expect(described_class.graphql_name).to eq('ExtendedIssue') }
-
-  it { expect(described_class).to require_graphql_authorizations(:read_issue) }
-
-  it { expect(described_class.interfaces).to include(Types::Notes::NoteableType.to_graphql) }
-
-  it 'has specific fields' do
-    fields = Types::IssueType.fields.keys + [:subscribed]
-
-    fields.each do |field_name|
-      expect(described_class).to have_graphql_field(field_name)
-    end
-  end
-end
diff --git a/spec/graphql/types/issue_type_spec.rb b/spec/graphql/types/issue_type_spec.rb
index 8aa2385ddaa..daa2224ef20 100644
--- a/spec/graphql/types/issue_type_spec.rb
+++ b/spec/graphql/types/issue_type_spec.rb
@@ -14,7 +14,7 @@ describe GitlabSchema.types['Issue'] do
   it 'has specific fields' do
     fields = %i[iid title description state reference author assignees participants labels milestone due_date
                 confidential discussion_locked upvotes downvotes user_notes_count web_path web_url relative_position
-                time_estimate total_time_spent closed_at created_at updated_at task_completion_status]
+                subscribed time_estimate total_time_spent closed_at created_at updated_at task_completion_status]
 
     fields.each do |field_name|
       expect(described_class).to have_graphql_field(field_name)
diff --git a/spec/graphql/types/project_type_spec.rb b/spec/graphql/types/project_type_spec.rb
index f837fb9f77f..19a433f090e 100644
--- a/spec/graphql/types/project_type_spec.rb
+++ b/spec/graphql/types/project_type_spec.rb
@@ -33,7 +33,7 @@ describe GitlabSchema.types['Project'] do
     subject { described_class.fields['issue'] }
 
     it 'returns issue' do
-      is_expected.to have_graphql_type(Types::ExtendedIssueType)
+      is_expected.to have_graphql_type(Types::IssueType)
       is_expected.to have_graphql_resolver(Resolvers::IssuesResolver.single)
     end
   end