diff options
author | Lin Jen-Shin <godfat@godfat.org> | 2019-06-05 09:58:16 +0000 |
---|---|---|
committer | Lin Jen-Shin <godfat@godfat.org> | 2019-06-05 09:58:16 +0000 |
commit | 879f002221d6eb57c636544d2007ec70e19f709c (patch) | |
tree | 6ad1f7674310be01d2d9cad457b2db4bec783d35 | |
parent | eebdfbc334a66064b2d9972bbe8b5f35e2fe9746 (diff) | |
parent | b9cb49ad45e412d3330393d41b943c7b2957aefc (diff) | |
download | gitlab-ce-879f002221d6eb57c636544d2007ec70e19f709c.tar.gz |
Merge branch 'issue-6568-single-codebase-spec-controllers' into 'master'
single codebase spec controllers
See merge request gitlab-org/gitlab-ce!29041
-rw-r--r-- | spec/controllers/groups_controller_spec.rb | 22 | ||||
-rw-r--r-- | spec/controllers/projects_controller_spec.rb | 12 |
2 files changed, 34 insertions, 0 deletions
diff --git a/spec/controllers/groups_controller_spec.rb b/spec/controllers/groups_controller_spec.rb index 1cd08200552..47d7e278183 100644 --- a/spec/controllers/groups_controller_spec.rb +++ b/spec/controllers/groups_controller_spec.rb @@ -141,6 +141,28 @@ describe GroupsController do end describe 'POST #create' do + it 'allows creating a group' do + sign_in(user) + + expect do + post :create, params: { group: { name: 'new_group', path: "new_group" } } + end.to change { Group.count }.by(1) + + expect(response).to have_gitlab_http_status(302) + end + + context 'authorization' do + it 'allows an admin to create a group' do + sign_in(create(:admin)) + + expect do + post :create, params: { group: { name: 'new_group', path: "new_group" } } + end.to change { Group.count }.by(1) + + expect(response).to have_gitlab_http_status(302) + end + end + context 'when creating subgroups', :nested_groups do [true, false].each do |can_create_group_status| context "and can_create_group is #{can_create_group_status}" do diff --git a/spec/controllers/projects_controller_spec.rb b/spec/controllers/projects_controller_spec.rb index 7f1bbebd128..8d2412f97ef 100644 --- a/spec/controllers/projects_controller_spec.rb +++ b/spec/controllers/projects_controller_spec.rb @@ -292,6 +292,18 @@ describe ProjectsController do end describe 'GET edit' do + it 'allows an admin user to access the page' do + sign_in(create(:user, :admin)) + + get :edit, + params: { + namespace_id: project.namespace.path, + id: project.path + } + + expect(response).to have_gitlab_http_status(200) + end + it 'sets the badge API endpoint' do sign_in(user) project.add_maintainer(user) |