Add latest changes from gitlab-org/gitlab@master

1 files changed, 9 insertions, 0 deletions

diff --git a/spec/helpers/calendar_helper_spec.rb b/spec/helpers/calendar_helper_spec.rb
index ceed4191ef4..08993dd1dd0 100644
--- a/spec/helpers/calendar_helper_spec.rb
+++ b/spec/helpers/calendar_helper_spec.rb
@@ -18,5 +18,14 @@ RSpec.describe CalendarHelper do
         expect(helper.calendar_url_options[:feed_token]).to be_nil
       end
     end
+
+    context 'when feed token disabled' do
+      it "does not have a feed_token" do
+        current_user = create(:user)
+        allow(helper).to receive(:current_user).and_return(current_user)
+        allow(Gitlab::CurrentSettings).to receive(:disable_feed_token).and_return(true)
+        expect(helper.calendar_url_options[:feed_token]).to be_nil
+      end
+    end
   end
 end