diff options
author | James Lopez <james@jameslopez.es> | 2016-07-11 18:00:19 +0200 |
---|---|---|
committer | James Lopez <james@jameslopez.es> | 2016-07-11 18:00:19 +0200 |
commit | feecb4afde4cde116bcdca9c9c5059cf201720f8 (patch) | |
tree | a71159a68d6a98731e21307849e82acbfb089f97 /spec/controllers/groups/group_members_controller_spec.rb | |
parent | 0e5f0276eae25c975078f825ea10ff2c8d05563c (diff) | |
parent | 36c60b4c269a3d60f6b3e0df3bf1bfc7d44a6b54 (diff) | |
download | gitlab-ce-feecb4afde4cde116bcdca9c9c5059cf201720f8.tar.gz |
Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into fix/import-event-error
Diffstat (limited to 'spec/controllers/groups/group_members_controller_spec.rb')
-rw-r--r-- | spec/controllers/groups/group_members_controller_spec.rb | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/spec/controllers/groups/group_members_controller_spec.rb b/spec/controllers/groups/group_members_controller_spec.rb index ddc54108a7b..c34475976c6 100644 --- a/spec/controllers/groups/group_members_controller_spec.rb +++ b/spec/controllers/groups/group_members_controller_spec.rb @@ -133,7 +133,7 @@ describe Groups::GroupMembersController do expect(response).to set_flash.to 'Your access request to the group has been withdrawn.' expect(response).to redirect_to(group_path(group)) - expect(group.members.request).to be_empty + expect(group.requesters).to be_empty expect(group.users).not_to include user end end @@ -153,7 +153,7 @@ describe Groups::GroupMembersController do expect(response).to set_flash.to 'Your request for access has been queued for review.' expect(response).to redirect_to(group_path(group)) - expect(group.members.request.exists?(user_id: user)).to be_truthy + expect(group.requesters.exists?(user_id: user)).to be_truthy expect(group.users).not_to include user end end @@ -175,7 +175,7 @@ describe Groups::GroupMembersController do let(:group_requester) { create(:user) } let(:member) do group.request_access(group_requester) - group.members.request.find_by(user_id: group_requester) + group.requesters.find_by(user_id: group_requester) end context 'when user does not have enough rights' do |