Add latest changes from gitlab-org/gitlab@master

1 files changed, 88 insertions, 33 deletions

diff --git a/spec/controllers/projects/pages_controller_spec.rb b/spec/controllers/projects/pages_controller_spec.rb
index 136f98ac907..ded5dd57e3e 100644
--- a/spec/controllers/projects/pages_controller_spec.rb
+++ b/spec/controllers/projects/pages_controller_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-RSpec.describe Projects::PagesController do
+RSpec.describe Projects::PagesController, feature_category: :pages do
   let(:user) { create(:user) }
   let(:project) { create(:project, :public) }
 
@@ -14,7 +14,12 @@ RSpec.describe Projects::PagesController do
   end
 
   before do
-    allow(Gitlab.config.pages).to receive(:enabled).and_return(true)
+    stub_config(pages: {
+      enabled: true,
+      external_https: true,
+      access_control: false
+    })
+
     sign_in(user)
     project.add_maintainer(user)
   end
@@ -123,49 +128,99 @@ RSpec.describe Projects::PagesController do
   end
 
   describe 'PATCH update' do
-    let(:request_params) do
-      {
-        namespace_id: project.namespace,
-        project_id: project,
-        project: { pages_https_only: 'false' }
-      }
-    end
+    context 'when updating pages_https_only' do
+      let(:request_params) do
+        {
+          namespace_id: project.namespace,
+          project_id: project,
+          project: { pages_https_only: 'true' }
+        }
+      end
 
-    let(:update_service) { double(execute: { status: :success }) }
+      it 'updates project field and redirects back to the pages settings' do
+        project.update!(pages_https_only: false)
 
-    before do
-      allow(Projects::UpdateService).to receive(:new) { update_service }
-    end
+        expect { patch :update, params: request_params }
+          .to change { project.reload.pages_https_only }
+          .from(false).to(true)
 
-    it 'returns 302 status' do
-      patch :update, params: request_params
+        expect(response).to have_gitlab_http_status(:found)
+        expect(response).to redirect_to(project_pages_path(project))
+      end
 
-      expect(response).to have_gitlab_http_status(:found)
-    end
+      context 'when it fails to update' do
+        it 'adds an error message' do
+          expect_next_instance_of(Projects::UpdateService) do |service|
+            expect(service)
+              .to receive(:execute)
+              .and_return(status: :error, message: 'some error happened')
+          end
 
-    it 'redirects back to the pages settings' do
-      patch :update, params: request_params
+          expect { patch :update, params: request_params }
+            .not_to change { project.reload.pages_https_only }
 
-      expect(response).to redirect_to(project_pages_path(project))
+          expect(response).to redirect_to(project_pages_path(project))
+          expect(flash[:alert]).to eq('some error happened')
+        end
+      end
     end
 
-    it 'calls the update service' do
-      expect(Projects::UpdateService)
-        .to receive(:new)
-        .with(project, user, ActionController::Parameters.new(request_params[:project]).permit!)
-        .and_return(update_service)
+    context 'when updating pages_unique_domain' do
+      let(:request_params) do
+        {
+          namespace_id: project.namespace,
+          project_id: project,
+          project: {
+            project_setting_attributes: {
+              pages_unique_domain_enabled: 'true'
+            }
+          }
+        }
+      end
 
-      patch :update, params: request_params
-    end
+      before do
+        create(:project_setting, project: project, pages_unique_domain_enabled: false)
+      end
 
-    context 'when update_service returns an error message' do
-      let(:update_service) { double(execute: { status: :error, message: 'some error happened' }) }
+      context 'with pages_unique_domain feature flag disabled' do
+        it 'does not update pages unique domain' do
+          stub_feature_flags(pages_unique_domain: false)
 
-      it 'adds an error message' do
-        patch :update, params: request_params
+          expect { patch :update, params: request_params }
+            .not_to change { project.project_setting.reload.pages_unique_domain_enabled }
+        end
+      end
 
-        expect(response).to redirect_to(project_pages_path(project))
-        expect(flash[:alert]).to eq('some error happened')
+      context 'with pages_unique_domain feature flag enabled' do
+        before do
+          stub_feature_flags(pages_unique_domain: true)
+        end
+
+        it 'updates pages_https_only and pages_unique_domain and redirects back to pages settings' do
+          expect { patch :update, params: request_params }
+            .to change { project.project_setting.reload.pages_unique_domain_enabled }
+            .from(false).to(true)
+
+          expect(project.project_setting.pages_unique_domain).not_to be_nil
+          expect(response).to have_gitlab_http_status(:found)
+          expect(response).to redirect_to(project_pages_path(project))
+        end
+
+        context 'when it fails to update' do
+          it 'adds an error message' do
+            expect_next_instance_of(Projects::UpdateService) do |service|
+              expect(service)
+                .to receive(:execute)
+                .and_return(status: :error, message: 'some error happened')
+            end
+
+            expect { patch :update, params: request_params }
+              .not_to change { project.project_setting.reload.pages_unique_domain_enabled }
+
+            expect(response).to redirect_to(project_pages_path(project))
+            expect(flash[:alert]).to eq('some error happened')
+          end
+        end
       end
     end
   end