diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2024-01-08 18:10:48 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2024-01-08 18:10:48 +0300 |
| commit | 025c440ddc394806bccf19c56043e369ed7e84f5 (patch) | |
| tree | 0f229b47b4fe498e38f6b176729079b5d92eef4a /spec/features | |
| parent | a0a2334dfd251af627aaf9e99486f8579087c3c9 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/features')
| -rw-r--r-- | spec/features/merge_request/user_creates_mr_spec.rb | 3 | ||||
| -rw-r--r-- | spec/features/merge_request/user_selects_branches_for_new_mr_spec.rb | 3 | ||||
| -rw-r--r-- | spec/features/users/login_spec.rb | 2 |
3 files changed, 7 insertions, 1 deletions
diff --git a/spec/features/merge_request/user_creates_mr_spec.rb b/spec/features/merge_request/user_creates_mr_spec.rb index 950b64bb395..5f6e465d011 100644 --- a/spec/features/merge_request/user_creates_mr_spec.rb +++ b/spec/features/merge_request/user_creates_mr_spec.rb @@ -74,6 +74,9 @@ RSpec.describe 'Merge request > User creates MR', feature_category: :code_review visit project_new_merge_request_path(source_project) + find('.js-source-branch').click + select_listbox_item('master') + first('.js-target-project').click select_listbox_item(target_project.full_path) diff --git a/spec/features/merge_request/user_selects_branches_for_new_mr_spec.rb b/spec/features/merge_request/user_selects_branches_for_new_mr_spec.rb index daa84227adc..a68bdfd7356 100644 --- a/spec/features/merge_request/user_selects_branches_for_new_mr_spec.rb +++ b/spec/features/merge_request/user_selects_branches_for_new_mr_spec.rb @@ -43,6 +43,9 @@ RSpec.describe 'Merge request > User selects branches for new MR', :js, feature_ expect(page).to have_content('Source branch') expect(page).to have_content('Target branch') + find('.js-source-branch').click + select_listbox_item('master') + first('.js-target-branch').click find('.gl-listbox-search-input').native.send_keys 'v1.1.0' select_listbox_item('v1.1.0') diff --git a/spec/features/users/login_spec.rb b/spec/features/users/login_spec.rb index 87ed4ced684..c5ad7bca824 100644 --- a/spec/features/users/login_spec.rb +++ b/spec/features/users/login_spec.rb @@ -789,7 +789,7 @@ RSpec.describe 'Login', :clean_gitlab_redis_sessions, feature_category: :system_ visit new_user_session_path image = find('img.js-portrait-logo-detection') - expect(image['class']).to include('gl-h-9') + expect(image['class']).to include('gl-h-10') end it 'renders link to sign up path' do |