Add latest changes from gitlab-org/gitlab@master

2 files changed, 21 insertions, 28 deletions

diff --git a/spec/helpers/packages_helper_spec.rb b/spec/helpers/packages_helper_spec.rb
index 8b3c8411fbd..bc60c582ff8 100644
--- a/spec/helpers/packages_helper_spec.rb
+++ b/spec/helpers/packages_helper_spec.rb
@@ -219,4 +219,25 @@ RSpec.describe PackagesHelper do
       it { is_expected.to eq(expected_result) }
     end
   end
+
+  describe '#package_details_data' do
+    let_it_be(:package) { create(:package) }
+
+    before do
+      allow(helper).to receive(:current_user) { project.owner }
+      allow(helper).to receive(:can?) { true }
+    end
+
+    it 'when use_presenter is true populate the package key' do
+      result = helper.package_details_data(project, package, true)
+
+      expect(result[:package]).not_to be_nil
+    end
+
+    it 'when use_presenter is false the package key is nil' do
+      result = helper.package_details_data(project, package, false)
+
+      expect(result[:package]).to be_nil
+    end
+  end
 end
diff --git a/spec/helpers/user_callouts_helper_spec.rb b/spec/helpers/user_callouts_helper_spec.rb
index 90333cb0ad5..5ef1e9d4daf 100644
--- a/spec/helpers/user_callouts_helper_spec.rb
+++ b/spec/helpers/user_callouts_helper_spec.rb
@@ -61,34 +61,6 @@ RSpec.describe UserCalloutsHelper do
     end
   end
 
-  describe '.show_service_templates_deprecated_callout?' do
-    using RSpec::Parameterized::TableSyntax
-
-    let_it_be(:admin) { create(:user, :admin) }
-    let_it_be(:non_admin) { create(:user) }
-
-    subject { helper.show_service_templates_deprecated_callout? }
-
-    where(:self_managed, :is_admin_user, :has_active_service_template, :callout_dismissed, :should_show_callout) do
-      true  | true  | true  | false | true
-      true  | true  | true  | true  | false
-      true  | false | true  | false | false
-      false | true  | true  | false | false
-      true  | true  | false | false | false
-    end
-
-    with_them do
-      before do
-        allow(::Gitlab).to receive(:com?).and_return(!self_managed)
-        allow(helper).to receive(:current_user).and_return(is_admin_user ? admin : non_admin)
-        allow(helper).to receive(:user_dismissed?).with(described_class::SERVICE_TEMPLATES_DEPRECATED_CALLOUT) { callout_dismissed }
-        create(:service, :template, type: 'MattermostService', active: has_active_service_template)
-      end
-
-      it { is_expected.to be should_show_callout }
-    end
-  end
-
   describe '.show_customize_homepage_banner?' do
     subject { helper.show_customize_homepage_banner? }