Merge branch 'mk/geo-deprecate-legacy-storage-ce' into 'master'

Backport persistent user callout flash message to CE

See merge request gitlab-org/gitlab-ce!24166

1 files changed, 9 insertions, 0 deletions

diff --git a/spec/helpers/user_callouts_helper_spec.rb b/spec/helpers/user_callouts_helper_spec.rb
index 27455705d23..8fa479a4474 100644
--- a/spec/helpers/user_callouts_helper_spec.rb
+++ b/spec/helpers/user_callouts_helper_spec.rb
@@ -44,4 +44,13 @@ describe UserCalloutsHelper do
       it { is_expected.to be false }
     end
   end
+
+  describe '.render_flash_user_callout' do
+    it 'renders the flash_user_callout partial' do
+      expect(helper).to receive(:render)
+        .with(/flash_user_callout/, flash_type: :warning, message: 'foo', feature_name: 'bar')
+
+      helper.render_flash_user_callout(:warning, 'foo', 'bar')
+    end
+  end
 end