github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-05-22 07:53:49 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

FIX: improves code, tests and utc handling of local-dates (#6644)

Browse Source
This commit is contained in:
Joffrey JAFFEUX
2018-11-22 17:19:24 +01:00
committed by GitHub
parent 56478166e5
commit 3ff3bb6e2a
8 changed files with 435 additions and 96 deletions
Download Patch File Download Diff File Expand all files Collapse all files

58
plugins/discourse-local-dates/spec/lib/pretty_text_spec.rb
View File

@ -1,24 +1,52 @@
require 'rails_helper'
def generate_html(text, opts = {})
output = "<p><span class=\"discourse-local-date\""
output += " data-date=\"#{opts[:date]}\"" if opts[:date]
output += " data-time=\"#{opts[:time]}\"" if opts[:time]
output += " data-format=\"#{opts[:format]}\"" if opts[:format]
output += " data-email-preview=\"#{opts[:email_preview]}\"" if opts[:email_preview]
output += ">"
output += text
output + "</span></p>"
end
describe PrettyText do
it 'uses a simplified syntax in emails' do
before do
freeze_time
cooked = PrettyText.cook <<~MD
[date=2018-05-08 time=22:00 format=LLL timezones="Europe/Paris|America/Los_Angeles"]
MD
cooked_mail = <<~HTML
<p><span class="discourse-local-date" data-date="2018-05-08" data-format="LLL" data-timezones="Europe/Paris|America/Los_Angeles" data-time="22:00" data-email-preview="May 9, 2018 12:00 AM (Europe: Paris)">May 9, 2018 12:00 AM (Europe: Paris)</span></p>
HTML
end
expect(PrettyText.format_for_email(cooked)).to match_html(cooked_mail)
context 'emails simplified rendering' do
it 'works with default markup' do
cooked = PrettyText.cook("[date=2018-05-08]")
cooked_mail = generate_html("2018-05-08T00:00:00Z (Etc: UTC)",
date: "2018-05-08",
email_preview: "2018-05-08T00:00:00Z (Etc: UTC)"
)
cooked = PrettyText.cook <<~MD
[date=2018-05-08 format=LLL timezone="Europe/Berlin" timezones="Europe/Paris|America/Los_Angeles"]
MD
cooked_mail = <<~HTML
<p><span class="discourse-local-date" data-date="2018-05-08" data-format="LLL" data-timezones="Europe/Paris|America/Los_Angeles" data-timezone="Europe/Berlin" data-email-preview="May 8, 2018 12:00 AM (Europe: Paris)">May 8, 2018 12:00 AM (Europe: Paris)</span></p>
HTML
expect(PrettyText.format_for_email(cooked)).to match_html(cooked_mail)
end
expect(PrettyText.format_for_email(cooked)).to match_html(cooked_mail)
it 'works with format' do
cooked = PrettyText.cook("[date=2018-05-08 format=LLLL]")
cooked_mail = generate_html("Tuesday, May 8, 2018 12:00 AM (Etc: UTC)",
date: "2018-05-08",
email_preview: "Tuesday, May 8, 2018 12:00 AM (Etc: UTC)",
format: "LLLL"
)
expect(PrettyText.format_for_email(cooked)).to match_html(cooked_mail)
end
it 'works with time' do
cooked = PrettyText.cook("[date=2018-05-08 time=20:00:00]")
cooked_mail = generate_html("2018-05-08T20:00:00Z (Etc: UTC)",
date: "2018-05-08",
email_preview: "2018-05-08T20:00:00Z (Etc: UTC)",
time: "20:00:00"
)
expect(PrettyText.format_for_email(cooked)).to match_html(cooked_mail)
end
end
end