Add latest changes from gitlab-org/gitlab@master

2 files changed, 44 insertions, 0 deletions

diff --git a/spec/lib/gitlab/database/migration_spec.rb b/spec/lib/gitlab/database/migration_spec.rb
new file mode 100644
index 00000000000..e062bf3e5ef
--- /dev/null
+++ b/spec/lib/gitlab/database/migration_spec.rb
@@ -0,0 +1,34 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+RSpec.describe Gitlab::Database::Migration do
+  describe '.[]' do
+    context 'version: 1.0' do
+      subject { described_class[1.0] }
+
+      it 'inherits from ActiveRecord::Migration[6.1]' do
+        expect(subject.superclass).to eq(ActiveRecord::Migration[6.1])
+      end
+
+      it 'includes migration helpers version 2' do
+        expect(subject.included_modules).to include(Gitlab::Database::MigrationHelpers::V2)
+      end
+    end
+
+    context 'unknown version' do
+      it 'raises an error' do
+        expect { described_class[0] }.to raise_error(ArgumentError, /Unknown migration version/)
+      end
+    end
+  end
+
+  describe '.current_version' do
+    it 'includes current ActiveRecord migration class' do
+      # This breaks upon Rails upgrade. In that case, we'll add a new version in Gitlab::Database::Migration::MIGRATION_CLASSES,
+      # bump .current_version and leave existing migrations and already defined versions of Gitlab::Database::Migration
+      # untouched.
+      expect(described_class[described_class.current_version].superclass).to eq(ActiveRecord::Migration::Current)
+    end
+  end
+end
diff --git a/spec/lib/gitlab/path_regex_spec.rb b/spec/lib/gitlab/path_regex_spec.rb
index d343634fb92..aa13660deb4 100644
--- a/spec/lib/gitlab/path_regex_spec.rb
+++ b/spec/lib/gitlab/path_regex_spec.rb
@@ -468,6 +468,7 @@ RSpec.describe Gitlab::PathRegex do
     end
 
     let_it_be(:git_paths) { container_paths.map { |path| path + '.git' } }
+    let_it_be(:git_lfs_paths) { git_paths.flat_map { |path| [path + '/info/lfs/', path + '/gitlab-lfs/'] } }
     let_it_be(:snippet_paths) { container_paths.grep(%r{snippets/\d}) }
     let_it_be(:wiki_git_paths) { (container_paths - snippet_paths).map { |path| path + '.wiki.git' } }
     let_it_be(:invalid_git_paths) { invalid_paths.map { |path| path + '.git' } }
@@ -498,6 +499,15 @@ RSpec.describe Gitlab::PathRegex do
       end
     end
 
+    describe '.repository_git_lfs_route_regex' do
+      subject { %r{\A#{described_class.repository_git_lfs_route_regex}\z} }
+
+      it 'matches the expected paths' do
+        expect_route_match(git_lfs_paths)
+        expect_no_route_match(container_paths + invalid_paths + git_paths + invalid_git_paths)
+      end
+    end
+
     describe '.repository_wiki_git_route_regex' do
       subject { %r{\A#{described_class.repository_wiki_git_route_regex}\z} }