Commit d762302e authored by Rémy Coutable's avatar Rémy Coutable

Merge branch 'rubocop-handle-ee-migration-specs' into 'master'

Properly handle `ee` migration specs

See merge request gitlab-org/gitlab-ce!26685
parents 7753648a f234d9f1
...@@ -28,7 +28,7 @@ module RuboCop ...@@ -28,7 +28,7 @@ module RuboCop
source_name = node.location.expression.source_buffer.name source_name = node.location.expression.source_buffer.name
path = Pathname.new(source_name).relative_path_from(rails_root) path = Pathname.new(source_name).relative_path_from(rails_root)
dirname = File.dirname(path) dirname = File.dirname(path)
.sub(%r{\Adb/(migrate|post_migrate)}, 'spec/migrations') .sub(%r{db/(migrate|post_migrate)}, 'spec/migrations')
filename = File.basename(source_name, '.rb').sub(/\A\d+_/, '') filename = File.basename(source_name, '.rb').sub(/\A\d+_/, '')
File.join(dirname, "#{filename}_spec.rb") File.join(dirname, "#{filename}_spec.rb")
......
...@@ -93,4 +93,22 @@ describe RuboCop::Cop::Migration::UpdateColumnInBatches do ...@@ -93,4 +93,22 @@ describe RuboCop::Cop::Migration::UpdateColumnInBatches do
it_behaves_like 'a migration file with no spec file' it_behaves_like 'a migration file with no spec file'
it_behaves_like 'a migration file with a spec file' it_behaves_like 'a migration file with a spec file'
end end
context 'EE migrations' do
let(:spec_filepath) { tmp_rails_root.join('ee', 'spec', 'migrations', 'my_super_migration_spec.rb') }
context 'in a migration' do
let(:migration_filepath) { tmp_rails_root.join('ee', 'db', 'migrate', '20121220064453_my_super_migration.rb') }
it_behaves_like 'a migration file with no spec file'
it_behaves_like 'a migration file with a spec file'
end
context 'in a post migration' do
let(:migration_filepath) { tmp_rails_root.join('ee', 'db', 'post_migrate', '20121220064453_my_super_migration.rb') }
it_behaves_like 'a migration file with no spec file'
it_behaves_like 'a migration file with a spec file'
end
end
end end
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment