diff options
| author | Alfredo Sumaran <alfredo@gitlab.com> | 2016-04-22 08:37:15 -0500 |
|---|---|---|
| committer | Alfredo Sumaran <alfredo@gitlab.com> | 2016-04-22 08:37:15 -0500 |
| commit | 21a1e1567784809b8773bb7c48ae33a1a42f73dc (patch) | |
| tree | a67e3bbae2e87dbec3278b2db872ac95ea17c784 /spec/controllers/projects/merge_requests_controller_spec.rb | |
| parent | e0c07b5e3d1e14fa6efda3c13db46477d79c7c34 (diff) | |
| parent | d5398e9656c1174d4d5be5a8cdad2a26d7587a27 (diff) | |
| download | gitlab-ce-21a1e1567784809b8773bb7c48ae33a1a42f73dc.tar.gz | |
Merge remote-tracking branch 'origin/master' into issue_3799
Diffstat (limited to 'spec/controllers/projects/merge_requests_controller_spec.rb')
| -rw-r--r-- | spec/controllers/projects/merge_requests_controller_spec.rb | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/spec/controllers/projects/merge_requests_controller_spec.rb b/spec/controllers/projects/merge_requests_controller_spec.rb index c54e83339a1..c0a1f45195f 100644 --- a/spec/controllers/projects/merge_requests_controller_spec.rb +++ b/spec/controllers/projects/merge_requests_controller_spec.rb @@ -300,14 +300,6 @@ describe Projects::MergeRequestsController do expect(response.cookies['diff_view']).to eq('parallel') end - - it 'assigns :view param based on cookie' do - request.cookies['diff_view'] = 'parallel' - - go - - expect(controller.params[:view]).to eq 'parallel' - end end describe 'GET commits' do |