summaryrefslogtreecommitdiff
path: root/spec
diff options
context:
space:
mode:
authorTimothy Andrew <mail@timothyandrew.net>2016-11-29 16:51:50 +0530
committerTimothy Andrew <mail@timothyandrew.net>2016-11-29 17:38:45 +0530
commit41bf093662a24cc6b68eba3503b56ac44b7f6e69 (patch)
tree0b116fce9bfd41c548cc498d3d0d6939a20afa07 /spec
parent3fc6eff5fce225610812cf3efdfcf8498a7b4144 (diff)
downloadgitlab-ce-ee-1137-follow-up-protected-branch-users-and-groups.tar.gz
CE-specific changes gitlab-org/gitlab-ee#1137ee-1137-follow-up-protected-branch-users-and-groups
- Extract all common {push,merge} access level model code into the `ProtectedBranchAccess` module - Use the HTTP verb to define controller specs
Diffstat (limited to 'spec')
-rw-r--r--spec/controllers/autocomplete_controller_spec.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/spec/controllers/autocomplete_controller_spec.rb b/spec/controllers/autocomplete_controller_spec.rb
index d9a86346c81..0d1545040f1 100644
--- a/spec/controllers/autocomplete_controller_spec.rb
+++ b/spec/controllers/autocomplete_controller_spec.rb
@@ -4,7 +4,7 @@ describe AutocompleteController do
let!(:project) { create(:project) }
let!(:user) { create(:user) }
- context 'users and members' do
+ context 'GET users' do
let!(:user2) { create(:user) }
let!(:non_member) { create(:user) }
@@ -180,7 +180,7 @@ describe AutocompleteController do
end
end
- context 'projects' do
+ context 'GET projects' do
let(:authorized_project) { create(:project) }
let(:authorized_search_project) { create(:project, name: 'rugged') }