strip down cucumber scenarios to just use the two most popular adapter gems, and reenable to validate the end-to-end UX.

Author: botandrose-machine

Diff for: .travis.yml

@@ -1,4 +1,6 @@
 language: ruby
+services:
+  - redis
 rvm:
   - 2.5
   - 2.6

Diff for: Gemfile

@@ -3,3 +3,5 @@ source "https://rubygems.org"
 gemspec name: "database_cleaner-core"
 
 gem "byebug"
+gem "database_cleaner-active_record", git: "https://github.com/DatabaseCleaner/database_cleaner-active_record"
+gem "database_cleaner-redis", git: "https://github.com/DatabaseCleaner/database_cleaner-redis"

Diff for: Rakefile

@@ -1,7 +1,9 @@
 # testing
 require "rspec/core/rake_task"
 RSpec::Core::RakeTask.new(:spec)
-task :default => :spec
+require "cucumber/rake/task"
+Cucumber::Rake::Task.new(:features)
+task :default => [:spec, :features]
 
 # releasing
 require "rake/clean"

Diff for: database_cleaner-core.gemspec

@@ -25,5 +25,10 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'guard-rspec'
   spec.add_development_dependency "listen"
   spec.add_development_dependency "rspec"
+
   spec.add_development_dependency "cucumber"
+  spec.add_development_dependency "activesupport"
+  spec.add_development_dependency "database_cleaner-active_record"
+  spec.add_development_dependency "sqlite3"
+  spec.add_development_dependency "database_cleaner-redis"
 end

Diff for: examples/features/example.feature

@@ -1,5 +1,5 @@
 Feature: example
- In order to test DataBase Cleaner
+ In order to test DatabaseCleaner
  Here are some scenarios that rely on the DB being clean!
 
   Scenario: dirty the db

Diff for: examples/features/step_definitions/activerecord_steps.rb

@@ -2,8 +2,8 @@
   #DatabaseCleaner
   # require "#{File.dirname(__FILE__)}/../../../lib/datamapper_models"
   #
-  # DatabaseCleaner[:datamapper, {:connection => :one} ].strategy = :truncation
-  # DatabaseCleaner[:datamapper, {:connection => :two} ].strategy = :truncation
+  # DatabaseCleaner[:active_record, connection: :one].strategy = :truncation
+  # DatabaseCleaner[:active_record, connection: :two].strategy = :truncation
 end
 
 When /^I create a widget using activerecord$/ do

Diff for: examples/features/step_definitions/couchpotato_steps.rb

@@ -1,6 +1,3 @@
-#Hilarious as it seems, this is necessary so bundle exec cucumber works for mongoid cukeage (I'm assuming mongomapper is automatically present because its a git repo)
-Object.send(:remove_const, 'MongoMapper')  if defined?(::MongoMapper)
-
 require 'bundler'
 
 Bundler.setup
@@ -9,7 +6,6 @@
 
 DB_DIR = "#{File.dirname(__FILE__)}/../../db"
 
-use_gems    = ENV['USE_GEMS']
 orm         = ENV['ORM']
 another_orm = ENV['ANOTHER_ORM']
 strategy    = ENV['STRATEGY']
@@ -24,48 +20,34 @@
 
 if orm && strategy
   require "#{File.dirname(__FILE__)}/../../lib/#{orm.downcase}_models"
-  if use_gems
-    require "database_cleaner-#{orm.underscore}"
-  else
-    $:.unshift(File.dirname(__FILE__) + '/../../../lib')
-    require "database_cleaner-core"
-  end
+  require "database_cleaner-#{orm.underscore}"
 
   if another_orm
     require "#{File.dirname(__FILE__)}/../../lib/#{another_orm.downcase}_models"
-    if use_gems
-      require "database_cleaner-#{another_orm.underscore}"
-    end
+    require "database_cleaner-#{another_orm.underscore}"
   end
 
   require 'database_cleaner/cucumber'
 
   if multiple_db
-    DatabaseCleaner.app_root = "#{File.dirname(__FILE__)}/../.."
     orm_sym = orm.gsub(/(.)([A-Z]+)/,'\1_\2').downcase.to_sym
 
     case orm_sym
-    when :mongo_mapper
-      DatabaseCleaner[ orm_sym, {:connection => 'database_cleaner_test_one'} ].strategy = strategy.to_sym
-      DatabaseCleaner[ orm_sym, {:connection => 'database_cleaner_test_two'} ].strategy = strategy.to_sym
-    when :redis, :ohm
-      DatabaseCleaner[ orm_sym, {:connection => ENV['REDIS_URL_ONE']} ].strategy = strategy.to_sym
-      DatabaseCleaner[ orm_sym, {:connection => ENV['REDIS_URL_TWO']} ].strategy = strategy.to_sym
+    when :redis
+      DatabaseCleaner[orm_sym, connection: ENV['REDIS_URL_ONE']].strategy = strategy.to_sym
+      DatabaseCleaner[orm_sym, connection: ENV['REDIS_URL_TWO']].strategy = strategy.to_sym
     when :active_record
-      DatabaseCleaner[:active_record, {:model => ActiveRecordWidgetUsingDatabaseOne} ].strategy = strategy.to_sym
-      DatabaseCleaner[:active_record, {:model => ActiveRecordWidgetUsingDatabaseTwo} ].strategy = strategy.to_sym
-    else
-      DatabaseCleaner[ orm_sym, {:connection => :one} ].strategy = strategy.to_sym
-      DatabaseCleaner[ orm_sym, {:connection => :two} ].strategy = strategy.to_sym
+      DatabaseCleaner[:active_record, model: ActiveRecordWidgetUsingDatabaseOne].strategy = strategy.to_sym
+      DatabaseCleaner[:active_record, model: ActiveRecordWidgetUsingDatabaseTwo].strategy = strategy.to_sym
     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
+    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
   else
     DatabaseCleaner.strategy = strategy.to_sym unless strategy == "default"
   end
 
 else
-  raise "Run 'ORM=ActiveRecord|DataMapper|MongoMapper|CouchPotato|Ohm|Redis [ANOTHER_ORM=...] [MULTIPLE_DBS=true] STRATEGY=transaction|truncation|default cucumber examples/features'"
+  raise "Run 'ORM=ActiveRecord|Redis [ANOTHER_ORM=...] [MULTIPLE_DBS=true] STRATEGY=transaction|truncation|default cucumber examples/features'"
 end