Add latest changes from gitlab-org/gitlab@master

1 files changed, 31 insertions, 0 deletions

diff --git a/spec/controllers/projects/commit_controller_spec.rb b/spec/controllers/projects/commit_controller_spec.rb
index 36206a88786..565bb79e337 100644
--- a/spec/controllers/projects/commit_controller_spec.rb
+++ b/spec/controllers/projects/commit_controller_spec.rb
@@ -459,6 +459,37 @@ RSpec.describe Projects::CommitController, feature_category: :source_code_manage
     end
   end
 
+  describe 'GET #diff_files' do
+    subject(:send_request) { get :diff_files, params: params }
+
+    let(:format) { :html }
+    let(:params) do
+      {
+        namespace_id: project.namespace,
+        project_id: project,
+        id: commit.id,
+        format: format
+      }
+    end
+
+    it 'renders diff files' do
+      send_request
+
+      expect(assigns(:diffs)).to be_a(Gitlab::Diff::FileCollection::Commit)
+      expect(assigns(:environment)).to be_nil
+    end
+
+    context 'when format is not html' do
+      let(:format) { :json }
+
+      it 'returns 404 page' do
+        send_request
+
+        expect(response).to have_gitlab_http_status(:not_found)
+      end
+    end
+  end
+
   describe 'GET diff_for_path' do
     def diff_for_path(extra_params = {})
       params = {