Leatherface/mastodon
0
0
Fork 0
mirror of https://github.com/glitch-soc/mastodon.git synced 2026-03-29 03:00:33 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge commit '68984de5b503791b814d81a85520af256bf43e11' into glitch-soc/merge-upstream

Browse Source 
Conflicts:
- `app/views/admin/settings/discovery/show.html.haml`:
  Glitch-soc has an extra setting textually adjacent to a line upstream has changed.
  Applied upstream's change while keeping glitch-soc's setting.
This commit is contained in:
Claire
2026-03-17 18:53:00 +01:00
parent 348a7a628f 68984de5b5
commit bd9e7d6060
37 changed files with 88 additions and 86 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/javascript/mastodon/components/admin/Dimension.jsx
View File

@@ -85,7 +85,7 @@ export default class Dimension extends PureComponent {
return (
<div className='dimension'>
<h4>{label}</h4>
<h2>{label}</h2>
{content}
</div>

2
app/javascript/mastodon/components/admin/ImpactReport.jsx
View File

@@ -49,7 +49,7 @@ export default class ImpactReport extends PureComponent {
return (
<div className='dimension'>
<h4><FormattedMessage id='admin.impact_report.title' defaultMessage='Impact summary' /></h4>
<FormattedMessage id='admin.impact_report.title' defaultMessage='Impact summary' tagName="h2" />
<table>
<tbody>

2
app/javascript/mastodon/components/admin/Retention.jsx
View File

@@ -145,7 +145,7 @@ export default class Retention extends PureComponent {
return (
<div className='retention'>
<h4>{title}</h4>
<h2>{title}</h2>
{content}
</div>

2
app/javascript/mastodon/components/admin/Trends.jsx
View File

@@ -66,7 +66,7 @@ export default class Trends extends PureComponent {
return (
<div className='trends trends--compact'>
<h4><FormattedMessage id='trends.trending_now' defaultMessage='Trending now' /></h4>
<FormattedMessage id='trends.trending_now' defaultMessage='Trending now' tagName='h2' />
{content}
</div>

24
app/javascript/styles/mastodon/admin.scss
View File

@@ -268,7 +268,7 @@ $content-width: 840px;
}
}
h2 small {
h1 small {
font-size: 12px;
display: block;
font-weight: 500;
@@ -282,22 +282,16 @@ $content-width: 840px;
}
}
h2 {
:where(h1),
.heading-large {
color: var(--color-text-primary);
font-size: 24px;
line-height: 36px;
font-weight: 700;
}
h3 {
color: var(--color-text-primary);
font-size: 20px;
line-height: 28px;
font-weight: 400;
margin-bottom: 30px;
}
h4 {
:where(h2):not(.heading-medium),
.heading-small {
text-transform: uppercase;
font-size: 13px;
font-weight: 700;
@@ -307,6 +301,14 @@ $content-width: 840px;
border-top: 1px solid var(--color-border-primary);
}
.heading-medium {
color: var(--color-text-primary);
font-size: 20px;
line-height: 28px;
font-weight: 400;
margin-bottom: 30px;
}
h6 {
font-size: 16px;
color: var(--color-text-primary);

2
app/views/admin/fasp/debug/callbacks/index.html.haml
View File

@@ -2,7 +2,7 @@
= t('admin.fasp.debug.callbacks.title')
- content_for :heading do
%h2= t('admin.fasp.debug.callbacks.title')
%h1= t('admin.fasp.debug.callbacks.title')
= render 'admin/fasp/shared/links'
- unless @callbacks.empty?

2
app/views/admin/fasp/providers/edit.html.haml
View File

@@ -4,7 +4,7 @@
= simple_form_for [:admin, @provider] do |f|
= render 'shared/error_messages', object: @provider
%h4= t('admin.fasp.providers.select_capabilities')
%h2= t('admin.fasp.providers.select_capabilities')
.fields_group
= f.fields_for :capabilities do |cf|

2
app/views/admin/fasp/providers/index.html.haml
View File

@@ -2,7 +2,7 @@
= t('admin.fasp.providers.title')
- content_for :heading do
%h2= t('admin.fasp.providers.title')
%h1= t('admin.fasp.providers.title')
= render 'admin/fasp/shared/links'
- unless @providers.empty?

2
app/views/admin/roles/_form.html.haml
View File

@@ -40,7 +40,7 @@
%span.hint= t('simple_form.hints.user_role.permissions_as_keys')
- (form.object.everyone? ? UserRole::Flags::CATEGORIES.slice(:invites) : UserRole::Flags::CATEGORIES).each do |category, permissions|
%h4= t(category, scope: 'admin.roles.categories')
%h2= t(category, scope: 'admin.roles.categories')
= form.input :permissions_as_keys,
as: :check_boxes,

2
app/views/admin/rules/edit.html.haml
View File

@@ -8,7 +8,7 @@
%hr.spacer/
%h4= t('admin.rules.translations')
%h2= t('admin.rules.translations')
%p.hint= t('admin.rules.translations_explanation')

2
app/views/admin/settings/about/show.html.haml
View File

@@ -2,7 +2,7 @@
= t('admin.settings.about.title')
- content_for :heading do
%h2= t('admin.settings.title')
%h1= t('admin.settings.title')
= render partial: 'admin/settings/shared/links'
= simple_form_for @admin_settings, url: admin_settings_about_path do |f|

2
app/views/admin/settings/appearance/show.html.haml
View File

@@ -2,7 +2,7 @@
= t('admin.settings.appearance.title')
- content_for :heading do
%h2= t('admin.settings.title')
%h1= t('admin.settings.title')
= render partial: 'admin/settings/shared/links'
= simple_form_for @admin_settings, url: admin_settings_appearance_path do |f|

2
app/views/admin/settings/branding/show.html.haml
View File

@@ -2,7 +2,7 @@
= t('admin.settings.branding.title')
- content_for :heading do
%h2= t('admin.settings.title')
%h1= t('admin.settings.title')
= render partial: 'admin/settings/shared/links'
= simple_form_for @admin_settings, url: admin_settings_branding_path do |f|

4
app/views/admin/settings/content_retention/show.html.haml
View File

@@ -2,7 +2,7 @@
= t('admin.settings.content_retention.title')
- content_for :heading do
%h2= t('admin.settings.title')
%h1= t('admin.settings.title')
= render partial: 'admin/settings/shared/links'
= simple_form_for @admin_settings, url: admin_settings_content_retention_path do |f|
@@ -18,7 +18,7 @@
input_html: { pattern: '[0-9]+' },
wrapper: :with_block_label
%h4= t('admin.settings.content_retention.danger_zone')
%h2= t('admin.settings.content_retention.danger_zone')
.fields-group
= f.input :content_cache_retention_period,

18
app/views/admin/settings/discovery/show.html.haml
View File

@@ -2,7 +2,7 @@
= t('admin.settings.discovery.title')
- content_for :heading do
%h2= t('admin.settings.title')
%h1= t('admin.settings.title')
= render partial: 'admin/settings/shared/links'
= simple_form_for @admin_settings, url: admin_settings_discovery_path do |f|
@@ -10,7 +10,7 @@
%p.lead= t('admin.settings.discovery.preamble')
%h4= t('admin.settings.discovery.trends')
%h2= t('admin.settings.discovery.trends')
.fields-group
= f.input :trends,
@@ -26,7 +26,7 @@
.fields-group
= f.input :trending_status_cw, as: :boolean, wrapper: :with_label, label: t('admin.settings.trending_status_cw.title'), hint: t('admin.settings.trending_status_cw.desc_html'), glitch_only: true
%h4= t('admin.settings.discovery.public_timelines')
%h2= t('admin.settings.discovery.public_timelines')
.fields-row
.fields-row__column.fields-row__column-6.fields-group
@@ -58,7 +58,7 @@
label_method: ->(mode) { I18n.t("admin.settings.feed_access.modes.#{mode}") },
wrapper: :with_label
%h4= t('admin.settings.discovery.privacy')
%h2= t('admin.settings.discovery.privacy')
.fields-group
= f.input :noindex,
@@ -74,7 +74,7 @@
label: t('admin.settings.allow_referrer_origin.title'),
wrapper: :with_label
%h4= t('admin.settings.discovery.publish_statistics')
%h2= t('admin.settings.discovery.publish_statistics')
.fields-group
= f.input :activity_api_enabled,
@@ -88,7 +88,7 @@
wrapper: :with_label,
recommended: :recommended
%h4= t('admin.settings.security.federation_authentication')
%h2= t('admin.settings.security.federation_authentication')
.fields-group
= f.input :authorized_fetch,
@@ -100,20 +100,20 @@
warning_hint: discovery_warning_hint_text,
wrapper: :with_label
%h4= t('admin.settings.discovery.follow_recommendations')
%h2= t('admin.settings.discovery.follow_recommendations')
.fields-group
= f.input :bootstrap_timeline_accounts,
wrapper: :with_block_label
%h4= t('admin.settings.discovery.profile_directory')
%h2= t('admin.settings.discovery.profile_directory')
.fields-group
= f.input :profile_directory,
as: :boolean,
wrapper: :with_label
%h4= t('admin.settings.discovery.wrapstodon')
%h2= t('admin.settings.discovery.wrapstodon')
.fields-group
= f.input :wrapstodon,

2
app/views/admin/settings/registrations/show.html.haml
View File

@@ -2,7 +2,7 @@
= t('admin.settings.registrations.title')
- content_for :heading do
%h2= t('admin.settings.title')
%h1= t('admin.settings.title')
= render partial: 'admin/settings/shared/links'
= simple_form_for @admin_settings, url: admin_settings_registrations_path do |f|

2
app/views/admin/terms_of_service/drafts/show.html.haml
View File

@@ -2,7 +2,7 @@
= t('admin.terms_of_service.title')
- content_for :heading do
%h2= t('admin.terms_of_service.title')
%h1= t('admin.terms_of_service.title')
= render partial: 'admin/terms_of_service/links'
= simple_form_for @terms_of_service, url: admin_terms_of_service_draft_path, method: :put do |form|

2
app/views/admin/terms_of_service/histories/show.html.haml
View File

@@ -2,7 +2,7 @@
= t('admin.terms_of_service.history')
- content_for :heading do
%h2= t('admin.terms_of_service.title')
%h1= t('admin.terms_of_service.title')
= render partial: 'admin/terms_of_service/links'
- if @terms_of_service.empty?

4
app/views/admin/terms_of_service/index.html.haml
View File

@@ -2,7 +2,7 @@
= t('admin.terms_of_service.title')
- content_for :heading do
%h2= t('admin.terms_of_service.title')
%h1= t('admin.terms_of_service.title')
= render partial: 'links'
- if @terms_of_service.present?
@@ -31,7 +31,7 @@
%hr.spacer/
%h3= t('admin.terms_of_service.changelog')
%h2.heading-medium= t('admin.terms_of_service.changelog')
.prose
= markdown(@terms_of_service.changelog)

2
app/views/admin/webhooks/show.html.haml
View File

@@ -3,7 +3,7 @@
- content_for :heading do
.content__heading__row
%h2
%h1
%small
= material_symbol 'inbox'
= t('admin.webhooks.webhook')

2
app/views/auth/registrations/_status.html.haml
View File

@@ -10,7 +10,7 @@
= t('auth.status.redirecting_to', acct: user.account.moved_to_account.pretty_acct)
= link_to t('migrations.cancel'), settings_migration_path
%h3= t('auth.status.account_status')
%h2.heading-medium= t('auth.status.account_status')
%p.hint
- if user.account.suspended?

8
app/views/auth/registrations/edit.html.haml
View File

@@ -7,7 +7,7 @@
- else
= render partial: 'status', locals: { user: @user, strikes: @strikes }
%h3= t('auth.security')
%h2.heading-medium= t('auth.security')
= simple_form_for(resource, as: resource_name, url: registration_path(resource_name), html: { method: :put, class: 'auth_edit', novalidate: false }) do |f|
= render 'shared/error_messages', object: resource
@@ -57,15 +57,15 @@
- unless current_account.suspended? || self_destruct?
%hr.spacer/
%h3= t('auth.migrate_account')
%h2.heading-medium= t('auth.migrate_account')
%p.muted-hint= t('auth.migrate_account_html', path: settings_migration_path)
%hr.spacer/
%h3= t('migrations.incoming_migrations')
%h2.heading-medium= t('migrations.incoming_migrations')
%p.muted-hint= t('migrations.incoming_migrations_html', path: settings_aliases_path)
%hr.spacer/
%h3= t('auth.delete_account')
%h2.heading-medium= t('auth.delete_account')
%p.muted-hint= t('auth.delete_account_html', path: settings_delete_path)

2
app/views/auth/sessions/new.html.haml
View File

@@ -38,7 +38,7 @@
- if devise_mapping.omniauthable? && resource_class.omniauth_providers.any?
.simple_form.alternative-login
%h4= omniauth_only? ? t('auth.log_in_with') : t('auth.or_log_in_with')
%h2= omniauth_only? ? t('auth.log_in_with') : t('auth.or_log_in_with')
.actions
- resource_class.omniauth_providers.each do |provider|

4
app/views/filters/_filter_fields.html.haml
View File

@@ -36,13 +36,13 @@
%hr.spacer/
- unless f.object.statuses.empty?
%h4= t('filters.edit.statuses')
%h2= t('filters.edit.statuses')
%p.muted-hint= t('filters.edit.statuses_hint_html', path: filter_statuses_path(f.object))
%hr.spacer/
%h4= t('filters.edit.keywords')
%h2= t('filters.edit.keywords')
.table-wrapper
%table.table.keywords-table

2
app/views/layouts/admin.html.haml
View File

@@ -31,7 +31,7 @@
= yield :heading
- else
.content__heading__row
%h2= yield :page_title
%h1= yield :page_title
- if content_for?(:heading_actions)
.content__heading__actions

4
app/views/settings/featured_tags/index.html.haml
View File

@@ -2,7 +2,7 @@
= t('settings.featured_tags')
- content_for :heading do
%h2= t('settings.profile')
%h1= t('settings.profile')
= render partial: 'settings/shared/profile_navigation'
= simple_form_for @featured_tag, url: settings_featured_tags_path do |f|
@@ -23,7 +23,7 @@
- @featured_tags.each do |featured_tag|
.directory__tag
%div
%h4
%h2
= material_symbol 'tag'
= featured_tag.display_name
%small

10
app/views/settings/preferences/appearance/show.html.haml
View File

@@ -61,7 +61,7 @@
= t('appearance.localization.glitch_guide_link_text')
= f.simple_fields_for :settings, current_user.settings do |ff|
%h4= t 'appearance.animations_and_accessibility'
%h2= t 'appearance.animations_and_accessibility'
.fields-group
= ff.input :'web.use_pending_items',
@@ -77,12 +77,12 @@
= ff.input :'web.use_system_font', wrapper: :with_label, label: I18n.t('simple_form.labels.defaults.setting_system_font_ui')
= ff.input :'web.use_system_scrollbars', wrapper: :with_label, hint: I18n.t('simple_form.hints.defaults.setting_system_scrollbars_ui'), label: I18n.t('simple_form.labels.defaults.setting_system_scrollbars_ui')
%h4= t 'appearance.discovery'
%h2= t 'appearance.discovery'
.fields-group
= ff.input :'web.trends', wrapper: :with_label, label: I18n.t('simple_form.labels.defaults.setting_trends')
%h4= t 'appearance.boosting_preferences'
%h2= t 'appearance.boosting_preferences'
.fields-group
= ff.input :'web.reblog_modal',
@@ -96,7 +96,7 @@
wrapper: :with_label
.flash-message.hidden-on-touch-devices= t('appearance.boosting_preferences_info_html', icon: material_symbol('repeat'))
%h4= t 'appearance.sensitive_content'
%h2= t 'appearance.sensitive_content'
.fields-group
= ff.input :'web.display_media',
@@ -119,7 +119,7 @@
.fields-group
= ff.input :'web.expand_content_warnings', wrapper: :with_label, label: I18n.t('simple_form.labels.defaults.setting_expand_spoilers')
%h4= t 'appearance.advanced_settings'
%h2= t 'appearance.advanced_settings'
.fields-group
= ff.input :'web.advanced_layout',

4
app/views/settings/preferences/notifications/show.html.haml
View File

@@ -7,7 +7,7 @@
= simple_form_for current_user, url: settings_preferences_notifications_path, html: { id: :edit_notification } do |f|
= render 'shared/error_messages', object: current_user
%h4= t 'notifications.email_events'
%h2= t 'notifications.email_events'
%p.hint= t 'notifications.email_events_hint'
@@ -24,7 +24,7 @@
= ff.input :always_send_emails, wrapper: :with_label, label: I18n.t('simple_form.labels.defaults.setting_always_send_emails'), hint: I18n.t('simple_form.hints.defaults.setting_always_send_emails')
- if current_user.can?(:manage_reports, :manage_appeals, :manage_users, :manage_taxonomies) || (SoftwareUpdate.check_enabled? && current_user.can?(:view_devops))
%h4= t 'notifications.administration_emails'
%h2= t 'notifications.administration_emails'
.fields-group
= ff.input :'notification_emails.report', wrapper: :with_label, label: I18n.t('simple_form.labels.notification_emails.report') if current_user.can?(:manage_reports)

2
app/views/settings/preferences/other/show.html.haml
View File

@@ -15,7 +15,7 @@
recommended: true,
wrapper: :with_label
%h4= t 'preferences.public_timelines'
%h2= t 'preferences.public_timelines'
.fields-group
= f.input :chosen_languages,

8
app/views/settings/privacy/show.html.haml
View File

@@ -2,14 +2,14 @@
= t('privacy.title')
- content_for :heading do
%h2= t('privacy.title')
%h1= t('privacy.title')
= simple_form_for @account, url: settings_privacy_path do |f|
= render 'shared/error_messages', object: @account
%p.lead= t('privacy.hint_html')
%h4= t('privacy.reach')
%h2= t('privacy.reach')
%p.lead= t('privacy.reach_hint_html')
@@ -19,7 +19,7 @@
.fields-group
= f.input :unlocked, as: :boolean, wrapper: :with_label
%h4= t('privacy.search')
%h2= t('privacy.search')
%p.lead= t('privacy.search_hint_html')
@@ -30,7 +30,7 @@
.fields-group
= ff.input :indexable, wrapper: :with_label
%h4= t('privacy.privacy')
%h2= t('privacy.privacy')
%p.lead= t('privacy.privacy_hint_html')

6
app/views/settings/profiles/show.html.haml
View File

@@ -2,7 +2,7 @@
= t('settings.edit_profile')
- content_for :heading do
%h2= t('settings.profile')
%h1= t('settings.profile')
= render partial: 'settings/shared/profile_navigation'
= simple_form_for @account, url: settings_profile_path, html: { id: :edit_profile } do |f|
@@ -10,7 +10,7 @@
%p.lead= t('edit_profile.hint_html')
%h4= t('edit_profile.basic_information')
%h2= t('edit_profile.basic_information')
.fields-row
.fields-row__column.fields-row__column-6
@@ -62,7 +62,7 @@
= material_symbol 'delete'
= t('generic.delete')
%h4= t('edit_profile.other')
%h2= t('edit_profile.other')
.fields-group
= f.input :bot, as: :boolean, wrapper: :with_label, hint: t('simple_form.hints.defaults.bot')

12
app/views/settings/verifications/show.html.haml
View File

@@ -2,15 +2,15 @@
= t('verification.verification')
- content_for :heading do
%h2= t('settings.profile')
%h1= t('settings.profile')
= render partial: 'settings/shared/profile_navigation'
.simple_form.form-section
%h3= t('verification.website_verification')
%h2.heading-medium= t('verification.website_verification')
%p.lead= t('verification.hint_html')
%h4= t('verification.here_is_how')
%h3.heading-small= t('verification.here_is_how')
%p.lead= t('verification.instructions_html')
@@ -22,7 +22,7 @@
%p.lead= t('verification.extra_instructions_html')
- if @verified_links.any?
%h4= t('verification.verified_links')
%h3.heading-small= t('verification.verified_links')
%ul.lead
- @verified_links.each do |field|
@@ -34,7 +34,7 @@
= simple_form_for @account, url: settings_verification_path, html: { class: 'form-section' } do |f|
= render 'shared/error_messages', object: @account
%h3= t('author_attribution.title')
%h2.heading-medium= t('author_attribution.title')
%p.lead= t('author_attribution.hint_html')
@@ -53,7 +53,7 @@
= logo_as_symbol(:icon)
= t('author_attribution.more_from_html', name: author_attribution_name(@account))
%h4= t('verification.here_is_how')
%h3.heading-small= t('verification.here_is_how')
%p.lead= t('author_attribution.instructions')

4
app/views/statuses_cleanup/show.html.haml
View File

@@ -24,7 +24,7 @@
.flash-message= t('statuses_cleanup.explanation')
%h4= t('statuses_cleanup.exceptions')
%h2= t('statuses_cleanup.exceptions')
.fields-row
.fields-row__column.fields-row__column-6.fields-group
@@ -68,7 +68,7 @@
label: t('statuses_cleanup.keep_media'),
wrapper: :with_label
%h4= t('statuses_cleanup.interaction_exceptions')
%h2= t('statuses_cleanup.interaction_exceptions')
.fields-row
.fields-row__column.fields-row__column-6.fields-group

4
spec/system/admin/fasp/debug/callbacks_spec.rb
View File

@@ -15,14 +15,14 @@ RSpec.describe 'Debug FASP Callback Management', feature: :fasp do
it 'displays callbacks and allows to delete them' do
visit admin_fasp_debug_callbacks_path
expect(page).to have_css('h2', text: I18n.t('admin.fasp.debug.callbacks.title'))
expect(page).to have_css('h1', text: I18n.t('admin.fasp.debug.callbacks.title'))
expect(page).to have_css('td', text: 'debug prov')
expect(page).to have_css('code', text: 'called back')
expect do
click_on I18n.t('admin.fasp.debug.callbacks.delete')
expect(page).to have_css('h2', text: I18n.t('admin.fasp.debug.callbacks.title'))
expect(page).to have_css('h1', text: I18n.t('admin.fasp.debug.callbacks.title'))
end.to change(Fasp::DebugCallback, :count).by(-1)
end
end

4
spec/system/admin/fasp/debug_calls_spec.rb
View File

@@ -19,14 +19,14 @@ RSpec.describe 'FASP Debug Calls', feature: :fasp do
it 'makes a debug call to the provider' do
visit admin_fasp_providers_path
expect(page).to have_css('h2', text: I18n.t('admin.fasp.providers.title'))
expect(page).to have_css('h1', text: I18n.t('admin.fasp.providers.title'))
expect(page).to have_css('td', text: provider.name)
within 'table#providers' do
click_on I18n.t('admin.fasp.providers.callback')
end
expect(page).to have_css('h2', text: I18n.t('admin.fasp.providers.title'))
expect(page).to have_css('h1', text: I18n.t('admin.fasp.providers.title'))
expect(debug_call).to have_been_requested
end
end

14
spec/system/admin/fasp/providers_spec.rb
View File

@@ -34,30 +34,30 @@ RSpec.describe 'FASP Management', feature: :fasp do
it 'allows enabling and disabling of capabilities' do
visit admin_fasp_providers_path
expect(page).to have_css('h2', text: I18n.t('admin.fasp.providers.title'))
expect(page).to have_css('h1', text: I18n.t('admin.fasp.providers.title'))
expect(page).to have_css('td', text: provider.name)
click_on I18n.t('admin.fasp.providers.edit')
expect(page).to have_css('h2', text: I18n.t('admin.fasp.providers.edit'))
expect(page).to have_css('h1', text: I18n.t('admin.fasp.providers.edit'))
check 'callback'
click_on I18n.t('admin.fasp.providers.save')
expect(page).to have_css('h2', text: I18n.t('admin.fasp.providers.title'))
expect(page).to have_css('h1', text: I18n.t('admin.fasp.providers.title'))
expect(provider.reload).to be_capability_enabled('callback')
expect(enable_call).to have_been_requested
click_on I18n.t('admin.fasp.providers.edit')
expect(page).to have_css('h2', text: I18n.t('admin.fasp.providers.edit'))
expect(page).to have_css('h1', text: I18n.t('admin.fasp.providers.edit'))
uncheck 'callback'
click_on I18n.t('admin.fasp.providers.save')
expect(page).to have_css('h2', text: I18n.t('admin.fasp.providers.title'))
expect(page).to have_css('h1', text: I18n.t('admin.fasp.providers.title'))
expect(provider.reload).to_not be_capability_enabled('callback')
expect(disable_call).to have_been_requested
end
@@ -69,12 +69,12 @@ RSpec.describe 'FASP Management', feature: :fasp do
it 'allows to completely remove a provider' do
visit admin_fasp_providers_path
expect(page).to have_css('h2', text: I18n.t('admin.fasp.providers.title'))
expect(page).to have_css('h1', text: I18n.t('admin.fasp.providers.title'))
expect(page).to have_css('td', text: provider.name)
click_on I18n.t('admin.fasp.providers.delete')
expect(page).to have_css('h2', text: I18n.t('admin.fasp.providers.title'))
expect(page).to have_css('h1', text: I18n.t('admin.fasp.providers.title'))
expect(page).to have_no_css('td', text: provider.name)
end
end

2
spec/system/admin/fasp/registrations_spec.rb
View File

@@ -31,7 +31,7 @@ RSpec.describe 'FASP registration', feature: :fasp do
click_on I18n.t('admin.fasp.providers.registrations.confirm')
expect(page).to have_css('h2', text: I18n.t('admin.fasp.providers.edit'))
expect(page).to have_css('h1', text: I18n.t('admin.fasp.providers.edit'))
expect(provider.reload).to be_confirmed
end