diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-09-20 02:18:09 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-09-20 02:18:09 +0300 |
commit | 6ed4ec3e0b1340f96b7c043ef51d1b33bbe85fde (patch) | |
tree | dc4d20fe6064752c0bd323187252c77e0a89144b /spec/features/dashboard | |
parent | 9868dae7fc0655bd7ce4a6887d4e6d487690eeed (diff) |
Add latest changes from gitlab-org/gitlab@15-4-stable-eev15.4.0-rc42
Diffstat (limited to 'spec/features/dashboard')
-rw-r--r-- | spec/features/dashboard/datetime_on_tooltips_spec.rb | 2 | ||||
-rw-r--r-- | spec/features/dashboard/milestones_spec.rb | 7 | ||||
-rw-r--r-- | spec/features/dashboard/todos/todos_sorting_spec.rb | 2 |
3 files changed, 8 insertions, 3 deletions
diff --git a/spec/features/dashboard/datetime_on_tooltips_spec.rb b/spec/features/dashboard/datetime_on_tooltips_spec.rb index bf9f6895d24..48a6976f263 100644 --- a/spec/features/dashboard/datetime_on_tooltips_spec.rb +++ b/spec/features/dashboard/datetime_on_tooltips_spec.rb @@ -15,7 +15,7 @@ RSpec.describe 'Tooltips on .timeago dates', :js do context 'on the activity tab' do before do Event.create!( project: project, author_id: user.id, action: :joined, - updated_at: created_date, created_at: created_date) + updated_at: created_date, created_at: created_date) sign_in user visit user_activity_path(user) diff --git a/spec/features/dashboard/milestones_spec.rb b/spec/features/dashboard/milestones_spec.rb index 3f89955b12b..08cb95979ac 100644 --- a/spec/features/dashboard/milestones_spec.rb +++ b/spec/features/dashboard/milestones_spec.rb @@ -41,7 +41,12 @@ RSpec.describe 'Dashboard > Milestones' do first('.select2-result-label').click end - find('.js-new-project-item-link').click + a_el = find('.js-new-project-item-link') + + expect(a_el).to have_content('New Milestone in ') + expect(a_el).to have_no_content('New New Milestone in ') + + a_el.click expect(page).to have_current_path(new_group_milestone_path(group), ignore_query: true) end diff --git a/spec/features/dashboard/todos/todos_sorting_spec.rb b/spec/features/dashboard/todos/todos_sorting_spec.rb index d593031590e..a0fa53b761b 100644 --- a/spec/features/dashboard/todos/todos_sorting_spec.rb +++ b/spec/features/dashboard/todos/todos_sorting_spec.rb @@ -28,7 +28,7 @@ RSpec.describe 'Dashboard > User sorts todos' do create(:todo, user: user, project: project, target: issue_3, created_at: 3.hours.ago, updated_at: 2.minutes.ago) create(:todo, user: user, project: project, target: issue_1, created_at: 2.hours.ago, updated_at: 2.hours.ago) create(:todo, user: user, project: project, target: merge_request_1, created_at: 1.hour.ago, - updated_at: 1.hour.ago) + updated_at: 1.hour.ago) merge_request_1.labels << label_1 issue_3.labels << label_1 |