diff options
author | Nick Thomas <nick@gitlab.com> | 2018-06-08 20:16:36 +0300 |
---|---|---|
committer | Nick Thomas <nick@gitlab.com> | 2018-06-08 20:16:36 +0300 |
commit | 8cd6ffab51acade21f793103d4fedf6c04a20496 (patch) | |
tree | 13a427ae7f5691e3fc3b2ca17b9a49e0fd42feb6 | |
parent | b32f3685aee483a06558d181c4ec72bfb255a007 (diff) | |
parent | b00b861863bd963224593846791ea0b6993d9b88 (diff) |
Merge branch 'rs-schema-spec-parity' into 'master'
Refactor schema_spec.rb for CE-EE parity and simplicity
See merge request gitlab-org/gitlab-ce!19563
-rw-r--r-- | spec/migrations/active_record/schema_spec.rb | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/spec/migrations/active_record/schema_spec.rb b/spec/migrations/active_record/schema_spec.rb index e132529d8d8..9d35b3cd642 100644 --- a/spec/migrations/active_record/schema_spec.rb +++ b/spec/migrations/active_record/schema_spec.rb @@ -5,7 +5,11 @@ require 'spec_helper' describe ActiveRecord::Schema do let(:latest_migration_timestamp) do - migrations = Dir[Rails.root.join('db', 'migrate', '*'), Rails.root.join('db', 'post_migrate', '*')] + migrations_paths = %w[db ee/db] + .product(%w[migrate post_migrate]) + .map { |path| Rails.root.join(*path, '*') } + + migrations = Dir[*migrations_paths] migrations.map { |migration| File.basename(migration).split('_').first.to_i }.max end |