test/support/integration.rb in devise-1.5.4 vs test/support/integration.rb in devise-2.0.0.rc

- old
+ new

@@ -21,11 +21,13 @@ end def create_admin(options={}) @admin ||= begin admin = Admin.create!( - :email => 'admin@test.com', :password => '123456', :password_confirmation => '123456' + :email => options[:email] || 'admin@test.com', + :password => '123456', :password_confirmation => '123456' ) + admin.confirm! unless options[:confirm] == false admin end end def sign_in_as_user(options={}, &block)