diff options
Diffstat (limited to 'spec/models')
| -rw-r--r-- | spec/models/group_member_spec.rb | 10 | ||||
| -rw-r--r-- | spec/models/note_spec.rb | 14 | ||||
| -rw-r--r-- | spec/models/project_security_spec.rb | 16 |
3 files changed, 20 insertions, 20 deletions
diff --git a/spec/models/group_member_spec.rb b/spec/models/group_member_spec.rb index 58205e599fe..6acbc9bb4ae 100644 --- a/spec/models/group_member_spec.rb +++ b/spec/models/group_member_spec.rb @@ -3,7 +3,7 @@ # Table name: group_members # # id :integer not null, primary key -# group_access :integer not null +# access_level :integer not null # group_id :integer not null # user_id :integer not null # created_at :datetime @@ -17,7 +17,7 @@ describe GroupMember do context 'notification' do describe "#after_create" do it "should send email to user" do - membership = build(:users_group) + membership = build(:group_member) membership.stub(notification_service: double('NotificationService').as_null_object) membership.should_receive(:notification_service) membership.save @@ -26,18 +26,18 @@ describe GroupMember do describe "#after_update" do before do - @membership = create :users_group + @membership = create :group_member @membership.stub(notification_service: double('NotificationService').as_null_object) end it "should send email to user" do @membership.should_receive(:notification_service) - @membership.update_attribute(:group_access, GroupMember::MASTER) + @membership.update_attribute(:access_level, GroupMember::MASTER) end it "does not send an email when the access level has not changed" do @membership.should_not_receive(:notification_service) - @membership.update_attribute(:group_access, GroupMember::OWNER) + @membership.update_attribute(:access_level, GroupMember::OWNER) end end end diff --git a/spec/models/note_spec.rb b/spec/models/note_spec.rb index a6796d4ab15..da51100e0d7 100644 --- a/spec/models/note_spec.rb +++ b/spec/models/note_spec.rb @@ -321,8 +321,8 @@ describe Note do describe :read do before do - @p1.project_members.create(user: @u2, project_access: ProjectMember::GUEST) - @p2.project_members.create(user: @u3, project_access: ProjectMember::GUEST) + @p1.project_members.create(user: @u2, access_level: ProjectMember::GUEST) + @p2.project_members.create(user: @u3, access_level: ProjectMember::GUEST) end it { @abilities.allowed?(@u1, :read_note, @p1).should be_false } @@ -332,8 +332,8 @@ describe Note do describe :write do before do - @p1.project_members.create(user: @u2, project_access: ProjectMember::DEVELOPER) - @p2.project_members.create(user: @u3, project_access: ProjectMember::DEVELOPER) + @p1.project_members.create(user: @u2, access_level: ProjectMember::DEVELOPER) + @p2.project_members.create(user: @u3, access_level: ProjectMember::DEVELOPER) end it { @abilities.allowed?(@u1, :write_note, @p1).should be_false } @@ -343,9 +343,9 @@ describe Note do describe :admin do before do - @p1.project_members.create(user: @u1, project_access: ProjectMember::REPORTER) - @p1.project_members.create(user: @u2, project_access: ProjectMember::MASTER) - @p2.project_members.create(user: @u3, project_access: ProjectMember::MASTER) + @p1.project_members.create(user: @u1, access_level: ProjectMember::REPORTER) + @p1.project_members.create(user: @u2, access_level: ProjectMember::MASTER) + @p2.project_members.create(user: @u3, access_level: ProjectMember::MASTER) end it { @abilities.allowed?(@u1, :admin_note, @p1).should be_false } diff --git a/spec/models/project_security_spec.rb b/spec/models/project_security_spec.rb index 564edaf8c1b..5c8d1e7438b 100644 --- a/spec/models/project_security_spec.rb +++ b/spec/models/project_security_spec.rb @@ -30,7 +30,7 @@ describe Project do describe "Guest Rules" do before do - @p1.project_members.create(project: @p1, user: @u2, project_access: ProjectMember::GUEST) + @p1.project_members.create(project: @p1, user: @u2, access_level: ProjectMember::GUEST) end it "should allow for project user any guest actions" do @@ -42,7 +42,7 @@ describe Project do describe "Report Rules" do before do - @p1.project_members.create(project: @p1, user: @u2, project_access: ProjectMember::REPORTER) + @p1.project_members.create(project: @p1, user: @u2, access_level: ProjectMember::REPORTER) end it "should allow for project user any report actions" do @@ -54,8 +54,8 @@ describe Project do describe "Developer Rules" do before do - @p1.project_members.create(project: @p1, user: @u2, project_access: ProjectMember::REPORTER) - @p1.project_members.create(project: @p1, user: @u3, project_access: ProjectMember::DEVELOPER) + @p1.project_members.create(project: @p1, user: @u2, access_level: ProjectMember::REPORTER) + @p1.project_members.create(project: @p1, user: @u3, access_level: ProjectMember::DEVELOPER) end it "should deny for developer master-specific actions" do @@ -73,8 +73,8 @@ describe Project do describe "Master Rules" do before do - @p1.project_members.create(project: @p1, user: @u2, project_access: ProjectMember::DEVELOPER) - @p1.project_members.create(project: @p1, user: @u3, project_access: ProjectMember::MASTER) + @p1.project_members.create(project: @p1, user: @u2, access_level: ProjectMember::DEVELOPER) + @p1.project_members.create(project: @p1, user: @u3, access_level: ProjectMember::MASTER) end it "should deny for developer master-specific actions" do @@ -92,8 +92,8 @@ describe Project do describe "Admin Rules" do before do - @p1.project_members.create(project: @p1, user: @u2, project_access: ProjectMember::DEVELOPER) - @p1.project_members.create(project: @p1, user: @u3, project_access: ProjectMember::MASTER) + @p1.project_members.create(project: @p1, user: @u2, access_level: ProjectMember::DEVELOPER) + @p1.project_members.create(project: @p1, user: @u3, access_level: ProjectMember::MASTER) end it "should deny for masters admin-specific actions" do |