trying to fix issues with travis builds

msimonborg · May 8, 2017 · 2a1ef46 · 2a1ef46
1 parent 163428b
commit 2a1ef46
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 7 deletions.
diff --git a/config.ru b/config.ru
@@ -2,7 +2,7 @@
 
 require './config/environment'
 
-if ActiveRecord::Migrator.needs_migration? && !test?
+if ActiveRecord::Migrator.needs_migration?
   raise 'Migrations are pending. Run `rake db:migrate` to resolve the issue.'
 end
 

diff --git a/config/environment.rb b/config/environment.rb
@@ -7,12 +7,6 @@
 
 if production?
   ActiveRecord::Base.establish_connection(ENV['DATABASE_URL'])
-elsif test?
-  ActiveRecord::Base.establish_connection(
-    adapter: 'sqlite3',
-    database: ':memory:',
-    timeout: 500
-  )
 else
   ActiveRecord::Base.establish_connection(
     adapter: 'sqlite3',

diff --git a/db/test.sqlite b/db/test.sqlite
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
@@ -16,6 +16,10 @@
 require 'capybara/rspec'
 require 'capybara/dsl'
 
+if ActiveRecord::Migrator.needs_migration?
+  raise 'Migrations are pending. Run to resolve the issue.'
+end
+
 ActiveRecord::Base.logger = nil
 
 RSpec.configure do |config|