diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-12-17 11:59:07 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-12-17 11:59:07 +0000 |
commit | 8b573c94895dc0ac0e1d9d59cf3e8745e8b539ca (patch) | |
tree | 544930fb309b30317ae9797a9683768705d664c4 /spec/helpers/calendar_helper_spec.rb | |
parent | 4b1de649d0168371549608993deac953eb692019 (diff) | |
download | gitlab-ce-8b573c94895dc0ac0e1d9d59cf3e8745e8b539ca.tar.gz |
Add latest changes from gitlab-org/gitlab@13-7-stable-eev13.7.0-rc42
Diffstat (limited to 'spec/helpers/calendar_helper_spec.rb')
-rw-r--r-- | spec/helpers/calendar_helper_spec.rb | 9 |
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 |