diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-08-04 21:09:57 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-08-04 21:09:57 +0300 |
commit | f5a72705e46f835812ffcc51658eecb08fbdf050 (patch) | |
tree | 9b322ce9c0454759d5b669be56e603a481791388 /spec/controllers | |
parent | 23c4d0c3e1ea30be08b597a961fc91773f60309f (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/controllers')
-rw-r--r-- | spec/controllers/jira_connect/branches_controller_spec.rb | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/spec/controllers/jira_connect/branches_controller_spec.rb b/spec/controllers/jira_connect/branches_controller_spec.rb index 4b198eb8820..31f68608918 100644 --- a/spec/controllers/jira_connect/branches_controller_spec.rb +++ b/spec/controllers/jira_connect/branches_controller_spec.rb @@ -15,21 +15,24 @@ RSpec.describe JiraConnect::BranchesController do get :new, params: { issue_key: 'ACME-123', issue_summary: 'My Issue !@#$%' } expect(response).to be_successful - expect(assigns(:branch_name)).to eq('ACME-123-my-issue') + expect(assigns(:new_branch_data)).to include( + initial_branch_name: 'ACME-123-my-issue', + success_state_svg_path: start_with('/assets/illustrations/merge_requests-') + ) end it 'ignores missing summary' do get :new, params: { issue_key: 'ACME-123' } expect(response).to be_successful - expect(assigns(:branch_name)).to eq('ACME-123') + expect(assigns(:new_branch_data)).to include(initial_branch_name: 'ACME-123') end it 'does not set a branch name if key is not passed' do get :new, params: { issue_summary: 'My issue' } expect(response).to be_successful - expect(assigns(:branch_name)).to be_nil + expect(assigns(:new_branch_data)).to include('initial_branch_name': nil) end context 'when feature flag is disabled' do |