Merge branch 'fix-issue-2593' into 'master'

Fix Error 500 when comparing non-existing branches

Closes #2593

See merge request !1355

1 files changed, 26 insertions, 0 deletions

diff --git a/spec/controllers/projects/compare_controller_spec.rb b/spec/controllers/projects/compare_controller_spec.rb
index b643b354073..2a447248b70 100644
--- a/spec/controllers/projects/compare_controller_spec.rb
+++ b/spec/controllers/projects/compare_controller_spec.rb
@@ -22,4 +22,30 @@ describe Projects::CompareController do
     expect(assigns(:diffs).length).to be >= 1
     expect(assigns(:commits).length).to be >= 1
   end
+
+  describe 'non-existent refs' do
+    it 'invalid source ref' do
+      get(:show,
+          namespace_id: project.namespace.to_param,
+          project_id: project.to_param,
+          from: 'non-existent',
+          to: ref_to)
+
+      expect(response).to be_success
+      expect(assigns(:diffs)).to eq([])
+      expect(assigns(:commits)).to eq([])
+    end
+
+    it 'invalid target ref' do
+      get(:show,
+          namespace_id: project.namespace.to_param,
+          project_id: project.to_param,
+          from: ref_from,
+          to: 'non-existent')
+
+      expect(response).to be_success
+      expect(assigns(:diffs)).to eq(nil)
+      expect(assigns(:commits)).to eq(nil)
+    end
+  end
 end