maverick/docbrown
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Render op markers for coauthors (#11294)

Browse source
This commit is contained in:
Jacob Herrington 2020-11-06 12:01:16 -06:00 • committed by GitHub
parent 47be7ea322
commit 0b8f28e1c8
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 21 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/helpers/comments_helper.rb
View file

@ -16,7 +16,7 @@ module CommentsHelper
[
commentable.user_id,
commentable.co_author_ids,
].any? { |id| id == comment.user_id }
].flatten.any? { |id| id == comment.user_id }
end
def get_ama_or_op_banner(commentable)

1
spec/factories/articles.rb
View file

@ -18,6 +18,7 @@ FactoryBot.define do
with_title { true }
with_collection { nil }
end
co_author_ids { [] }
association :user, factory: :user, strategy: :create
description { Faker::Hipster.paragraph(sentence_count: 1)[0..100] }
main_image { with_main_image ? Faker::Avatar.image : nil }

20
spec/system/user_visits_a_comments_page_spec.rb
View file

@ -2,7 +2,9 @@ require "rails_helper"
RSpec.describe "Views an article", type: :system, js: true do
let(:user) { create(:user) }
let(:article) { create(:article, user: user) }
let(:co_author) { create(:user) }
let(:article) { create(:article, user: user, co_author_ids: [co_author.id]) }
let(:ama_article) { create(:article, user: user, tags: "ama") }
let!(:comment) { create(:comment, commentable: article) }
let!(:child_comment) { create(:comment, parent: comment, commentable: article) }
@ -12,6 +14,22 @@ RSpec.describe "Views an article", type: :system, js: true do
visit "#{article.path}/comments"
expect(page).to have_selector(".single-comment-node", visible: :visible, count: 3)
expect(page).not_to have_selector(".op-marker")
end
it "shows op marker on author and co-author comments" do
create(:comment, user: user, commentable: article)
create(:comment, user: co_author, commentable: article)
visit "#{article.path}/comments"
expect(page).to have_selector(".op-marker", visible: :visible, text: "Author", count: 2)
end
it "shows special op marker on ama articles" do
create(:comment, user: user, commentable: ama_article)
visit "#{ama_article.path}/comments"
expect(page).to have_selector(".op-marker", visible: :visible, text: "Ask Me Anything")
end
it "shows a thread" do