Merge branch 'qa-web-terminal-spec-maintenance' into 'master'

Move web_terminal_spec E2E test to CE folder

See merge request gitlab-org/gitlab!70337

qa/qa/ee/page/component/web_ide/web_terminal_panel.rb

-# frozen_string_literal: true
-
-module QA
-  module EE
-    module Page
-      module Component
-        module WebIDE
-          module WebTerminalPanel
-            extend QA::Page::PageConcern
-
-            def self.prepended(base)
-              super
-
-              base.class_eval do
-                view 'app/assets/javascripts/ide/components/panes/collapsible_sidebar.vue' do
-                  element :ide_right_sidebar, %q(:data-qa-selector="`ide_${side}_sidebar`") # rubocop:disable QA/ElementWithPattern
-                end
-
-                view 'app/assets/javascripts/ide/components/ide_sidebar_nav.vue' do
-                  element :terminal_tab_button, %q(:data-qa-selector="`${tab.title.toLowerCase()}_tab_button`") # rubocop:disable QA/ElementWithPattern
-                end
-
-                view 'app/assets/javascripts/ide/components/terminal/empty_state.vue' do
-                  element :start_web_terminal_button
-                end
-
-                view 'app/assets/javascripts/ide/components/terminal/terminal.vue' do
-                  element :loading_container
-                  element :terminal_screen
-                end
-              end
-            end
-
-            def has_finished_loading?
-              has_no_element?(:loading_container, wait: QA::Support::Repeater::DEFAULT_MAX_WAIT_TIME)
-            end
-
-            def has_terminal_screen?
-              wait_until(reload: false) do
-                within_element :terminal_screen do
-                  # The DOM initially just includes the :terminal_screen element
-                  # and then the xterm package dynamically loads when the user
-                  # clicks the Start Web Terminal button. If it loads succesfully
-                  # an element with the class `xterm` is added to the DOM.
-                  # The xterm is a third-party library, so we can't add a selector
-                  find(".xterm")
-                end
-              end
-            end
-
-            def start_web_terminal
-              within_element :ide_right_sidebar do
-                click_element :terminal_tab_button
-              end
-
-              click_element :start_web_terminal_button
-
-              has_element? :loading_container, text: "Starting"
-            end
-          end
-        end
-      end
-    end
-  end
-end

qa/qa/page/component/web_ide/web_terminal_panel.rb

+# frozen_string_literal: true
+
+module QA
+  module Page
+    module Component
+      module WebIDE
+        module WebTerminalPanel
+          extend QA::Page::PageConcern
+
+          def self.prepended(base)
+            super
+
+            base.class_eval do
+              view 'app/assets/javascripts/ide/components/panes/collapsible_sidebar.vue' do
+                element :ide_right_sidebar, %q(:data-qa-selector="`ide_${side}_sidebar`") # rubocop:disable QA/ElementWithPattern
+              end
+
+              view 'app/assets/javascripts/ide/components/ide_sidebar_nav.vue' do
+                element :terminal_tab_button, %q(:data-qa-selector="`${tab.title.toLowerCase()}_tab_button`") # rubocop:disable QA/ElementWithPattern
+              end
+
+              view 'app/assets/javascripts/ide/components/terminal/empty_state.vue' do
+                element :start_web_terminal_button
+              end
+
+              view 'app/assets/javascripts/ide/components/terminal/terminal.vue' do
+                element :loading_container
+                element :terminal_screen
+              end
+            end
+          end
+
+          def has_finished_loading?
+            has_no_element?(:loading_container, wait: QA::Support::Repeater::DEFAULT_MAX_WAIT_TIME)
+          end
+
+          def has_terminal_screen?
+            wait_until(reload: false) do
+              within_element :terminal_screen do
+                # The DOM initially just includes the :terminal_screen element
+                # and then the xterm package dynamically loads when the user
+                # clicks the Start Web Terminal button. If it loads succesfully
+                # an element with the class `xterm` is added to the DOM.
+                # The xterm is a third-party library, so we can't add a selector
+                find(".xterm")
+              end
+            end
+          end
+
+          def start_web_terminal
+            within_element :ide_right_sidebar do
+              click_element :terminal_tab_button
+            end
+
+            click_element :start_web_terminal_button
+
+            has_element? :loading_container, text: "Starting"
+          end
+        end
+      end
+    end
+  end
+end

qa/qa/page/project/web_ide/edit.rb

@@ -6,6 +6,7 @@ module QA
       module WebIDE
         class Edit < Page::Base
           prepend Page::Component::WebIDE::Alert
+          prepend Page::Component::WebIDE::WebTerminalPanel
           include Page::Component::DropdownFilter
 
           view 'app/assets/javascripts/ide/components/activity_bar.vue' do
@@ -330,5 +331,3 @@ module QA
     end
   end
 end
-
-QA::Page::Project::WebIDE::Edit.prepend_mod_with('Page::Component::WebIDE::WebTerminalPanel', namespace: QA)

qa/qa/specs/features/ee/browser_ui/3_create/web_ide/web_terminal_spec.rb → qa/qa/specs/features/browser_ui/3_create/web_ide/web_terminal_spec.rb

@@ -7,11 +7,6 @@ module QA
     quarantine: {
       issue: 'https://gitlab.com/gitlab-org/gitlab/-/issues/338179',
       type: :bug
-      # This test should remain quarantined for the `relative_url` job after the above issue is resolved if the bug
-      # below hasn't been fixed
-      # only: { job: 'relative_url' },
-      # issue: 'https://gitlab.com/gitlab-org/gitlab/issues/13833',
-      # type: :bug
     }
   ) do
     describe 'Web IDE web terminal' do