Add latest changes from gitlab-org/gitlab@13-6-stable-eev13.6.0-rc42

1 files changed, 13 insertions, 0 deletions

diff --git a/spec/lib/extracts_path_spec.rb b/spec/lib/extracts_path_spec.rb
index dbb3aa8797e..b69cbbf0ec0 100644
--- a/spec/lib/extracts_path_spec.rb
+++ b/spec/lib/extracts_path_spec.rb
@@ -112,6 +112,19 @@ RSpec.describe ExtractsPath do
         end
       end
     end
+
+    context 'ref and path are nil' do
+      let(:params) { { path: nil, ref: nil } }
+
+      it 'does not set commit' do
+        expect(container.repository).not_to receive(:commit).with('')
+        expect(self).to receive(:render_404)
+
+        assign_ref_vars
+
+        expect(@commit).to be_nil
+      end
+    end
   end
 
   it_behaves_like 'extracts refs'