From 7b70d81c831d3e033993ef571e085bfee28ae590 Mon Sep 17 00:00:00 2001 From: Dmitriy Zaporozhets Date: Thu, 17 Oct 2013 10:52:38 +0300 Subject: [PATCH] Speed up tests --- spec/factories.rb | 6 ++---- spec/support/test_env.rb | 3 +-- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/spec/factories.rb b/spec/factories.rb index 91ef5086a..624cb0f76 100644 --- a/spec/factories.rb +++ b/spec/factories.rb @@ -17,16 +17,14 @@ FactoryGirl.define do sequence(:username) { |n| "#{Faker::Internet.user_name}#{n}" } password "123456" password_confirmation { password } + confirmed_at { Time.now } + confirmation_token { nil } trait :admin do admin true end factory :admin, traits: [:admin] - - after :create do |u| - u.confirm! - end end factory :project do diff --git a/spec/support/test_env.rb b/spec/support/test_env.rb index 6bb5ce608..16e10b1a6 100644 --- a/spec/support/test_env.rb +++ b/spec/support/test_env.rb @@ -86,9 +86,8 @@ module TestEnv ) ActivityObserver.any_instance.stub( - current_user: double("current_user", id: 1) + current_user: double("current_user", id: 1) ) - end def clear_repo_dir(namespace, name) -- 2.11.0