diff options
| -rw-r--r-- | Gemfile | 1 | ||||
| -rw-r--r-- | Gemfile.lock | 10 | ||||
| -rw-r--r-- | spec/spec_helper.rb | 4 | ||||
| -rw-r--r-- | spec/support/referential.rb | 11 |
4 files changed, 9 insertions, 17 deletions
@@ -135,7 +135,6 @@ end group :test, :development do gem "rspec-rails", "~> 3.1.0" gem 'capybara', "~> 2.4.0" - gem 'capybara-webkit' gem 'poltergeist' gem 'launchy' gem 'factory_girl_rails', '1.7' diff --git a/Gemfile.lock b/Gemfile.lock index 88119a967..8694dcb13 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -92,9 +92,6 @@ GEM rack (>= 1.0.0) rack-test (>= 0.5.4) xpath (~> 2.0) - capybara-webkit (1.4.1) - capybara (>= 2.3.0, < 2.5.0) - json celluloid (0.16.0) timers (~> 4.0.0) choice (0.1.7) @@ -253,16 +250,16 @@ GEM net-ssh (2.6.2) net-ssh-gateway (1.1.0) net-ssh (>= 1.99.1) - nokogiri (1.6.5) + nokogiri (1.6.6.2) mini_portile (~> 0.6.0) - nokogiri (1.6.5-java) + nokogiri (1.6.6.2-java) open4 (1.3.0) orm_adapter (0.5.0) parser (2.2.0.pre.7) ast (>= 1.1, < 3.0) slop (~> 3.4, >= 3.4.5) pg (0.17.1) - poltergeist (1.5.1) + poltergeist (1.6.0) capybara (~> 2.1) cliver (~> 0.3.1) multi_json (~> 1.0) @@ -464,7 +461,6 @@ DEPENDENCIES capistrano capistrano-ext capybara (~> 2.4.0) - capybara-webkit cocoon coffee-rails (~> 4.0.0) daemons diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb index c831d2490..21dbac2ff 100644 --- a/spec/spec_helper.rb +++ b/spec/spec_helper.rb @@ -40,7 +40,7 @@ ActiveRecord::Migration.maintain_test_schema! RSpec.configure do |config| #Capybara.exact = true - Capybara.javascript_driver = :webkit + Capybara.javascript_driver = :poltergeist config.filter_run_excluding :js => true config.run_all_when_everything_filtered = true config.include TokenInputHelper, :type => :feature @@ -59,7 +59,7 @@ RSpec.configure do |config| # If you're not using ActiveRecord, or you'd prefer not to run each of your # examples within a transaction, remove the following line or assign false # instead of true. - config.use_transactional_fixtures = true + config.use_transactional_fixtures = false # RSpec Rails can automatically mix in different behaviours to your tests # based on their file location, for example enabling you to call `get` and diff --git a/spec/support/referential.rb b/spec/support/referential.rb index 0cfc3601e..b2a8cf279 100644 --- a/spec/support/referential.rb +++ b/spec/support/referential.rb @@ -29,8 +29,6 @@ RSpec.configure do |config| config.before(:suite) do # Clean all tables to start DatabaseCleaner.clean_with :truncation - # Use transactions for tests - DatabaseCleaner.strategy = :transaction # Truncating doesn't drop schemas, ensure we're clean here, first *may not* exist Apartment::Tenant.drop('first') rescue nil # Create the default tenant for our tests @@ -39,18 +37,17 @@ RSpec.configure do |config| end config.before(:each) do - # Start transaction for this test - DatabaseCleaner.start + DatabaseCleaner.strategy = :transaction # Switch into the default tenant first_referential.switch end config.before(:each, :js => true) do DatabaseCleaner.strategy = :truncation - # Start transaction for this test + end + + config.before(:each) do DatabaseCleaner.start - # Switch into the default tenant - first_referential.switch end config.after(:each) do |