Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2021-08-19 12:08:42 +0300
committerGitLab Bot <gitlab-bot@gitlab.com>2021-08-19 12:08:42 +0300
commitb76ae638462ab0f673e5915986070518dd3f9ad3 (patch)
treebdab0533383b52873be0ec0eb4d3c66598ff8b91 /spec/features/projects/activity/user_sees_design_activity_spec.rb
parent434373eabe7b4be9593d18a585fb763f1e5f1a6f (diff)
Add latest changes from gitlab-org/gitlab@14-2-stable-eev14.2.0-rc42
Diffstat (limited to 'spec/features/projects/activity/user_sees_design_activity_spec.rb')
-rw-r--r--spec/features/projects/activity/user_sees_design_activity_spec.rb18
1 files changed, 9 insertions, 9 deletions
diff --git a/spec/features/projects/activity/user_sees_design_activity_spec.rb b/spec/features/projects/activity/user_sees_design_activity_spec.rb
index 389e86299e5..70153921b82 100644
--- a/spec/features/projects/activity/user_sees_design_activity_spec.rb
+++ b/spec/features/projects/activity/user_sees_design_activity_spec.rb
@@ -34,26 +34,26 @@ RSpec.describe 'Projects > Activity > User sees design Activity', :js do
visit activity_project_path(project)
expect(page).to have_content('joined project')
- expect(page).to have_content(design_activity(uploader, 'uploaded'))
- expect(page).to have_content(design_activity(editor, 'revised'))
- expect(page).to have_content(design_activity(deleter, 'deleted'))
+ expect(page).to have_content(design_activity(uploader, 'added'))
+ expect(page).to have_content(design_activity(editor, 'updated'))
+ expect(page).to have_content(design_activity(deleter, 'removed'))
end
it 'allows filtering out the design events', :aggregate_failures do
visit activity_project_path(project, event_filter: EventFilter::ISSUE)
- expect(page).not_to have_content(design_activity(uploader, 'uploaded'))
- expect(page).not_to have_content(design_activity(editor, 'revised'))
- expect(page).not_to have_content(design_activity(deleter, 'deleted'))
+ expect(page).not_to have_content(design_activity(uploader, 'added'))
+ expect(page).not_to have_content(design_activity(editor, 'updated'))
+ expect(page).not_to have_content(design_activity(deleter, 'removed'))
end
it 'allows filtering in the design events', :aggregate_failures do
visit activity_project_path(project, event_filter: EventFilter::DESIGNS)
expect(page).not_to have_content('joined project')
- expect(page).to have_content(design_activity(uploader, 'uploaded'))
- expect(page).to have_content(design_activity(editor, 'revised'))
- expect(page).to have_content(design_activity(deleter, 'deleted'))
+ expect(page).to have_content(design_activity(uploader, 'added'))
+ expect(page).to have_content(design_activity(editor, 'updated'))
+ expect(page).to have_content(design_activity(deleter, 'removed'))
end
end