Merge branch 'mysql' of github.com:diaspora/diaspora into mysql

This commit is contained in:
Raphael 2010-12-26 20:37:28 -08:00
commit 34b5566333

View file

@ -39,7 +39,7 @@ begin
require 'database_cleaner'
require 'database_cleaner/cucumber'
DatabaseCleaner.strategy = :truncation
DatabaseCleaner.orm = "mongo_mapper"
DatabaseCleaner.orm = "active_record"
end
require File.join(File.dirname(__FILE__), "..", "..", "spec", "helper_methods")
@ -66,8 +66,3 @@ class FakeRedis
true
end
end
Before do
UserFixer.regenerate_user_fixtures
UserFixer.load_user_fixtures
end