diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2019-11-08 00:05:58 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2019-11-08 00:05:58 +0000 |
commit | 1adb4373ba840a9bc771a8c9196f7183fd98b2b8 (patch) | |
tree | 1d319351302054fb1ca2223ed4da467fb2078765 /spec/controllers/application_controller_spec.rb | |
parent | c324100967bbdd3f2f0ca3406c9261d35e69f148 (diff) | |
download | gitlab-ce-1adb4373ba840a9bc771a8c9196f7183fd98b2b8.tar.gz |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/controllers/application_controller_spec.rb')
-rw-r--r-- | spec/controllers/application_controller_spec.rb | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/spec/controllers/application_controller_spec.rb b/spec/controllers/application_controller_spec.rb index 481883c50fa..94afe741057 100644 --- a/spec/controllers/application_controller_spec.rb +++ b/spec/controllers/application_controller_spec.rb @@ -90,16 +90,18 @@ describe ApplicationController do let(:format) { :html } it_behaves_like 'setting gon variables' - end - context 'with json format' do - let(:format) { :json } + context 'for peek requests' do + before do + request.path = '/-/peek' + end - it_behaves_like 'not setting gon variables' + it_behaves_like 'not setting gon variables' + end end - context 'with atom format' do - let(:format) { :atom } + context 'with json format' do + let(:format) { :json } it_behaves_like 'not setting gon variables' end |