Commit e8633570 authored by Matthias Käppler's avatar Matthias Käppler

Merge branch 'design-management-activity' into 'master'

Update design management wording in activity feed

See merge request gitlab-org/gitlab!67599
parents 3410b89c b8e97f97
...@@ -434,9 +434,9 @@ class Event < ApplicationRecord ...@@ -434,9 +434,9 @@ class Event < ApplicationRecord
def design_action_names def design_action_names
{ {
created: _('uploaded'), created: _('added'),
updated: _('revised'), updated: _('updated'),
destroyed: _('deleted') destroyed: _('removed')
} }
end end
......
...@@ -38490,6 +38490,9 @@ msgstr[1] "" ...@@ -38490,6 +38490,9 @@ msgstr[1] ""
msgid "access:" msgid "access:"
msgstr "" msgstr ""
msgid "added"
msgstr ""
msgid "added %{created_at_timeago}" msgid "added %{created_at_timeago}"
msgstr "" msgstr ""
...@@ -39852,6 +39855,9 @@ msgstr "" ...@@ -39852,6 +39855,9 @@ msgstr ""
msgid "remove weight" msgid "remove weight"
msgstr "" msgstr ""
msgid "removed"
msgstr ""
msgid "removed a Zoom call from this issue" msgid "removed a Zoom call from this issue"
msgstr "" msgstr ""
...@@ -39872,9 +39878,6 @@ msgstr "" ...@@ -39872,9 +39878,6 @@ msgstr ""
msgid "reset it." msgid "reset it."
msgstr "" msgstr ""
msgid "revised"
msgstr ""
msgid "satisfied" msgid "satisfied"
msgstr "" msgstr ""
...@@ -40046,9 +40049,6 @@ msgstr "" ...@@ -40046,9 +40049,6 @@ msgstr ""
msgid "updated %{time_ago}" msgid "updated %{time_ago}"
msgstr "" msgstr ""
msgid "uploaded"
msgstr ""
msgid "uploads" msgid "uploads"
msgstr "" msgstr ""
......
...@@ -179,7 +179,7 @@ RSpec.describe Dashboard::ProjectsController, :aggregate_failures do ...@@ -179,7 +179,7 @@ RSpec.describe Dashboard::ProjectsController, :aggregate_failures do
expect(response).to render_template('dashboard/projects/index') expect(response).to render_template('dashboard/projects/index')
expect(response.body).to include( expect(response.body).to include(
"pushed to project", "pushed to project",
"uploaded design #{design.to_reference}", "added design #{design.to_reference}",
"created wiki page #{wiki_page.title}", "created wiki page #{wiki_page.title}",
"joined project #{project.full_name}", "joined project #{project.full_name}",
"closed issue #{issue.to_reference}" "closed issue #{issue.to_reference}"
......
...@@ -34,26 +34,26 @@ RSpec.describe 'Projects > Activity > User sees design Activity', :js do ...@@ -34,26 +34,26 @@ RSpec.describe 'Projects > Activity > User sees design Activity', :js do
visit activity_project_path(project) visit activity_project_path(project)
expect(page).to have_content('joined project') expect(page).to have_content('joined project')
expect(page).to have_content(design_activity(uploader, 'uploaded')) expect(page).to have_content(design_activity(uploader, 'added'))
expect(page).to have_content(design_activity(editor, 'revised')) expect(page).to have_content(design_activity(editor, 'updated'))
expect(page).to have_content(design_activity(deleter, 'deleted')) expect(page).to have_content(design_activity(deleter, 'removed'))
end end
it 'allows filtering out the design events', :aggregate_failures do it 'allows filtering out the design events', :aggregate_failures do
visit activity_project_path(project, event_filter: EventFilter::ISSUE) 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(uploader, 'added'))
expect(page).not_to have_content(design_activity(editor, 'revised')) expect(page).not_to have_content(design_activity(editor, 'updated'))
expect(page).not_to have_content(design_activity(deleter, 'deleted')) expect(page).not_to have_content(design_activity(deleter, 'removed'))
end end
it 'allows filtering in the design events', :aggregate_failures do it 'allows filtering in the design events', :aggregate_failures do
visit activity_project_path(project, event_filter: EventFilter::DESIGNS) visit activity_project_path(project, event_filter: EventFilter::DESIGNS)
expect(page).not_to have_content('joined project') expect(page).not_to have_content('joined project')
expect(page).to have_content(design_activity(uploader, 'uploaded')) expect(page).to have_content(design_activity(uploader, 'added'))
expect(page).to have_content(design_activity(editor, 'revised')) expect(page).to have_content(design_activity(editor, 'updated'))
expect(page).to have_content(design_activity(deleter, 'deleted')) expect(page).to have_content(design_activity(deleter, 'removed'))
end end
end end
......
...@@ -982,9 +982,9 @@ RSpec.describe Event do ...@@ -982,9 +982,9 @@ RSpec.describe Event do
build(:design_event, trait).action_name build(:design_event, trait).action_name
end end
expect(created).to eq('uploaded') expect(created).to eq('added')
expect(updated).to eq('revised') expect(updated).to eq('updated')
expect(destroyed).to eq('deleted') expect(destroyed).to eq('removed')
end end
it 'handles correct push_action' do it 'handles correct push_action' do
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment