Add latest changes from gitlab-org/gitlab@master

5 files changed, 29 insertions, 34 deletions

diff --git a/qa/qa/page/project/pages.rb b/qa/qa/page/project/pages.rb
new file mode 100644
index 00000000000..1a7a8a1e93c
--- /dev/null
+++ b/qa/qa/page/project/pages.rb
@@ -0,0 +1,22 @@
+# frozen_string_literal: true
+
+module QA
+  module Page
+    module Project
+      class Pages < Page::Base
+        view 'app/views/projects/pages/_access.html.haml' do
+          element 'access-page-container'
+        end
+
+        def go_to_access_page
+          within_element('access-page-container') do
+            find('a').click
+            page.driver.browser.switch_to.window(page.driver.browser.window_handles.last)
+          end
+        end
+      end
+    end
+  end
+end
+
+QA::Page::Project::Pages.prepend_mod_with("Page::Project::Pages", namespace: QA)
diff --git a/qa/qa/page/project/settings/pages.rb b/qa/qa/page/project/settings/pages.rb
deleted file mode 100644
index 64990dc2991..00000000000
--- a/qa/qa/page/project/settings/pages.rb
+++ /dev/null
@@ -1,26 +0,0 @@
-# frozen_string_literal: true
-
-module QA
-  module Page
-    module Project
-      module Settings
-        class Pages < Page::Base
-          include QA::Page::Settings::Common
-
-          view 'app/views/projects/pages/_access.html.haml' do
-            element 'access-page-container'
-          end
-
-          def go_to_access_page
-            within_element('access-page-container') do
-              find('a').click
-              page.driver.browser.switch_to.window(page.driver.browser.window_handles.last)
-            end
-          end
-        end
-      end
-    end
-  end
-end
-
-QA::Page::Project::Settings::Pages.prepend_mod_with("Page::Project::Settings::Pages", namespace: QA)
diff --git a/qa/qa/page/project/sub_menus/settings.rb b/qa/qa/page/project/sub_menus/settings.rb
index bf6b25062f0..76cc5ab7664 100644
--- a/qa/qa/page/project/sub_menus/settings.rb
+++ b/qa/qa/page/project/sub_menus/settings.rb
@@ -19,10 +19,6 @@ module QA
             open_settings_submenu('Merge requests')
           end
 
-          def go_to_pages_settings
-            open_settings_submenu('Pages')
-          end
-
           def go_to_monitor_settings
             open_settings_submenu('Monitor')
           end
diff --git a/qa/qa/page/sub_menus/deploy.rb b/qa/qa/page/sub_menus/deploy.rb
index c930cd6b6df..4494395ba45 100644
--- a/qa/qa/page/sub_menus/deploy.rb
+++ b/qa/qa/page/sub_menus/deploy.rb
@@ -14,6 +14,10 @@ module QA
           open_deploy_submenu('Container Registry')
         end
 
+        def go_to_pages_settings
+          open_deploy_submenu('Pages')
+        end
+
         private
 
         def open_deploy_submenu(sub_menu)
diff --git a/qa/qa/specs/features/browser_ui/2_plan/pages/new_static_page_spec.rb b/qa/qa/specs/features/browser_ui/2_plan/pages/new_static_page_spec.rb
index 579b6e43533..1d9acafb133 100644
--- a/qa/qa/specs/features/browser_ui/2_plan/pages/new_static_page_spec.rb
+++ b/qa/qa/specs/features/browser_ui/2_plan/pages/new_static_page_spec.rb
@@ -7,9 +7,8 @@ module QA
     except: { job: 'review-qa-*' },
     quarantine: {
       issue: 'https://gitlab.com/gitlab-org/gitlab/-/issues/383215',
-      type: :flaky
-    },
-    feature_flag: { name: 'show_pages_in_deployments_menu' } do
+      type: :broken
+    } do
     # TODO: Convert back to :smoke once proved to be stable. Related issue: https://gitlab.com/gitlab-org/gitlab/-/issues/300906
     describe 'Pages', product_group: :knowledge do
       let!(:project) { create(:project, name: 'gitlab-pages-projects', template_name: :plainhtml) }
@@ -40,7 +39,7 @@ module QA
         end
 
         Page::Project::Menu.perform(&:go_to_pages_settings)
-        Page::Project::Settings::Pages.perform(&:go_to_access_page)
+        Page::Project::Pages.perform(&:go_to_access_page)
 
         Support::Waiter.wait_until(
           sleep_interval: 2,