diff --git a/examples/features/support/env.rb b/examples/features/support/env.rb index 10c565b..66c8125 100644 --- a/examples/features/support/env.rb +++ b/examples/features/support/env.rb @@ -47,16 +47,22 @@ if orm && strategy case orm_sym when :redis - DatabaseCleaner[orm_sym, db: ENV['REDIS_URL_ONE']].strategy = strategy.to_sym - DatabaseCleaner[orm_sym, db: ENV['REDIS_URL_TWO']].strategy = strategy.to_sym + cleaner = DatabaseCleaner[orm_sym, db: ENV['REDIS_URL_ONE']] + cleaner.strategy = strategy.to_sym unless strategy == "default" + cleaner = DatabaseCleaner[orm_sym, db: ENV['REDIS_URL_TWO']] + cleaner.strategy = strategy.to_sym unless strategy == "default" when :active_record - DatabaseCleaner[:active_record, db: ActiveRecordWidgetUsingDatabaseOne].strategy = strategy.to_sym - DatabaseCleaner[:active_record, db: ActiveRecordWidgetUsingDatabaseTwo].strategy = strategy.to_sym + cleaner = DatabaseCleaner[:active_record, db: ActiveRecordWidgetUsingDatabaseOne] + cleaner.strategy = strategy.to_sym unless strategy == "default" + cleaner = DatabaseCleaner[:active_record, db: ActiveRecordWidgetUsingDatabaseTwo] + cleaner.strategy = strategy.to_sym unless strategy == "default" end elsif another_orm - DatabaseCleaner[ orm.gsub(/(.)([A-Z]+)/,'\1_\2').downcase.to_sym].strategy = strategy.to_sym - DatabaseCleaner[another_orm.gsub(/(.)([A-Z]+)/,'\1_\2').downcase.to_sym].strategy = strategy.to_sym + cleaner = DatabaseCleaner[ orm.gsub(/(.)([A-Z]+)/,'\1_\2').downcase.to_sym] + cleaner.strategy = strategy.to_sym unless strategy == "default" + cleaner = DatabaseCleaner[another_orm.gsub(/(.)([A-Z]+)/,'\1_\2').downcase.to_sym] + cleaner.strategy = strategy.to_sym unless strategy == "default" else DatabaseCleaner.strategy = strategy.to_sym unless strategy == "default" end diff --git a/features/cleaning.feature b/features/cleaning.feature index 8cdd5cb..df569a3 100644 --- a/features/cleaning.feature +++ b/features/cleaning.feature @@ -15,4 +15,4 @@ Feature: database cleaning | ActiveRecord | transaction | | ActiveRecord | truncation | | ActiveRecord | deletion | - | Redis | truncation | + | Redis | deletion | diff --git a/features/cleaning_multiple_dbs.feature b/features/cleaning_multiple_dbs.feature index febdbb9..8e619e7 100644 --- a/features/cleaning_multiple_dbs.feature +++ b/features/cleaning_multiple_dbs.feature @@ -15,5 +15,5 @@ Feature: multiple database cleaning | ActiveRecord | truncation | | ActiveRecord | deletion | | ActiveRecord | transaction | - | Redis | truncation | + | Redis | deletion | diff --git a/features/cleaning_multiple_orms.feature b/features/cleaning_multiple_orms.feature index 43292e0..c30bd15 100644 --- a/features/cleaning_multiple_orms.feature +++ b/features/cleaning_multiple_orms.feature @@ -5,7 +5,6 @@ Feature: database cleaning using multiple ORMs Scenario Outline: ruby app with adapter gems Given I am using and from their adapter gems - When I run my scenarios that rely on clean databases using multiple orms Then I should see all green diff --git a/features/support/env.rb b/features/support/env.rb index 06d8538..d3a6fea 100644 --- a/features/support/env.rb +++ b/features/support/env.rb @@ -22,7 +22,7 @@ class FeatureRunner attr_accessor :output def strategy - @strategy || 'truncation' + @strategy ||= "default" end def go(feature)