Merge branch '32844-issuables-performance' into 'master'

Issuables: Move some code from create services to Sidekiq workers

See merge request !13326

1 files changed, 9 insertions, 5 deletions

diff --git a/spec/features/issues/create_branch_merge_request_spec.rb b/spec/features/issues/create_branch_merge_request_spec.rb
index f59f687cf51..546dc7e8a49 100644
--- a/spec/features/issues/create_branch_merge_request_spec.rb
+++ b/spec/features/issues/create_branch_merge_request_spec.rb
@@ -1,6 +1,6 @@
 require 'rails_helper'
 
-feature 'Create Branch/Merge Request Dropdown on issue page', js: true do
+feature 'Create Branch/Merge Request Dropdown on issue page', :feature, :js do
   let(:user) { create(:user) }
   let!(:project) { create(:project, :repository) }
   let(:issue) { create(:issue, project: project, title: 'Cherry-Coloured Funk') }
@@ -14,10 +14,14 @@ feature 'Create Branch/Merge Request Dropdown on issue page', js: true do
     it 'allows creating a merge request from the issue page' do
       visit project_issue_path(project, issue)
 
-      select_dropdown_option('create-mr')
-      
-      expect(page).to have_content('WIP: Resolve "Cherry-Coloured Funk"')
-      expect(current_path).to eq(project_merge_request_path(project, MergeRequest.first))
+      perform_enqueued_jobs do
+        select_dropdown_option('create-mr')
+
+        expect(page).to have_content('WIP: Resolve "Cherry-Coloured Funk"')
+        expect(current_path).to eq(project_merge_request_path(project, MergeRequest.first))
+
+        wait_for_requests
+      end
 
       visit project_issue_path(project, issue)