summaryrefslogtreecommitdiff
path: root/spec
diff options
context:
space:
mode:
authorRobert Speicher <rspeicher@gmail.com>2015-08-07 00:20:02 -0400
committerRobert Speicher <rspeicher@gmail.com>2015-08-07 00:20:02 -0400
commitfb6dc1f07de124915e48456bf45c108878687043 (patch)
tree3b086430eed3f4f88fc2ca6eb77a9476b841ede4 /spec
parent5fb5fd253a960ed33eebc0f6aabeae37aa175fa8 (diff)
downloadgitlab-ce-fb6dc1f07de124915e48456bf45c108878687043.tar.gz
Add `Group#add_*` convenience methodsrs-group-convenience-methods
Encapsulates the logic for `Gitlab::Access::WHATEVER` levels.
Diffstat (limited to 'spec')
-rw-r--r--spec/finders/projects_finder_spec.rb2
-rw-r--r--spec/lib/gitlab/markdown/user_reference_filter_spec.rb2
-rw-r--r--spec/models/hooks/system_hook_spec.rb4
-rw-r--r--spec/models/project_team_spec.rb6
-rw-r--r--spec/requests/api/groups_spec.rb2
-rw-r--r--spec/support/markdown_feature.rb2
6 files changed, 9 insertions, 9 deletions
diff --git a/spec/finders/projects_finder_spec.rb b/spec/finders/projects_finder_spec.rb
index 2ab71b05968..de9d4cd6128 100644
--- a/spec/finders/projects_finder_spec.rb
+++ b/spec/finders/projects_finder_spec.rb
@@ -39,7 +39,7 @@ describe ProjectsFinder do
end
context 'authenticated, group member' do
- before { group.add_user(user, Gitlab::Access::DEVELOPER) }
+ before { group.add_developer(user) }
subject { ProjectsFinder.new.execute(user, group: group) }
diff --git a/spec/lib/gitlab/markdown/user_reference_filter_spec.rb b/spec/lib/gitlab/markdown/user_reference_filter_spec.rb
index 08e6941028f..9c55b4ff38f 100644
--- a/spec/lib/gitlab/markdown/user_reference_filter_spec.rb
+++ b/spec/lib/gitlab/markdown/user_reference_filter_spec.rb
@@ -77,7 +77,7 @@ module Gitlab::Markdown
context 'that the current user can read' do
before do
- group.add_user(user, Gitlab::Access::DEVELOPER)
+ group.add_developer(user)
end
it 'links to the Group' do
diff --git a/spec/models/hooks/system_hook_spec.rb b/spec/models/hooks/system_hook_spec.rb
index 4175f9dd88f..02d2cc2c77a 100644
--- a/spec/models/hooks/system_hook_spec.rb
+++ b/spec/models/hooks/system_hook_spec.rb
@@ -101,7 +101,7 @@ describe SystemHook do
it 'group member create hook' do
group = create(:group)
user = create(:user)
- group.add_user(user, Gitlab::Access::MASTER)
+ group.add_master(user)
expect(WebMock).to have_requested(:post, @system_hook.url).with(
body: /user_add_to_group/,
headers: { 'Content-Type'=>'application/json', 'X-Gitlab-Event'=>'System Hook' }
@@ -111,7 +111,7 @@ describe SystemHook do
it 'group member destroy hook' do
group = create(:group)
user = create(:user)
- group.add_user(user, Gitlab::Access::MASTER)
+ group.add_master(user)
group.group_members.destroy_all
expect(WebMock).to have_requested(:post, @system_hook.url).with(
body: /user_remove_from_group/,
diff --git a/spec/models/project_team_spec.rb b/spec/models/project_team_spec.rb
index d125166e336..cc1138490a0 100644
--- a/spec/models/project_team_spec.rb
+++ b/spec/models/project_team_spec.rb
@@ -37,9 +37,9 @@ describe ProjectTeam do
let(:project) { create(:empty_project, group: group) }
before do
- group.add_user(master, Gitlab::Access::MASTER)
- group.add_user(reporter, Gitlab::Access::REPORTER)
- group.add_user(guest, Gitlab::Access::GUEST)
+ group.add_master(master)
+ group.add_reporter(reporter)
+ group.add_guest(guest)
# If user is a group and a project member - GitLab uses highest permission
# So we add group guest as master and add group master as guest
diff --git a/spec/requests/api/groups_spec.rb b/spec/requests/api/groups_spec.rb
index c5a4ac7e4c4..1d5b4f6f36b 100644
--- a/spec/requests/api/groups_spec.rb
+++ b/spec/requests/api/groups_spec.rb
@@ -135,7 +135,7 @@ describe API::API, api: true do
it "should not remove a group if not an owner" do
user4 = create(:user)
- group1.add_user(user4, Gitlab::Access::MASTER)
+ group1.add_master(user4)
delete api("/groups/#{group1.id}", user3)
expect(response.status).to eq(403)
end
diff --git a/spec/support/markdown_feature.rb b/spec/support/markdown_feature.rb
index 2a868aed73b..c59df4e84d6 100644
--- a/spec/support/markdown_feature.rb
+++ b/spec/support/markdown_feature.rb
@@ -17,7 +17,7 @@ class MarkdownFeature
def group
unless @group
@group = create(:group)
- @group.add_user(user, Gitlab::Access::DEVELOPER)
+ @group.add_developer(user)
end
@group