Merge branch 'activate-and-fix-roadmap-test' into 'master'

Activate and fix epics roadmap test

See merge request gitlab-org/gitlab!18796

qa/qa/ee/page/group/roadmap.rb

@@ -22,8 +22,10 @@ module QA
             group_relative_url = uri.path
             epic_href_selector = "a[href='#{group_relative_url}/-/epics/#{epic.iid}']"
 
-            find_element(:roadmap_shell).find("#{epic_details_cell} #{epic_href_selector}") &&
-            find_element(:roadmap_shell).find("#{epic_timeline_cell} #{epic_href_selector}")
+            within_element(:roadmap_shell) do
+              find("[data-qa-selector='epic_details_cell'] #{epic_href_selector}") &&
+              find("[data-qa-selector='epic_timeline_cell'] #{epic_href_selector}")
+            end
           end
         end
       end

qa/qa/specs/features/ee/browser_ui/2_plan/epic/roadmap_spec.rb

 # frozen_string_literal: true
 
 module QA
-  # https://gitlab.com/gitlab-org/gitlab/issues/13360
-  context 'Plan', :skip do
+  context 'Plan' do
     describe 'Epics roadmap' do
       include Support::Dates