Add latest changes from gitlab-org/gitlab@16-0-stable-eev16.0.0-rc42

1 files changed, 16 insertions, 6 deletions

diff --git a/spec/requests/api/pages/pages_spec.rb b/spec/requests/api/pages/pages_spec.rb
index c426f2a433c..aa1869eaa84 100644
--- a/spec/requests/api/pages/pages_spec.rb
+++ b/spec/requests/api/pages/pages_spec.rb
@@ -3,7 +3,7 @@
 require 'spec_helper'
 
 RSpec.describe API::Pages, feature_category: :pages do
-  let_it_be(:project) { create(:project, path: 'my.project', pages_https_only: false) }
+  let_it_be_with_reload(:project) { create(:project, path: 'my.project', pages_https_only: false) }
   let_it_be(:admin) { create(:admin) }
   let_it_be(:user) { create(:user) }
 
@@ -13,13 +13,23 @@ RSpec.describe API::Pages, feature_category: :pages do
   end
 
   describe 'DELETE /projects/:id/pages' do
+    let(:path) { "/projects/#{project.id}/pages" }
+
+    it_behaves_like 'DELETE request permissions for admin mode' do
+      before do
+        allow(Gitlab.config.pages).to receive(:enabled).and_return(true)
+      end
+
+      let(:succes_status_code) { :no_content }
+    end
+
     context 'when Pages is disabled' do
       before do
         allow(Gitlab.config.pages).to receive(:enabled).and_return(false)
       end
 
       it_behaves_like '404 response' do
-        let(:request) { delete api("/projects/#{project.id}/pages", admin) }
+        let(:request) { delete api(path, admin, admin_mode: true) }
       end
     end
 
@@ -30,13 +40,13 @@ RSpec.describe API::Pages, feature_category: :pages do
 
       context 'when Pages are deployed' do
         it 'returns 204' do
-          delete api("/projects/#{project.id}/pages", admin)
+          delete api(path, admin, admin_mode: true)
 
           expect(response).to have_gitlab_http_status(:no_content)
         end
 
         it 'removes the pages' do
-          delete api("/projects/#{project.id}/pages", admin)
+          delete api(path, admin, admin_mode: true)
 
           expect(project.reload.pages_metadatum.deployed?).to be(false)
         end
@@ -48,7 +58,7 @@ RSpec.describe API::Pages, feature_category: :pages do
         end
 
         it 'returns 204' do
-          delete api("/projects/#{project.id}/pages", admin)
+          delete api(path, admin, admin_mode: true)
 
           expect(response).to have_gitlab_http_status(:no_content)
         end
@@ -58,7 +68,7 @@ RSpec.describe API::Pages, feature_category: :pages do
         it 'returns 404' do
           id = -1
 
-          delete api("/projects/#{id}/pages", admin)
+          delete api("/projects/#{id}/pages", admin, admin_mode: true)
 
           expect(response).to have_gitlab_http_status(:not_found)
         end