"storage/innobase/include/db0err.h" did not exist on "8fe7e029c211dc3856fd3a8274f5fbbc95f12e3b"
Commit 0f8d7012 authored by Stan Hu's avatar Stan Hu

Revert "Make it possible to provide schema version in tests"

This reverts commit 775cee73.
parent 2cec1c54
......@@ -210,11 +210,7 @@ describe Gitlab::BackgroundMigration::MigrateEventsToPushEventPayloads::Event do
end
end
##
# The background migration relies on a temporary table, hence we're migrating
# to a specific version of the database where said table is still present.
#
describe Gitlab::BackgroundMigration::MigrateEventsToPushEventPayloads, :migration, schema: 20170608152748 do
describe Gitlab::BackgroundMigration::MigrateEventsToPushEventPayloads do
let(:migration) { described_class.new }
let(:project) { create(:project_empty_repo) }
let(:author) { create(:user) }
......@@ -233,6 +229,21 @@ describe Gitlab::BackgroundMigration::MigrateEventsToPushEventPayloads, :migrati
)
end
# The background migration relies on a temporary table, hence we're migrating
# to a specific version of the database where said table is still present.
before :all do
ActiveRecord::Migration.verbose = false
ActiveRecord::Migrator
.migrate(ActiveRecord::Migrator.migrations_paths, 20170608152748)
end
after :all do
ActiveRecord::Migrator.migrate(ActiveRecord::Migrator.migrations_paths)
ActiveRecord::Migration.verbose = true
end
describe '#perform' do
it 'returns if data should not be migrated' do
allow(migration).to receive(:migrate?).and_return(false)
......
......@@ -136,12 +136,17 @@ RSpec.configure do |config|
Sidekiq.redis(&:flushall)
end
config.before(:context, :migration) do
schema_migrate_down!
config.before(:example, :migration) do
ActiveRecord::Migrator
.migrate(migrations_paths, previous_migration.version)
reset_column_in_migration_models
end
config.after(:context, :migration) do
schema_migrate_up!
config.after(:example, :migration) do
ActiveRecord::Migrator.migrate(migrations_paths)
reset_column_in_migration_models
end
config.around(:each, :nested_groups) do |example|
......
......@@ -33,21 +33,6 @@ module MigrationsHelpers
end
end
def migration_schema_version
self.class.metadata[:schema] || previous_migration.version
end
def schema_migrate_down!
ActiveRecord::Migrator
.migrate(migrations_paths, migration_schema_version)
reset_column_in_migration_models
end
def schema_migrate_up!
ActiveRecord::Migrator.migrate(migrations_paths)
reset_column_in_migration_models
end
def migrate!
ActiveRecord::Migrator.up(migrations_paths) do |migration|
migration.name == described_class.name
......
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