Add latest changes from gitlab-org/gitlab@master

1 files changed, 6 insertions, 3 deletions

diff --git a/qa/qa/page/project/show.rb b/qa/qa/page/project/show.rb
index e00458bfc3b..3c2b8d56f1d 100644
--- a/qa/qa/page/project/show.rb
+++ b/qa/qa/page/project/show.rb
@@ -52,8 +52,7 @@ module QA
         end
 
         view 'app/views/projects/buttons/_fork.html.haml' do
-          element :fork_label, "%span= s_('ProjectOverview|Fork')" # rubocop:disable QA/ElementWithPattern
-          element :fork_link, "link_to new_project_fork_path(@project)" # rubocop:disable QA/ElementWithPattern
+          element :fork_button
         end
 
         view 'app/views/projects/empty.html.haml' do
@@ -97,8 +96,12 @@ module QA
           click_element :new_file_menu_item
         end
 
+        # Click by JS is needed to bypass the VSCode Web IDE popover
+        # Change back to regular click_element when vscode_web_ide FF is removed
+        # Rollout issue: https://gitlab.com/gitlab-org/gitlab/-/issues/371084
         def fork_project
-          click_on 'Fork'
+          fork_button = find_element(:fork_button)
+          click_by_javascript(fork_button)
         end
 
         def forked_from?(parent_project_name)