diff options
author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2013-10-17 10:52:38 +0300 |
---|---|---|
committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2013-10-17 10:52:38 +0300 |
commit | 7b70d81c831d3e033993ef571e085bfee28ae590 (patch) | |
tree | 1a2bdc41473cf6abb9217eb2a3fb069e72bfb5b9 | |
parent | 91a31d767f0e134153129e42bd16d5f67f401054 (diff) | |
download | gitlab-ce-7b70d81c831d3e033993ef571e085bfee28ae590.tar.gz |
Speed up tests
-rw-r--r-- | spec/factories.rb | 6 | ||||
-rw-r--r-- | spec/support/test_env.rb | 3 |
2 files changed, 3 insertions, 6 deletions
diff --git a/spec/factories.rb b/spec/factories.rb index 91ef5086a9e..624cb0f7654 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 6bb5ce608f6..16e10b1a62b 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) |