summaryrefslogtreecommitdiff
path: root/spec/controllers
diff options
context:
space:
mode:
authorRémy Coutable <remy@rymai.me>2016-02-05 12:34:51 +0100
committerRémy Coutable <remy@rymai.me>2016-02-05 15:40:44 +0100
commitf6d816f9fe5dae55ed980b48aac7366c46f95461 (patch)
tree572297b08e690901543ade9c3218e4709c026f70 /spec/controllers
parentcf1349adb7cba2e791a1f8d59e3a6a976b54e071 (diff)
downloadgitlab-ce-f6d816f9fe5dae55ed980b48aac7366c46f95461.tar.gz
Add a controller test for the new 'diff_view' cookie
Diffstat (limited to 'spec/controllers')
-rw-r--r--spec/controllers/projects/merge_requests_controller_spec.rb14
1 files changed, 13 insertions, 1 deletions
diff --git a/spec/controllers/projects/merge_requests_controller_spec.rb b/spec/controllers/projects/merge_requests_controller_spec.rb
index 6aaec224f6e..183cfef3611 100644
--- a/spec/controllers/projects/merge_requests_controller_spec.rb
+++ b/spec/controllers/projects/merge_requests_controller_spec.rb
@@ -188,7 +188,7 @@ describe Projects::MergeRequestsController do
expect(response).to render_template('diffs')
end
end
-
+
context 'as json' do
it 'renders the diffs template to a string' do
go format: 'json'
@@ -199,6 +199,18 @@ describe Projects::MergeRequestsController do
end
end
+ describe 'GET diffs with view' do
+ it 'saves the preferred diff view in a cookie' do
+ get :diffs,
+ namespace_id: project.namespace.to_param,
+ project_id: project.to_param,
+ id: merge_request.iid,
+ view: 'parallel'
+
+ expect(response.cookies['diff_view']).to eq('parallel')
+ end
+ end
+
describe 'GET commits' do
def go(format: 'html')
get :commits,