From 0faf80aa9d2a32d872a21f125862d46157013082 Mon Sep 17 00:00:00 2001 From: Jeroen van Baarsen Date: Fri, 6 Jun 2014 08:25:02 +0200 Subject: Temp fix for rspec so the specs are run again Signed-off-by: Jeroen van Baarsen --- spec/support/db_cleaner.rb | 23 ++++++++++------------- 1 file changed, 10 insertions(+), 13 deletions(-) diff --git a/spec/support/db_cleaner.rb b/spec/support/db_cleaner.rb index f2b310245bd..fa466ef5aea 100644 --- a/spec/support/db_cleaner.rb +++ b/spec/support/db_cleaner.rb @@ -1,21 +1,18 @@ RSpec.configure do |config| - config.around(:each) do - DatabaseCleaner.clean_with(:truncation) - end - config.around(:each) do + config.around(:each) do |example| DatabaseCleaner.strategy = :transaction + DatabaseCleaner.clean_with(:truncation) + DatabaseCleaner.cleaning do + example.run + end end - config.around(:each, js: true) do + config.around(:each, js: true) do |example| DatabaseCleaner.strategy = :truncation - end - - config.before(:each) do - DatabaseCleaner.start - end - - config.after(:each) do - DatabaseCleaner.clean + DatabaseCleaner.clean_with(:truncation) + DatabaseCleaner.cleaning do + example.run + end end end -- cgit v1.2.1 From bd65f486d907b00f588bdfe7c7c241782fb491fd Mon Sep 17 00:00:00 2001 From: Jeroen van Baarsen Date: Fri, 6 Jun 2014 18:58:38 +0200 Subject: Gem update for database_cleaner Signed-off-by: Jeroen van Baarsen --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index 5124863692a..0d13ed5884c 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -89,7 +89,7 @@ GEM d3_rails (3.1.10) railties (>= 3.1.0) daemons (1.1.9) - database_cleaner (1.2.0) + database_cleaner (1.3.0) debug_inspector (0.0.2) default_value_for (3.0.0) activerecord (>= 3.2.0, < 5.0) -- cgit v1.2.1 From 7cf1a4259ac123725f2eb0ab6fc682e739d45734 Mon Sep 17 00:00:00 2001 From: Jeroen van Baarsen Date: Fri, 6 Jun 2014 19:55:49 +0200 Subject: Disable fixtures Signed-off-by: Jeroen van Baarsen --- spec/spec_helper.rb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb index e6b1f816df0..65a641bcf12 100644 --- a/spec/spec_helper.rb +++ b/spec/spec_helper.rb @@ -27,6 +27,8 @@ Dir[Rails.root.join("spec/support/**/*.rb")].each {|f| require f} WebMock.disable_net_connect!(allow_localhost: true) RSpec.configure do |config| + config.use_transactional_fixtures = false + config.use_instantiated_fixtures = false config.mock_with :rspec config.include LoginHelpers, type: :feature @@ -39,7 +41,6 @@ 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 = false config.before(:suite) do TestEnv.init(observers: false, init_repos: true, repos: false) -- cgit v1.2.1 From 2838a993da78bf365d7a84dc51f57a605fc99c96 Mon Sep 17 00:00:00 2001 From: Jeroen van Baarsen Date: Sat, 7 Jun 2014 10:09:56 +0200 Subject: DB cleaner reverted to a known working version Signed-off-by: Jeroen van Baarsen --- spec/support/db_cleaner.rb | 41 +++++++++++++++++++++++++++++++---------- 1 file changed, 31 insertions(+), 10 deletions(-) diff --git a/spec/support/db_cleaner.rb b/spec/support/db_cleaner.rb index fa466ef5aea..d2d532d9738 100644 --- a/spec/support/db_cleaner.rb +++ b/spec/support/db_cleaner.rb @@ -1,18 +1,39 @@ +# RSpec.configure do |config| + +# config.around(:each) do |example| +# DatabaseCleaner.strategy = :transaction +# DatabaseCleaner.clean_with(:truncation) +# DatabaseCleaner.cleaning do +# example.run +# end +# end + +# config.around(:each, js: true) do |example| +# DatabaseCleaner.strategy = :truncation +# DatabaseCleaner.clean_with(:truncation) +# DatabaseCleaner.cleaning do +# example.run +# end +# end +# end RSpec.configure do |config| + config.before(:suite) do + DatabaseCleaner.clean_with(:truncation) + end - config.around(:each) do |example| + config.before(:each) do DatabaseCleaner.strategy = :transaction - DatabaseCleaner.clean_with(:truncation) - DatabaseCleaner.cleaning do - example.run - end end - config.around(:each, js: true) do |example| + config.before(:each, :js => true) do DatabaseCleaner.strategy = :truncation - DatabaseCleaner.clean_with(:truncation) - DatabaseCleaner.cleaning do - example.run - end + end + + config.before(:each) do + DatabaseCleaner.start + end + + config.after(:each) do + DatabaseCleaner.clean end end -- cgit v1.2.1