Add latest changes from gitlab-org/gitlab@master

2 files changed, 2 insertions, 11 deletions

diff --git a/spec/serializers/issue_sidebar_basic_entity_spec.rb b/spec/serializers/issue_sidebar_basic_entity_spec.rb
index f24e379ec67..d81d87f4060 100644
--- a/spec/serializers/issue_sidebar_basic_entity_spec.rb
+++ b/spec/serializers/issue_sidebar_basic_entity_spec.rb
@@ -45,7 +45,7 @@ RSpec.describe IssueSidebarBasicEntity do
       context 'for an incident issue' do
         before do
           issue.update!(
-            issue_type: Issue.issue_types[:incident],
+            issue_type: WorkItems::Type.base_types[:incident],
             work_item_type: WorkItems::Type.default_by_type(:incident)
           )
         end
diff --git a/spec/serializers/jira_connect/app_data_serializer_spec.rb b/spec/serializers/jira_connect/app_data_serializer_spec.rb
index 9c10a8a54a1..1ade3dea6e7 100644
--- a/spec/serializers/jira_connect/app_data_serializer_spec.rb
+++ b/spec/serializers/jira_connect/app_data_serializer_spec.rb
@@ -4,12 +4,10 @@ require 'spec_helper'
 
 RSpec.describe JiraConnect::AppDataSerializer do
   describe '#as_json' do
-    subject(:app_data_json) { described_class.new(subscriptions, signed_in).as_json }
+    subject(:app_data_json) { described_class.new(subscriptions).as_json }
 
     let_it_be(:subscriptions) { create_list(:jira_connect_subscription, 2) }
 
-    let(:signed_in) { false }
-
     it 'uses the subscription entity' do
       expect(JiraConnect::SubscriptionEntity).to receive(:represent).with(subscriptions)
 
@@ -23,12 +21,5 @@ RSpec.describe JiraConnect::AppDataSerializer do
     end
 
     it { is_expected.to include(subscriptions_path: '/-/jira_connect/subscriptions') }
-    it { is_expected.to include(login_path: '/-/jira_connect/users') }
-
-    context 'when signed in' do
-      let(:signed_in) { true }
-
-      it { is_expected.to include(login_path: nil) }
-    end
   end
 end