tarrien/Mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge commit '4aea3f88a6d30f102a79c2da7fcfac96465ba1a8' into merging-upstream

Browse Source
This commit is contained in:
Ondřej Hruška
2017-09-28 09:12:17 +02:00
parent 06e299cef5 4aea3f88a6
commit 9330ea1f4d
282 changed files with 4626 additions and 1622 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
spec/views/about/show.html.haml_spec.rb
View File

@ -17,6 +17,7 @@ describe 'about/show.html.haml', without_verify_partial_doubles: true do
version_number: '1.0',
source_url: 'https://github.com/tootsuite/mastodon',
open_registrations: false,
thumbnail: nil,
closed_registrations_message: 'yes',
commit_hash: commit_hash)

8
spec/views/stream_entries/show.html.haml_spec.rb
View File

@ -80,9 +80,9 @@ describe 'stream_entries/show.html.haml', without_verify_partial_doubles: true d
header_tags = view.content_for(:header_tags)
expect(header_tags).to match(%r{<meta content='.+' property='og:title'>})
expect(header_tags).to match(%r{<meta content='article' property='og:type'>})
expect(header_tags).to match(%r{<meta content='.+' property='og:image'>})
expect(header_tags).to match(%r{<meta content='http://.+' property='og:url'>})
expect(header_tags).to match(%r{<meta content=".+" property="og:title" />})
expect(header_tags).to match(%r{<meta content="article" property="og:type" />})
expect(header_tags).to match(%r{<meta content=".+" property="og:image" />})
expect(header_tags).to match(%r{<meta content="http://.+" property="og:url" />})
end
end