mirror of
https://github.com/mastodon/mastodon.git
synced 2024-11-22 06:06:45 +00:00
Use shared system spec helper methods (#31784)
This commit is contained in:
parent
82161d8ae5
commit
c6a0768fe5
|
@ -16,4 +16,8 @@ module SystemHelpers
|
||||||
def form_label(key)
|
def form_label(key)
|
||||||
I18n.t key, scope: 'simple_form.labels'
|
I18n.t key, scope: 'simple_form.labels'
|
||||||
end
|
end
|
||||||
|
|
||||||
|
def css_id(record)
|
||||||
|
"##{dom_id(record)}"
|
||||||
|
end
|
||||||
end
|
end
|
||||||
|
|
|
@ -45,7 +45,7 @@ RSpec.describe 'Admin::Announcements' do
|
||||||
|
|
||||||
fill_in text_label,
|
fill_in text_label,
|
||||||
with: 'Announcement text'
|
with: 'Announcement text'
|
||||||
save_changes
|
click_on submit_button
|
||||||
|
|
||||||
expect(page)
|
expect(page)
|
||||||
.to have_content(I18n.t('admin.announcements.updated_msg'))
|
.to have_content(I18n.t('admin.announcements.updated_msg'))
|
||||||
|
@ -94,10 +94,6 @@ RSpec.describe 'Admin::Announcements' do
|
||||||
|
|
||||||
private
|
private
|
||||||
|
|
||||||
def css_id(record)
|
|
||||||
"##{dom_id(record)}" # TODO: Extract to system spec helper?
|
|
||||||
end
|
|
||||||
|
|
||||||
def publish_announcement(announcement)
|
def publish_announcement(announcement)
|
||||||
within css_id(announcement) do
|
within css_id(announcement) do
|
||||||
click_on I18n.t('admin.announcements.publish')
|
click_on I18n.t('admin.announcements.publish')
|
||||||
|
@ -116,10 +112,6 @@ RSpec.describe 'Admin::Announcements' do
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
def save_changes
|
|
||||||
click_on I18n.t('generic.save_changes')
|
|
||||||
end
|
|
||||||
|
|
||||||
def submit_form
|
def submit_form
|
||||||
click_on I18n.t('admin.announcements.new.create')
|
click_on I18n.t('admin.announcements.new.create')
|
||||||
end
|
end
|
||||||
|
|
|
@ -91,7 +91,7 @@ RSpec.describe 'blocking domains through the moderation interface' do
|
||||||
visit edit_admin_domain_block_path(domain_block)
|
visit edit_admin_domain_block_path(domain_block)
|
||||||
|
|
||||||
select I18n.t('admin.domain_blocks.new.severity.suspend'), from: 'domain_block_severity'
|
select I18n.t('admin.domain_blocks.new.severity.suspend'), from: 'domain_block_severity'
|
||||||
click_on I18n.t('generic.save_changes')
|
click_on submit_button
|
||||||
|
|
||||||
# It doesn't immediately block but presents a confirmation screen
|
# It doesn't immediately block but presents a confirmation screen
|
||||||
expect(page).to have_title(I18n.t('admin.domain_blocks.confirm_suspension.title', domain: 'example.com'))
|
expect(page).to have_title(I18n.t('admin.domain_blocks.confirm_suspension.title', domain: 'example.com'))
|
||||||
|
|
|
@ -29,7 +29,7 @@ RSpec.describe 'Filters' do
|
||||||
click_on filter_title
|
click_on filter_title
|
||||||
|
|
||||||
fill_in filter_title_field, with: new_title
|
fill_in filter_title_field, with: new_title
|
||||||
click_on I18n.t('generic.save_changes')
|
click_on submit_button
|
||||||
|
|
||||||
expect(page).to have_content(new_title)
|
expect(page).to have_content(new_title)
|
||||||
end
|
end
|
||||||
|
|
|
@ -56,10 +56,6 @@ RSpec.describe 'Invites' do
|
||||||
|
|
||||||
private
|
private
|
||||||
|
|
||||||
def css_id(record)
|
|
||||||
"##{dom_id(record)}" # TODO: Extract to system spec helper?
|
|
||||||
end
|
|
||||||
|
|
||||||
def copyable_field
|
def copyable_field
|
||||||
within '.input-copy' do
|
within '.input-copy' do
|
||||||
find(:field, type: :text, readonly: true)
|
find(:field, type: :text, readonly: true)
|
||||||
|
|
Loading…
Reference in a new issue