diff options
author | Jacob Vosmaer (GitLab) <jacob@gitlab.com> | 2016-06-07 15:50:29 +0300 |
---|---|---|
committer | Jacob Vosmaer (GitLab) <jacob@gitlab.com> | 2016-06-07 15:50:29 +0300 |
commit | afa21054fae2331afcf4b3784a3ffae5657b3e5b (patch) | |
tree | 935256b141573d1bedc9aa0bdd32062edc13a44e /spec/controllers | |
parent | 8c356ac5500d7f82e9afa7fa19b44aefa99edfe7 (diff) | |
parent | d47218fb9732841956a5511afbde38ff731ab106 (diff) |
Merge branch 'zj-workhorse-to-serve-diffs' into 'master'
Workhorse to serve raw diffs
Fixes (partially) #13999
Dependent on: gitlab-org/gitlab-workhorse!45
See merge request !4130
Diffstat (limited to 'spec/controllers')
-rw-r--r-- | spec/controllers/projects/merge_requests_controller_spec.rb | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/spec/controllers/projects/merge_requests_controller_spec.rb b/spec/controllers/projects/merge_requests_controller_spec.rb index 2a9ee881e98..1301574f489 100644 --- a/spec/controllers/projects/merge_requests_controller_spec.rb +++ b/spec/controllers/projects/merge_requests_controller_spec.rb @@ -84,17 +84,14 @@ describe Projects::MergeRequestsController do end describe "as diff" do - include_examples "export merge as", :diff - let(:format) { :diff } - - it "should really only be a git diff" do + it "triggers workhorse to serve the request" do get(:show, namespace_id: project.namespace.to_param, project_id: project.to_param, id: merge_request.iid, - format: format) + format: :diff) - expect(response.body).to start_with("diff --git") + expect(response.headers['Gitlab-Workhorse-Send-Data']).to start_with("git-diff:") end end |