Skip to content

Commit

Permalink
Merge branch 'master' of https://github.com/markus/cucumber-rails int…
Browse files Browse the repository at this point in the history
…o markus-master
  • Loading branch information
aslakhellesoy committed Apr 4, 2011
2 parents c626e65 + 8c9cd77 commit 44dc776
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions lib/cucumber/rails/hooks/database_cleaner.rb
Expand Up @@ -12,11 +12,11 @@
end

Before('~@no-txn', '~@selenium', '~@culerity', '~@celerity', '~@javascript') do
DatabaseCleaner.strategy = :truncation
DatabaseCleaner.strategy = $__cucumber_global_database_cleaner_strategy
end

Before('@no-txn,@selenium,@culerity,@celerity,@javascript') do
DatabaseCleaner.strategy = $__cucumber_global_database_cleaner_strategy
DatabaseCleaner.strategy = :truncation
end

Before do
Expand Down

0 comments on commit 44dc776

Please sign in to comment.