diff options
Diffstat (limited to 'spec/features')
-rw-r--r-- | spec/features/jira_connect/branches_spec.rb | 4 | ||||
-rw-r--r-- | spec/features/projects/pipelines/pipelines_spec.rb | 5 |
2 files changed, 7 insertions, 2 deletions
diff --git a/spec/features/jira_connect/branches_spec.rb b/spec/features/jira_connect/branches_spec.rb index 6fa600c6906..c334a425849 100644 --- a/spec/features/jira_connect/branches_spec.rb +++ b/spec/features/jira_connect/branches_spec.rb @@ -25,8 +25,9 @@ RSpec.describe 'Create GitLab branches from Jira', :js do it 'select project and branch and submit the form' do visit new_jira_connect_branch_path(issue_key: 'ACME-123', issue_summary: 'My issue !@#$% title') - expect(page).to have_field('Branch name', with: 'ACME-123-my-issue-title') expect(page).to have_button('Create branch', disabled: true) + # initially, branch field should be hidden. + expect(page).not_to have_field('Branch name') # Select project1 @@ -44,6 +45,7 @@ RSpec.describe 'Create GitLab branches from Jira', :js do click_on 'Alice / foo' end + expect(page).to have_field('Branch name', with: 'ACME-123-my-issue-title') expect(page).to have_button('Create branch', disabled: false) click_on 'master' diff --git a/spec/features/projects/pipelines/pipelines_spec.rb b/spec/features/projects/pipelines/pipelines_spec.rb index dde8bd48790..37ac5a9d5a2 100644 --- a/spec/features/projects/pipelines/pipelines_spec.rb +++ b/spec/features/projects/pipelines/pipelines_spec.rb @@ -4,6 +4,7 @@ require 'spec_helper' RSpec.describe 'Pipelines', :js do include ProjectForksHelper + include Spec::Support::Helpers::ModalHelpers let(:project) { create(:project) } @@ -436,7 +437,9 @@ RSpec.describe 'Pipelines', :js do context 'when user played a delayed job immediately' do before do find('[data-testid="pipelines-manual-actions-dropdown"]').click - page.accept_confirm { click_button('delayed job 1') } + accept_gl_confirm do + click_button 'delayed job 1' + end wait_for_requests end |