Commit b8e97f97 authored by Annabel Dunstone Gray's avatar Annabel Dunstone Gray Committed by Matthias Käppler

Update design management wording in activity feed

- Keep wording consistent between issue activity and user profile
  activity feed

Changelog: changed
parent 35e87a4a
......@@ -434,9 +434,9 @@ class Event < ApplicationRecord
def design_action_names
{
created: _('uploaded'),
updated: _('revised'),
destroyed: _('deleted')
created: _('added'),
updated: _('updated'),
destroyed: _('removed')
}
end
......
......@@ -38487,6 +38487,9 @@ msgstr[1] ""
msgid "access:"
msgstr ""
msgid "added"
msgstr ""
msgid "added %{created_at_timeago}"
msgstr ""
......@@ -39849,6 +39852,9 @@ msgstr ""
msgid "remove weight"
msgstr ""
msgid "removed"
msgstr ""
msgid "removed a Zoom call from this issue"
msgstr ""
......@@ -39869,9 +39875,6 @@ msgstr ""
msgid "reset it."
msgstr ""
msgid "revised"
msgstr ""
msgid "satisfied"
msgstr ""
......@@ -40043,9 +40046,6 @@ msgstr ""
msgid "updated %{time_ago}"
msgstr ""
msgid "uploaded"
msgstr ""
msgid "uploads"
msgstr ""
......
......@@ -179,7 +179,7 @@ RSpec.describe Dashboard::ProjectsController, :aggregate_failures do
expect(response).to render_template('dashboard/projects/index')
expect(response.body).to include(
"pushed to project",
"uploaded design #{design.to_reference}",
"added design #{design.to_reference}",
"created wiki page #{wiki_page.title}",
"joined project #{project.full_name}",
"closed issue #{issue.to_reference}"
......
......@@ -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
......
......@@ -982,9 +982,9 @@ RSpec.describe Event do
build(:design_event, trait).action_name
end
expect(created).to eq('uploaded')
expect(updated).to eq('revised')
expect(destroyed).to eq('deleted')
expect(created).to eq('added')
expect(updated).to eq('updated')
expect(destroyed).to eq('removed')
end
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