Merge branch '194211-fix-transient-failure' into 'master'

Import the 'platform/build/blueprint' project in manifest_import_spec.rb

Closes #194211

See merge request gitlab-org/gitlab!22599

doc/development/testing_guide/flaky_tests.md

@@ -98,6 +98,10 @@ This was originally implemented in: <https://gitlab.com/gitlab-org/gitlab-foss/m
 
 - Memory is through the roof! (TL;DR: Load images but block images requests!): <https://gitlab.com/gitlab-org/gitlab-foss/merge_requests/12003>
 
+#### Capybara expectation times out
+
+- [Test imports a project (via Sidekiq) that is growing over time, leading to timeouts when the import takes longer than 60 seconds](https://gitlab.com/gitlab-org/gitlab/merge_requests/22599)
+
 ## Resources
 
 - [Flaky Tests: Are You Sure You Want to Rerun Them?](http://semaphoreci.com/blog/2017/04/20/flaky-tests.html)

spec/features/import/manifest_import_spec.rb

@@ -24,17 +24,17 @@ describe 'Import multiple repositories by uploading a manifest file', :js do
     expect(page).to have_content('https://android-review.googlesource.com/platform/build/blueprint')
   end
 
-  it 'imports successfully imports a project', :sidekiq_might_not_need_inline do
+  it 'imports successfully imports a project', :sidekiq_inline do
     visit new_import_manifest_path
 
     attach_file('manifest', Rails.root.join('spec/fixtures/aosp_manifest.xml'))
     click_on 'List available repositories'
 
-    page.within(first_row) do
+    page.within(second_row) do
       click_on 'Import'
 
       expect(page).to have_content 'Done'
-      expect(page).to have_content("#{group.full_path}/build/make")
+      expect(page).to have_content("#{group.full_path}/build/blueprint")
     end
   end
 
@@ -47,7 +47,7 @@ describe 'Import multiple repositories by uploading a manifest file', :js do
     expect(page).to have_content 'The uploaded file is not a valid XML file.'
   end
 
-  def first_row
-    page.all('table.import-jobs tbody tr')[0]
+  def second_row
+    page.all('table.import-jobs tbody tr')[1]
   end
 end