Conflicts:
VERSION.yml
features/step_definitions/database_cleaner_steps.rb
lib/database_cleaner/configuration.rb
spec/database_cleaner/active_record/transaction_spec.rb
spec/database_cleaner/configuration_spec.rb
spec/database_cleaner/mongo_mapper/truncation_spec.rb
This is merge is not yet complete. The Mongoid strategy/specs is not completely updated
to the new structure of the project. Additionaly, I see quite a bit of
duplication between Mongoid and MongoMapper. Since they both rely on
the same underlying mongo lib I am thinking of just having a single
Mongo strategy. How the default connection is inferred can use
autodetect magic of MongoMapper and Mongoid. (Meaning, for the
Truncation strategy the #connection method would get the connection
from either MongoMapper or Mongoid depending on what is defined...
or it could use what was set by the user.)
Ben Mabey