Rename auto_migrate to DummyApp::Migrations

It's cleaner to call a method (DummyApp::Migrations.auto_migrate) than to expect side effects from requiring that file.
nebulab · Oct 27, 2017 · df0c5f7 · df0c5f7
1 parent 2f4b68c
commit df0c5f7
Show file tree

Hide file tree

Showing 8 changed files with 18 additions and 21 deletions.
diff --git a/api/spec/spec_helper.rb b/api/spec/spec_helper.rb
@@ -16,7 +16,7 @@
 ENV["LIB_NAME"] = 'solidus_api'
 
 require 'spree/testing_support/dummy_app'
-require 'spree/testing_support/dummy_app/auto_migrate'
+DummyApp::Migrations.auto_migrate
 
 require 'rspec/rails'
 require 'ffaker'

diff --git a/backend/spec/spec_helper.rb b/backend/spec/spec_helper.rb
@@ -18,7 +18,7 @@
 
 require 'solidus_backend'
 require 'spree/testing_support/dummy_app'
-require 'spree/testing_support/dummy_app/auto_migrate'
+DummyApp::Migrations.auto_migrate
 
 require 'rails-controller-testing'
 require 'rspec/rails'

diff --git a/backend/spec/teaspoon_env.rb b/backend/spec/teaspoon_env.rb
@@ -7,7 +7,7 @@
 require 'teaspoon-mocha'
 
 require 'spree/testing_support/dummy_app'
-require 'spree/testing_support/dummy_app/auto_migrate'
+DummyApp::Migrations.auto_migrate
 
 Teaspoon.configure do |config|
  config.mount_at = "/teaspoon"

diff --git a/core/lib/spree/testing_support/dummy_app.rb b/core/lib/spree/testing_support/dummy_app.rb
@@ -69,6 +69,7 @@ class Application < ::Rails::Application
  end
  end
  config.paths['db/migrate'] = migration_dirs
+ ActiveRecord::Migrator.migrations_paths = migration_dirs
 
  config.action_controller.include_all_helpers = false
 
@@ -81,7 +82,7 @@ class Application < ::Rails::Application
  end
 end
 
-Spree.user_class = 'Spree::LegacyUser'
+require 'spree/testing_support/dummy_app/migrations'
 
 DummyApp::Application.initialize!
 
@@ -93,6 +94,7 @@ class Application < ::Rails::Application
  wrap_parameters format: [:json]
 end
 
+Spree.user_class = 'Spree::LegacyUser'
 Spree.config do |config|
  config.mails_from = "[email protected]"
 end
diff --git a/...testing_support/dummy_app/auto_migrate.rb → ...e/testing_support/dummy_app/migrations.rb b/...testing_support/dummy_app/auto_migrate.rb → ...e/testing_support/dummy_app/migrations.rb
@@ -1,6 +1,7 @@
-
 module DummyApp
- class AutoMigrate
+ module Migrations
+ extend self
+
  # Ensure database exists
  def database_exists?
  ActiveRecord::Base.connection
@@ -10,8 +11,12 @@ def database_exists?
  true
  end
 
- def migrate
- if !database_exists? || ActiveRecord::Migrator.needs_migration?
+ def needs_migration?
+ !database_exists? || ActiveRecord::Migrator.needs_migration?
+ end
+
+ def auto_migrate
+ if needs_migration?
  puts "Configuration changed. Re-running migrations"
  sh 'rake db:reset VERBOSE=false'
 
@@ -28,13 +33,3 @@ def sh(cmd)
  end
  end
 end
-
-ActiveRecord::Migrator.migrations_paths = Rails.application.migration_railties.flat_map do |engine|
- if engine.respond_to?(:paths)
- engine.paths['db/migrate'].to_a
- else
- []
- end
-end
-
-DummyApp::AutoMigrate.new.migrate
diff --git a/core/spec/rails_helper.rb b/core/spec/rails_helper.rb
@@ -4,7 +4,7 @@
 ENV["LIB_NAME"] = 'solidus_core'
 
 require 'spree/testing_support/dummy_app'
-require 'spree/testing_support/dummy_app/auto_migrate'
+DummyApp::Migrations.auto_migrate
 
 require 'rspec/rails'
 require 'rspec-activemodel-mocks'

diff --git a/frontend/spec/spec_helper.rb b/frontend/spec/spec_helper.rb
@@ -18,7 +18,7 @@
 
 require 'solidus_frontend'
 require 'spree/testing_support/dummy_app'
-require 'spree/testing_support/dummy_app/auto_migrate'
+DummyApp::Migrations.auto_migrate
 
 require 'rspec/rails'
 require 'ffaker'

diff --git a/sample/spec/spec_helper.rb b/sample/spec/spec_helper.rb
@@ -5,7 +5,7 @@
 
 require 'solidus_sample'
 require 'spree/testing_support/dummy_app'
-require 'spree/testing_support/dummy_app/auto_migrate'
+DummyApp::Migrations.auto_migrate
 
 require 'rspec/rails'
 require 'ffaker'