Commit 51c919a2 authored by Kamil Trzciński's avatar Kamil Trzciński
Browse files

Merge branch 'allow-maintainers-to-remove-pages' into 'master'

Allow maintainers to remove pages

See merge request gitlab-org/gitlab-ce!25458
parents c6b9ac86 ddfdd494
...@@ -5,7 +5,8 @@ class Projects::PagesController < Projects::ApplicationController ...@@ -5,7 +5,8 @@ class Projects::PagesController < Projects::ApplicationController
before_action :require_pages_enabled! before_action :require_pages_enabled!
before_action :authorize_read_pages!, only: [:show] before_action :authorize_read_pages!, only: [:show]
before_action :authorize_update_pages!, except: [:show] before_action :authorize_update_pages!, except: [:show, :destroy]
before_action :authorize_remove_pages!, only: [:destroy]
# rubocop: disable CodeReuse/ActiveRecord # rubocop: disable CodeReuse/ActiveRecord
def show def show
......
...@@ -152,7 +152,6 @@ class ProjectPolicy < BasePolicy ...@@ -152,7 +152,6 @@ class ProjectPolicy < BasePolicy
enable :remove_fork_project enable :remove_fork_project
enable :destroy_merge_request enable :destroy_merge_request
enable :destroy_issue enable :destroy_issue
enable :remove_pages
enable :set_issue_iid enable :set_issue_iid
enable :set_issue_created_at enable :set_issue_created_at
...@@ -271,6 +270,7 @@ class ProjectPolicy < BasePolicy ...@@ -271,6 +270,7 @@ class ProjectPolicy < BasePolicy
enable :admin_pages enable :admin_pages
enable :read_pages enable :read_pages
enable :update_pages enable :update_pages
enable :remove_pages
enable :read_cluster enable :read_cluster
enable :add_cluster enable :add_cluster
enable :create_cluster enable :create_cluster
......
...@@ -9,4 +9,4 @@ ...@@ -9,4 +9,4 @@
.form-actions .form-actions
= link_to 'Remove pages', project_pages_path(@project), data: { confirm: 'Are you sure?'}, method: :delete, class: "btn btn-remove" = link_to 'Remove pages', project_pages_path(@project), data: { confirm: 'Are you sure?'}, method: :delete, class: "btn btn-remove"
- else - else
.nothing-here-block Only the project owner can remove pages .nothing-here-block Only project maintainers can remove pages
---
title: Allow maintainers to remove pages
merge_request:
author:
type: fixed
...@@ -97,7 +97,7 @@ The following table depicts the various user permission levels in a project. ...@@ -97,7 +97,7 @@ The following table depicts the various user permission levels in a project.
| Manage variables | | | | ✓ | ✓ | | Manage variables | | | | ✓ | ✓ |
| Manage GitLab Pages | | | | ✓ | ✓ | | Manage GitLab Pages | | | | ✓ | ✓ |
| Manage GitLab Pages domains and certificates | | | | ✓ | ✓ | | Manage GitLab Pages domains and certificates | | | | ✓ | ✓ |
| Remove GitLab Pages | | | | | ✓ | | Remove GitLab Pages | | | | | ✓ |
| View GitLab Pages protected by [access control](project/pages/introduction.md#gitlab-pages-access-control-core-only) | ✓ | ✓ | ✓ | ✓ | ✓ | | View GitLab Pages protected by [access control](project/pages/introduction.md#gitlab-pages-access-control-core-only) | ✓ | ✓ | ✓ | ✓ | ✓ |
| Manage clusters | | | | ✓ | ✓ | | Manage clusters | | | | ✓ | ✓ |
| Manage license policy **[ULTIMATE]** | | | | ✓ | ✓ | | Manage license policy **[ULTIMATE]** | | | | ✓ | ✓ |
...@@ -107,7 +107,6 @@ The following table depicts the various user permission levels in a project. ...@@ -107,7 +107,6 @@ The following table depicts the various user permission levels in a project.
| Transfer project to another namespace | | | | | ✓ | | Transfer project to another namespace | | | | | ✓ |
| Remove project | | | | | ✓ | | Remove project | | | | | ✓ |
| Delete issues | | | | | ✓ | | Delete issues | | | | | ✓ |
| Remove pages | | | | | ✓ |
| Force push to protected branches [^4] | | | | | | | Force push to protected branches [^4] | | | | | |
| Remove protected branches [^4] | | | | | | | Remove protected branches [^4] | | | | | |
| View project Audit Events | | | | ✓ | ✓ | | View project Audit Events | | | | ✓ | ✓ |
......
...@@ -42,6 +42,18 @@ ...@@ -42,6 +42,18 @@
expect(response).to have_gitlab_http_status(302) expect(response).to have_gitlab_http_status(302)
end end
context 'when user is developer' do
before do
project.add_developer(user)
end
it 'returns 404 status' do
delete :destroy, params: request_params
expect(response).to have_gitlab_http_status(404)
end
end
end end
context 'pages disabled' do context 'pages disabled' do
......
...@@ -13,16 +13,6 @@ ...@@ -13,16 +13,6 @@
sign_in(user) sign_in(user)
end end
shared_examples 'no pages deployed' do
it 'does not see anything to destroy' do
visit project_pages_path(project)
expect(page).to have_content('Configure pages')
expect(page).not_to have_link('Remove pages')
expect(page).not_to have_text('Only the project owner can remove pages')
end
end
context 'when user is the owner' do context 'when user is the owner' do
before do before do
project.namespace.update(owner: user) project.namespace.update(owner: user)
...@@ -181,7 +171,12 @@ ...@@ -181,7 +171,12 @@
end end
end end
it_behaves_like 'no pages deployed' it 'does not see anything to destroy' do
visit project_pages_path(project)
expect(page).to have_content('Configure pages')
expect(page).not_to have_link('Remove pages')
end
describe 'project settings page' do describe 'project settings page' do
it 'renders "Pages" tab' do it 'renders "Pages" tab' do
...@@ -208,22 +203,6 @@ ...@@ -208,22 +203,6 @@
end end
end end
context 'when the user is not the owner' do
context 'when pages deployed' do
before do
allow_any_instance_of(Project).to receive(:pages_deployed?) { true }
end
it 'sees "Only the project owner can remove pages" text' do
visit project_pages_path(project)
expect(page).to have_text('Only the project owner can remove pages')
end
end
it_behaves_like 'no pages deployed'
end
describe 'HTTPS settings', :js, :https_pages_enabled do describe 'HTTPS settings', :js, :https_pages_enabled do
before do before do
project.namespace.update(owner: user) project.namespace.update(owner: user)
...@@ -289,51 +268,45 @@ ...@@ -289,51 +268,45 @@
end end
describe 'Remove page' do describe 'Remove page' do
context 'when user is the owner' do let(:project) { create :project, :repository }
let(:project) { create :project, :repository }
context 'when pages are deployed' do
before do let(:pipeline) do
project.namespace.update(owner: user) commit_sha = project.commit('HEAD').sha
project.ci_pipelines.create(
ref: 'HEAD',
sha: commit_sha,
source: :push,
protected: false
)
end end
context 'when pages are deployed' do let(:ci_build) do
let(:pipeline) do create(
commit_sha = project.commit('HEAD').sha :ci_build,
project: project,
project.ci_pipelines.create( pipeline: pipeline,
ref: 'HEAD', ref: 'HEAD',
sha: commit_sha, legacy_artifacts_file: fixture_file_upload(File.join('spec/fixtures/pages.zip')),
source: :push, legacy_artifacts_metadata: fixture_file_upload(File.join('spec/fixtures/pages.zip.meta'))
protected: false )
) end
end
let(:ci_build) do
create(
:ci_build,
project: project,
pipeline: pipeline,
ref: 'HEAD',
legacy_artifacts_file: fixture_file_upload(File.join('spec/fixtures/pages.zip')),
legacy_artifacts_metadata: fixture_file_upload(File.join('spec/fixtures/pages.zip.meta'))
)
end
before do before do
result = Projects::UpdatePagesService.new(project, ci_build).execute result = Projects::UpdatePagesService.new(project, ci_build).execute
expect(result[:status]).to eq(:success) expect(result[:status]).to eq(:success)
expect(project).to be_pages_deployed expect(project).to be_pages_deployed
end end
it 'removes the pages' do it 'removes the pages' do
visit project_pages_path(project) visit project_pages_path(project)
expect(page).to have_link('Remove pages') expect(page).to have_link('Remove pages')
click_link 'Remove pages' click_link 'Remove pages'
expect(project.pages_deployed?).to be_falsey expect(project.pages_deployed?).to be_falsey
end
end end
end end
end end
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment