diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-06-29 00:10:13 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-06-29 00:10:13 +0300 |
commit | 8f016fe5fb42704dd949e77859888fcd898fd985 (patch) | |
tree | 32c3c311c5fb330769601b2cf684aebe6f102196 /spec/migrations | |
parent | e4632f4c63eae7ec36243d11b23d69b4fd880830 (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/migrations')
-rw-r--r-- | spec/migrations/active_record/schema_spec.rb | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/spec/migrations/active_record/schema_spec.rb b/spec/migrations/active_record/schema_spec.rb index 8199f55f5fc..4a505c51a16 100644 --- a/spec/migrations/active_record/schema_spec.rb +++ b/spec/migrations/active_record/schema_spec.rb @@ -7,10 +7,10 @@ require 'spec_helper' RSpec.describe ActiveRecord::Schema, schema: :latest do let(:all_migrations) do - migrations_paths = %w[db/migrate db/post_migrate] - .map { |path| Rails.root.join(*path, '*') } + migrations_directories = %w[db/migrate db/post_migrate].map { |path| Rails.root.join(path).to_s } + migrations_paths = migrations_directories.map { |path| File.join(path, '*') } - migrations = Dir[*migrations_paths] + migrations = Dir[*migrations_paths] - migrations_directories migrations.map { |migration| File.basename(migration).split('_').first.to_i }.sort end |