]> cat aescling's git repositories - mastodon.git/commitdiff
Remove .p-name microformat class (#7961)
authorEugen Rochko <eugen@zeonfederated.com>
Sat, 7 Jul 2018 16:51:56 +0000 (18:51 +0200)
committerGitHub <noreply@github.com>
Sat, 7 Jul 2018 16:51:56 +0000 (18:51 +0200)
Fix #7926

app/views/stream_entries/_detailed_status.html.haml
app/views/stream_entries/_simple_status.html.haml
spec/views/stream_entries/show.html.haml_spec.rb

index de844818fcd0a0da9cea0ee134fc62b54d8867ae..3fc715c4e4297187f0f57c5f9e1f302577bea281 100644 (file)
@@ -12,7 +12,7 @@
       = render file: Rails.root.join('app', 'javascript', 'images', 'logo.svg')
       = t('accounts.follow')
 
-  .status__content.p-name.emojify<
+  .status__content.emojify<
     - if status.spoiler_text?
       %p{ style: 'margin-bottom: 0' }<
         %span.p-summary> #{Formatter.instance.format_spoiler(status)}&nbsp;
index b89860ad90336601a4d36f476e070b77df9b4b18..0f27585a16aa689c5ad0afb071cd7769eca0c08b 100644 (file)
@@ -13,7 +13,7 @@
         %strong.p-name.emojify= display_name(status.account, custom_emojify: true)
         %span= acct(status.account)
 
-  .status__content.p-name.emojify<
+  .status__content.emojify<
     - if status.spoiler_text?
       %p{ style: 'margin-bottom: 0' }<
         %span.p-summary> #{Formatter.instance.format_spoiler(status)}&nbsp;
index 560039ffac62c138ca26576bc8b63035108b8af5..e0681b125779a4d8ed35c0ac0392f00cc9873e7c 100644 (file)
@@ -30,9 +30,7 @@ describe 'stream_entries/show.html.haml', without_verify_partial_doubles: true d
 
     mf2 = Microformats.parse(rendered)
 
-    expect(mf2.entry.name.to_s).to eq status.text
     expect(mf2.entry.url.to_s).not_to be_empty
-
     expect(mf2.entry.author.name.to_s).to eq alice.display_name
     expect(mf2.entry.author.url.to_s).not_to be_empty
   end
@@ -56,9 +54,7 @@ describe 'stream_entries/show.html.haml', without_verify_partial_doubles: true d
 
     mf2 = Microformats.parse(rendered)
 
-    expect(mf2.entry.name.to_s).to eq reply.text
     expect(mf2.entry.url.to_s).not_to be_empty
-
     expect(mf2.entry.comment.url.to_s).not_to be_empty
     expect(mf2.entry.comment.author.name.to_s).to eq carl.display_name
     expect(mf2.entry.comment.author.url.to_s).not_to be_empty