diff --git a/spec/controllers/users_controller_spec.rb b/spec/controllers/users_controller_spec.rb index 189d8e1..71dacc3 100644 --- a/spec/controllers/users_controller_spec.rb +++ b/spec/controllers/users_controller_spec.rb @@ -2,7 +2,7 @@ require 'rails_helper' describe UsersController, :type => :controller do describe 'projects' do - let(:user) { FactoryGirl.build(:user) } + let(:user) { FactoryGirl.build(:user, :with_id) } before :each do User.expects(:find).with(user.id).returns(user) diff --git a/spec/factories/users.rb b/spec/factories/users.rb index c93616e..47bf262 100644 --- a/spec/factories/users.rb +++ b/spec/factories/users.rb @@ -2,7 +2,6 @@ FactoryGirl.define do factory :user do - sequence(:id, 5) name "Diego Martinez" email "diego@email.com" password "password" @@ -16,7 +15,10 @@ FactoryGirl.define do factory :mezuro_user do name "Mezuro Default user" email "mezuro@librelist.com" - password Devise.friendly_token.first(10) + end + + trait :with_id do + sequence(:id, 1) end end end diff --git a/spec/models/reading_group_spec.rb b/spec/models/reading_group_spec.rb index 584fd4c..d4fe15d 100644 --- a/spec/models/reading_group_spec.rb +++ b/spec/models/reading_group_spec.rb @@ -76,7 +76,7 @@ describe ReadingGroup, :type => :model do describe 'class methods' do describe 'public_or_owned_by_user' do - let!(:user) { FactoryGirl.build(:user) } + let!(:user) { FactoryGirl.build(:user, :with_id) } let!(:owned_private_attrs) { FactoryGirl.build(:reading_group_attributes, :private, user_id: user.id) } let!(:owned_public_attrs) { FactoryGirl.build(:reading_group_attributes, user_id: user.id) } -- libgit2 0.21.2