summaryrefslogtreecommitdiff
path: root/spec/features/issues
diff options
context:
space:
mode:
authorJarka Kadlecova <jarka@gitlab.com>2017-08-01 14:38:45 +0200
committerJarka Kadlecova <jarka@gitlab.com>2017-08-07 15:57:56 +0200
commit9ef3c431e4859e1bc03267735b956d5920d5dd42 (patch)
tree5a4063641e79766c249924f5095e6c328a279846 /spec/features/issues
parentfaa2a123911eaf84bb57163ea7af759d4632601b (diff)
downloadgitlab-ce-9ef3c431e4859e1bc03267735b956d5920d5dd42.tar.gz
Move some after_create parts to worker to improve performance32844-issuables-performance
Diffstat (limited to 'spec/features/issues')
-rw-r--r--spec/features/issues/create_branch_merge_request_spec.rb14
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)