Add latest changes from gitlab-org/gitlab@master

1 files changed, 5 insertions, 5 deletions

diff --git a/spec/features/import/manifest_import_spec.rb b/spec/features/import/manifest_import_spec.rb
index 89bf69dea7d..36478128dd1 100644
--- a/spec/features/import/manifest_import_spec.rb
+++ b/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