Merge branch 'qa/mk-fix-intermittent-clone-failure' into 'master'

[CE backport] Fix intermittent clone failure in QA

See merge request gitlab-org/gitlab-ce!16739

qa/qa/page/project/show.rb

@@ -3,11 +3,9 @@ module QA
     module Project
       class Show < Page::Base
         view 'app/views/shared/_clone_panel.html.haml' do
+          element :clone_holder, '.git-clone-holder'
           element :clone_dropdown
           element :clone_options_dropdown, '.clone-options-dropdown'
-        end
-
-        view 'app/views/shared/_clone_panel.html.haml' do
           element :project_repository_location, 'text_field_tag :project_clone'
         end
 
@@ -20,10 +18,15 @@ module QA
         end
 
         def choose_repository_clone_http
-          click_element :clone_dropdown
+          wait(reload: false) do
+            click_element :clone_dropdown
+
+            page.within('.clone-options-dropdown') do
+              click_link('HTTP')
+            end
 
-          page.within('.clone-options-dropdown') do
-            click_link('HTTP')
+            # Ensure git clone textbox was updated to http URI
+            page.has_css?('.git-clone-holder input#project_clone[value*="http"]')
           end
         end