summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--lib/api/project_members.rb4
-rw-r--r--spec/factories/group_members.rb (renamed from spec/factories/users_groups.rb)0
-rw-r--r--spec/models/group_member_spec.rb10
-rw-r--r--spec/models/note_spec.rb14
-rw-r--r--spec/models/project_security_spec.rb16
-rw-r--r--spec/requests/api/branches_spec.rb4
-rw-r--r--spec/requests/api/commits_spec.rb4
-rw-r--r--spec/requests/api/project_members_spec.rb4
-rw-r--r--spec/requests/api/projects_spec.rb4
-rw-r--r--spec/requests/api/repositories_spec.rb4
10 files changed, 32 insertions, 32 deletions
diff --git a/lib/api/project_members.rb b/lib/api/project_members.rb
index 9e2b12b1311..c0e532f4137 100644
--- a/lib/api/project_members.rb
+++ b/lib/api/project_members.rb
@@ -58,7 +58,7 @@ module API
if team_member.nil?
team_member = user_project.project_members.new(
user_id: params[:user_id],
- project_access: params[:access_level]
+ access_level: params[:access_level]
)
end
@@ -85,7 +85,7 @@ module API
team_member = user_project.project_members.find_by(user_id: params[:user_id])
not_found!("User can not be found") if team_member.nil?
- if team_member.update_attributes(project_access: params[:access_level])
+ if team_member.update_attributes(access_level: params[:access_level])
@member = team_member.user
present @member, with: Entities::ProjectMember, project: user_project
else
diff --git a/spec/factories/users_groups.rb b/spec/factories/group_members.rb
index debb86d997f..debb86d997f 100644
--- a/spec/factories/users_groups.rb
+++ b/spec/factories/group_members.rb
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
diff --git a/spec/requests/api/branches_spec.rb b/spec/requests/api/branches_spec.rb
index 5f6258488a4..caded2c9289 100644
--- a/spec/requests/api/branches_spec.rb
+++ b/spec/requests/api/branches_spec.rb
@@ -7,8 +7,8 @@ describe API::API, api: true do
let(:user) { create(:user) }
let(:user2) { create(:user) }
let!(:project) { create(:project, creator_id: user.id) }
- let!(:master) { create(:project_member, user: user, project: project, project_access: ProjectMember::MASTER) }
- let!(:guest) { create(:project_member, user: user2, project: project, project_access: ProjectMember::GUEST) }
+ let!(:master) { create(:project_member, user: user, project: project, access_level: ProjectMember::MASTER) }
+ let!(:guest) { create(:project_member, user: user2, project: project, access_level: ProjectMember::GUEST) }
let!(:branch_name) { 'feature' }
let!(:branch_sha) { '0b4bc9a49b562e85de7cc9e834518ea6828729b9' }
diff --git a/spec/requests/api/commits_spec.rb b/spec/requests/api/commits_spec.rb
index 3a5a2efdb0f..38e0a284c36 100644
--- a/spec/requests/api/commits_spec.rb
+++ b/spec/requests/api/commits_spec.rb
@@ -6,8 +6,8 @@ describe API::API, api: true do
let(:user) { create(:user) }
let(:user2) { create(:user) }
let!(:project) { create(:project, creator_id: user.id) }
- let!(:master) { create(:project_member, user: user, project: project, project_access: ProjectMember::MASTER) }
- let!(:guest) { create(:project_member, user: user2, project: project, project_access: ProjectMember::GUEST) }
+ let!(:master) { create(:project_member, user: user, project: project, access_level: ProjectMember::MASTER) }
+ let!(:guest) { create(:project_member, user: user2, project: project, access_level: ProjectMember::GUEST) }
before { project.team << [user, :reporter] }
diff --git a/spec/requests/api/project_members_spec.rb b/spec/requests/api/project_members_spec.rb
index 626da6196d5..836f21f3e0b 100644
--- a/spec/requests/api/project_members_spec.rb
+++ b/spec/requests/api/project_members_spec.rb
@@ -6,8 +6,8 @@ describe API::API, api: true do
let(:user2) { create(:user) }
let(:user3) { create(:user) }
let(:project) { create(:project, creator_id: user.id, namespace: user.namespace) }
- let(:project_member) { create(:project_member, user: user, project: project, project_access: ProjectMember::MASTER) }
- let(:project_member2) { create(:project_member, user: user3, project: project, project_access: ProjectMember::DEVELOPER) }
+ let(:project_member) { create(:project_member, user: user, project: project, access_level: ProjectMember::MASTER) }
+ let(:project_member2) { create(:project_member, user: user3, project: project, access_level: ProjectMember::DEVELOPER) }
describe "GET /projects/:id/members" do
before { project_member }
diff --git a/spec/requests/api/projects_spec.rb b/spec/requests/api/projects_spec.rb
index 59a20c37489..a52ba30187e 100644
--- a/spec/requests/api/projects_spec.rb
+++ b/spec/requests/api/projects_spec.rb
@@ -8,8 +8,8 @@ describe API::API, api: true do
let(:admin) { create(:admin) }
let(:project) { create(:project, creator_id: user.id, namespace: user.namespace) }
let(:snippet) { create(:project_snippet, author: user, project: project, title: 'example') }
- let(:project_member) { create(:project_member, user: user, project: project, project_access: ProjectMember::MASTER) }
- let(:project_member2) { create(:project_member, user: user3, project: project, project_access: ProjectMember::DEVELOPER) }
+ let(:project_member) { create(:project_member, user: user, project: project, access_level: ProjectMember::MASTER) }
+ let(:project_member2) { create(:project_member, user: user3, project: project, access_level: ProjectMember::DEVELOPER) }
describe "GET /projects" do
before { project }
diff --git a/spec/requests/api/repositories_spec.rb b/spec/requests/api/repositories_spec.rb
index 6618ce0e378..a339dbfe9db 100644
--- a/spec/requests/api/repositories_spec.rb
+++ b/spec/requests/api/repositories_spec.rb
@@ -8,8 +8,8 @@ describe API::API, api: true do
let(:user) { create(:user) }
let(:user2) { create(:user) }
let!(:project) { create(:project, creator_id: user.id) }
- let!(:master) { create(:project_member, user: user, project: project, project_access: ProjectMember::MASTER) }
- let!(:guest) { create(:project_member, user: user2, project: project, project_access: ProjectMember::GUEST) }
+ let!(:master) { create(:project_member, user: user, project: project, access_level: ProjectMember::MASTER) }
+ let!(:guest) { create(:project_member, user: user2, project: project, access_level: ProjectMember::GUEST) }
before { project.team << [user, :reporter] }
View Lorry Controller Status