2 files changed, 123 insertions, 0 deletions
diff --git a/spec/services/markup/rendering_service_spec.rb b/spec/services/markup/rendering_service_spec.rb
index 99ab87f2072..ca70e983714 100644
--- a/spec/services/markup/rendering_service_spec.rb
+++ b/spec/services/markup/rendering_service_spec.rb
@@ -111,5 +111,22 @@ RSpec.describe Markup::RenderingService do
         is_expected.to eq(expected_html)
       end
     end
+
+    context 'with reStructuredText' do
+      let(:file_name) { 'foo.rst' }
+      let(:text) { "####\nPART\n####" }
+
+      it 'returns rendered html' do
+        is_expected.to eq("<h1>PART</h1>\n\n")
+      end
+
+      context 'when input has an invalid syntax' do
+        let(:text) { "####\nPART\n##" }
+
+        it 'uses a simple formatter for html' do
+          is_expected.to eq("<p>####\n<br>PART\n<br>##</p>")
+        end
+      end
+    end
   end
 end
diff --git a/spec/services/projects/update_service_spec.rb b/spec/services/projects/update_service_spec.rb
index 3cda6bc2627..57249bcd562 100644
--- a/spec/services/projects/update_service_spec.rb
+++ b/spec/services/projects/update_service_spec.rb
@@ -794,6 +794,112 @@ RSpec.describe Projects::UpdateService do
         expect(project.topic_list).to eq(%w[tag_list])
       end
     end
+
+    describe 'when updating pages unique domain', feature_category: :pages do
+      let(:group) { create(:group, path: 'group') }
+      let(:project) { create(:project, path: 'project', group: group) }
+
+      context 'with pages_unique_domain feature flag disabled' do
+        before do
+          stub_feature_flags(pages_unique_domain: false)
+        end
+
+        it 'does not change pages unique domain' do
+          expect(project)
+            .to receive(:update)
+            .with({ project_setting_attributes: { has_confluence: true } })
+            .and_call_original
+
+          expect do
+            update_project(project, user, project_setting_attributes: {
+              has_confluence: true,
+              pages_unique_domain_enabled: true
+            })
+          end.not_to change { project.project_setting.pages_unique_domain_enabled }
+        end
+
+        it 'does not remove other attributes' do
+          expect(project)
+            .to receive(:update)
+            .with({ name: 'True' })
+            .and_call_original
+
+          update_project(project, user, name: 'True')
+        end
+      end
+
+      context 'with pages_unique_domain feature flag enabled' do
+        before do
+          stub_feature_flags(pages_unique_domain: true)
+        end
+
+        it 'updates project pages unique domain' do
+          expect do
+            update_project(project, user, project_setting_attributes: {
+              pages_unique_domain_enabled: true
+            })
+          end.to change { project.project_setting.pages_unique_domain_enabled }
+
+          expect(project.project_setting.pages_unique_domain_enabled).to eq true
+          expect(project.project_setting.pages_unique_domain).to match %r{project-group-\w+}
+        end
+
+        it 'does not changes unique domain when it already exists' do
+          project.project_setting.update!(
+            pages_unique_domain_enabled: false,
+            pages_unique_domain: 'unique-domain'
+          )
+
+          expect do
+            update_project(project, user, project_setting_attributes: {
+              pages_unique_domain_enabled: true
+            })
+          end.to change { project.project_setting.pages_unique_domain_enabled }
+
+          expect(project.project_setting.pages_unique_domain_enabled).to eq true
+          expect(project.project_setting.pages_unique_domain).to eq 'unique-domain'
+        end
+
+        it 'does not changes unique domain when it disabling unique domain' do
+          project.project_setting.update!(
+            pages_unique_domain_enabled: true,
+            pages_unique_domain: 'unique-domain'
+          )
+
+          expect do
+            update_project(project, user, project_setting_attributes: {
+              pages_unique_domain_enabled: false
+            })
+          end.not_to change { project.project_setting.pages_unique_domain }
+
+          expect(project.project_setting.pages_unique_domain_enabled).to eq false
+          expect(project.project_setting.pages_unique_domain).to eq 'unique-domain'
+        end
+
+        context 'when there is another project with the unique domain' do
+          it 'fails pages unique domain already exists' do
+            create(
+              :project_setting,
+              pages_unique_domain_enabled: true,
+              pages_unique_domain: 'unique-domain'
+            )
+
+            allow(Gitlab::Pages::RandomDomain)
+              .to receive(:generate)
+              .and_return('unique-domain')
+
+            result = update_project(project, user, project_setting_attributes: {
+              pages_unique_domain_enabled: true
+            })
+
+            expect(result).to eq(
+              status: :error,
+              message: 'Project setting pages unique domain has already been taken'
+            )
+          end
+        end
+      end
+    end
   end
 
   describe '#run_auto_devops_pipeline?' do