diff --git a/spec/controllers/admin/conferences_controller_spec.rb b/spec/controllers/admin/conferences_controller_spec.rb index f3e179ab..c76c3ade 100644 --- a/spec/controllers/admin/conferences_controller_spec.rb +++ b/spec/controllers/admin/conferences_controller_spec.rb @@ -4,7 +4,8 @@ describe Admin::ConferenceController do # It is necessary to use bang version of let to build roles before user let(:conference) { create(:conference) } - let!(:first_user) { create(:user) } + let!(:deleted_user) { create(:deleted_user) } + let!(:admin_user) { create(:user) } # Second user. Automatically becomes admin. let!(:organizer_role) { create(:role, name: 'organizer', resource: conference) } let(:organizer) { create(:user, role_ids: organizer_role.id) } diff --git a/spec/factories/users.rb b/spec/factories/users.rb index d404aefb..ce82fb78 100644 --- a/spec/factories/users.rb +++ b/spec/factories/users.rb @@ -22,5 +22,11 @@ FactoryGirl.define do factory :organizer do after(:create) { |user| user.role_ids = create(:organizer_role).id } end + + factory :deleted_user do + after(:create) { |user| user.email = 'deleted@localhost.osem', + name = 'User deleted', + biography = 'Data is no longer available for deleted user.' } + end end end diff --git a/spec/models/ability_spec.rb b/spec/models/ability_spec.rb index a95613ba..082ba894 100644 --- a/spec/models/ability_spec.rb +++ b/spec/models/ability_spec.rb @@ -4,7 +4,8 @@ require 'cancan/matchers' describe 'User' do describe 'Abilities' do subject(:ability){ Ability.new(user) } - let!(:first_user) { create(:user) } # automatically becomes admin + let!(:deleted_user) { create(:deleted_user) } + let!(:admin_user) { create(:user) } # Second user. Automatically becomes admin. let(:user){ nil } let(:conference_not_public) { create(:conference, make_conference_public: false) } let(:conference_public) { create(:conference, make_conference_public: true)} diff --git a/spec/models/user_spec.rb b/spec/models/user_spec.rb index fbae0ef3..05ccc045 100644 --- a/spec/models/user_spec.rb +++ b/spec/models/user_spec.rb @@ -3,8 +3,8 @@ require 'spec_helper' describe User do # It is necessary to use bang version of let to build roles before user - let!(:user_admin) { create(:user) } - let!(:admin) { create(:admin) } + let!(:deleted_user) { create(:deleted_user) } + let!(:admin_user) { create(:user) } # Second user. Automatically becomes admin. let!(:participant) { create(:user) } let!(:conference) { create(:conference) } let!(:organizer_role) { create(:organizer_role, resource: conference) } @@ -13,7 +13,7 @@ describe User do let!(:user) { create(:user) } it 'returns the correct role' do - expect(user_admin.is_admin).to eq(true) + expect(admin_user.is_admin).to eq(true) expect(organizer.roles.first).to eq(organizer_role) end