@@ -80,10 +82,12 @@
" alt="right-sidebar-nav">
+
<% if @home_page %>
<% @featured_story ||= @stories.where.not(main_image: nil).first&.decorate || Article.new %>
<% @stories = @stories.decorate %>
- <% end %>
+ <% end %>
+
<% if @featured_story.id %>
@@ -98,8 +102,12 @@
<% if @stories.any? %>
<%= render "stories/main_stories_feed" %>
<% end %>
+
loading...
+
+
+
+
diff --git a/app/views/comments/_comment_proper.html.erb b/app/views/comments/_comment_proper.html.erb
index a5dce38f6..df1f614aa 100644
--- a/app/views/comments/_comment_proper.html.erb
+++ b/app/views/comments/_comment_proper.html.erb
@@ -47,9 +47,7 @@
<% if commentable_author_is_op?(commentable, comment) %>
<%= get_ama_or_op_banner(commentable) %>
<% end %>
-
+ <%= render "comments/comment_date", decorated_comment: decorated_comment %>
diff --git a/app/views/comments/_liquid.html.erb b/app/views/comments/_liquid.html.erb
index 27886835f..f29a580ac 100644
--- a/app/views/comments/_liquid.html.erb
+++ b/app/views/comments/_liquid.html.erb
@@ -1,24 +1,22 @@
- .get(50) %>)
+
<%= comment.user.name %>
<% if comment.user.twitter_username.present? %>
- 
+
<% end %>
<% if comment.user.github_username.present? %>
- 
+
<% end %>
-
+ <%= render "comments/comment_date", decorated_comment: comment.decorate %>
+
<% end %>
<% if comment.user.github_username.present? %>
-
+
<% end %>
-
+ <%= render "comments/comment_date", decorated_comment: comment.decorate %>
<%= comment.processed_html.html_safe %>
diff --git a/app/views/stories/_main_stories_feed.html.erb b/app/views/stories/_main_stories_feed.html.erb
index d3e06b3ac..04340d3de 100644
--- a/app/views/stories/_main_stories_feed.html.erb
+++ b/app/views/stories/_main_stories_feed.html.erb
@@ -14,7 +14,8 @@
reading_time video_thumbnail_url video video_duration_in_minutes language
experience_level_rating experience_level_rating_distribution cached_user cached_organization],
methods: %i[readable_publish_date cached_tag_list_array flare_tag class_name
- cloudinary_video_url video_duration_in_minutes published_at_int],
+ cloudinary_video_url video_duration_in_minutes published_at_int
+ published_timestamp],
) %>">
<% 3.times do %>
diff --git a/app/views/users/_comments_section.html.erb b/app/views/users/_comments_section.html.erb
index 157498233..e591502d7 100644
--- a/app/views/users/_comments_section.html.erb
+++ b/app/views/users/_comments_section.html.erb
@@ -29,7 +29,9 @@
">
re: <%= comment.commentable.title %>
- <%= comment.readable_publish_date %>
+
+
+
diff --git a/spec/models/article_spec.rb b/spec/models/article_spec.rb
index 71cf00025..7e41a5b1b 100644
--- a/spec/models/article_spec.rb
+++ b/spec/models/article_spec.rb
@@ -507,5 +507,31 @@ RSpec.describe Article, type: :model do
end
end
+ describe "published_timestamp" do
+ it "returns empty string if the article is new" do
+ expect(Article.new.published_timestamp).to eq("")
+ end
+
+ it "returns empty string if the article is not published" do
+ article.update_column(:published, false)
+ expect(article.published_timestamp).to eq("")
+ end
+
+ it "returns the timestamp of the crossposting date over the publishing date" do
+ crossposted_at = 1.week.ago
+ published_at = 1.day.ago
+ article.update_columns(
+ published: true, crossposted_at: crossposted_at, published_at: published_at,
+ )
+ expect(article.published_timestamp).to eq(crossposted_at.utc.iso8601)
+ end
+
+ it "returns the timestamp of the publishing date if there is no crossposting date" do
+ published_at = 1.day.ago
+ article.update_columns(published: true, crossposted_at: nil, published_at: published_at)
+ expect(article.published_timestamp).to eq(published_at.utc.iso8601)
+ end
+ end
+
include_examples "#sync_reactions_count", :article
end
diff --git a/spec/system/articles/user_visits_an_article_spec.rb b/spec/system/articles/user_visits_an_article_spec.rb
index 6d0ef5405..7c409af61 100644
--- a/spec/system/articles/user_visits_an_article_spec.rb
+++ b/spec/system/articles/user_visits_an_article_spec.rb
@@ -5,11 +5,9 @@ RSpec.describe "Views an article", type: :system do
let(:dir) { "../../support/fixtures/sample_article.txt" }
let(:template) { File.read(File.join(File.dirname(__FILE__), dir)) }
let!(:article) do
- create(:article,
- user_id: user.id,
- body_markdown: template.gsub("false", "true"),
- body_html: "")
+ create(:article, user_id: user.id, body_markdown: template.gsub("false", "true"), body_html: "")
end
+ let!(:timestamp) { "2019-03-04T10:00:00Z" }
before do
sign_in user
@@ -25,4 +23,21 @@ RSpec.describe "Views an article", type: :system do
visit "/#{user.username}/#{article.slug}"
expect(page).to have_selector(".single-comment-node", visible: true, count: 3)
end
+
+ context "when showing the date" do
+ before do
+ article.update_column(:published_at, Time.zone.parse(timestamp))
+ end
+
+ it "shows the readable publish date" do
+ visit "/#{user.username}/#{article.slug}"
+ expect(page).to have_selector("article time", text: "Mar 4")
+ end
+
+ it "embeds the published timestamp" do
+ visit "/#{user.username}/#{article.slug}"
+ selector = "article time[datetime='#{timestamp}']"
+ expect(page).to have_selector(selector)
+ end
+ end
end
diff --git a/spec/system/comments/user_views_a_comment_spec.rb b/spec/system/comments/user_views_a_comment_spec.rb
index 378771588..414516c9a 100644
--- a/spec/system/comments/user_views_a_comment_spec.rb
+++ b/spec/system/comments/user_views_a_comment_spec.rb
@@ -18,11 +18,11 @@ RSpec.describe "Viewing a comment", type: :system, js: true do
context "when showing the date" do
it "shows the readable publish date" do
- expect(page).to have_selector(".comment-date", text: "Mar 4")
+ expect(page).to have_selector(".comment-date time", text: "Mar 4")
end
it "embeds the published timestamp" do
- selector = ".comment-date[data-published-timestamp='#{timestamp}']"
+ selector = ".comment-date time[datetime='#{timestamp}']"
expect(page).to have_selector(selector)
end
end
diff --git a/spec/system/homepage/user_visits_homepage_articles_spec.rb b/spec/system/homepage/user_visits_homepage_articles_spec.rb
index c5112ee6a..d76005e40 100644
--- a/spec/system/homepage/user_visits_homepage_articles_spec.rb
+++ b/spec/system/homepage/user_visits_homepage_articles_spec.rb
@@ -5,21 +5,52 @@ RSpec.describe "User visits a homepage", type: :system do
let!(:article2) { create(:article, reactions_count: 20, featured: true) }
let!(:bad_article) { create(:article, reactions_count: 0) }
let!(:user) { create(:user) }
+ let!(:timestamp) { "2019-03-04T10:00:00Z" }
context "when no options specified" do
- before { visit "/" }
+ context "when main featured article" do
+ before do
+ article.update_column(:published_at, Time.zone.parse(timestamp))
+ article2.update_column(:published_at, Time.zone.parse(timestamp))
+ visit "/"
+ end
- it "shows the main article" do
- expect(page).to have_selector(".big-article", visible: true)
+ it "shows the main article" do
+ expect(page).to have_selector(".big-article", visible: true)
+ end
+
+ it "shows the main article readable date" do
+ expect(page).to have_selector(".big-article time", text: "Mar 4")
+ end
+
+ it "embeds the main article published timestamp" do
+ selector = ".big-article time[datetime='#{timestamp}']"
+ expect(page).to have_selector(selector)
+ end
end
- it "shows correct articles" do
- article.update_column(:score, 15)
- article2.update_column(:score, 15)
- expect(page).to have_selector(".single-article", count: 2)
- expect(page).to have_text(article.title)
- expect(page).to have_text(article2.title)
- expect(page).not_to have_text(bad_article.title)
+ context "when all other articles" do
+ before do
+ article.update_columns(score: 15, published_at: Time.zone.parse(timestamp))
+ article2.update_columns(score: 15, published_at: Time.zone.parse(timestamp))
+ visit "/"
+ end
+
+ it "shows correct articles" do
+ expect(page).to have_selector(".single-article", count: 2)
+ expect(page).to have_text(article.title)
+ expect(page).to have_text(article2.title)
+ expect(page).not_to have_text(bad_article.title)
+ end
+
+ it "shows all articles dates" do
+ expect(page).to have_selector(".single-article time", text: "Mar 4", count: 2)
+ end
+
+ it "embeds all articles published timestamps" do
+ selector = ".single-article time[datetime='#{timestamp}']"
+ expect(page).to have_selector(selector, count: 2)
+ end
end
end
diff --git a/spec/system/user/view_user_index_spec.rb b/spec/system/user/view_user_index_spec.rb
index 666198dd3..51c48d1ef 100644
--- a/spec/system/user/view_user_index_spec.rb
+++ b/spec/system/user/view_user_index_spec.rb
@@ -52,7 +52,7 @@ RSpec.describe "User index", type: :system do
it "embeds comment timestamp" do
within("#substories .index-comments .single-comment") do
ts = comment.decorate.published_timestamp
- timestamp_selector = ".comment-date[data-published-timestamp='#{ts}']"
+ timestamp_selector = ".comment-date time[datetime='#{ts}']"
expect(page).to have_selector(timestamp_selector)
end
end
<%= truncate(strip_tags(comment.processed_html), length: 64).html_safe %>