From 3834e1e69b951d5b26768282bf3bd1aae8f45944 Mon Sep 17 00:00:00 2001 From: Matt Jankowski Date: Sat, 15 Apr 2017 21:40:33 -0400 Subject: View spec fix (#1888) * Add option to disable verify partial doubles * Add show_landing_strip? helper method * Use show_landing_strip? helper in accounts and stream entries views * Fix naming in view specs --- spec/views/accounts/show.html.haml_spec.rb | 64 +++++------------------------- 1 file changed, 10 insertions(+), 54 deletions(-) (limited to 'spec/views/accounts') diff --git a/spec/views/accounts/show.html.haml_spec.rb b/spec/views/accounts/show.html.haml_spec.rb index 8265b2f4d..6ddb2c36d 100644 --- a/spec/views/accounts/show.html.haml_spec.rb +++ b/spec/views/accounts/show.html.haml_spec.rb @@ -1,67 +1,23 @@ require 'rails_helper' -$LOAD_PATH << '../lib' -require 'tag_manager' - -describe "stream_entries/show.html.haml" do +describe 'accounts/show.html.haml' do before do - double(:api_oembed_url => '') - double(:account_stream_entry_url => '') + allow(view).to receive(:show_landing_strip?).and_return(true) end - it "has valid author h-card and basic data for a detailed_status" do - alice = Fabricate(:account, username: 'alice', display_name: 'Alice') - bob = Fabricate(:account, username: 'bob', display_name: 'Bob') - status = Fabricate(:status, account: alice, text: 'Hello World') - reply = Fabricate(:status, account: bob, thread: status, text: 'Hello Alice') - - assign(:status, status) - assign(:stream_entry, status.stream_entry) - assign(:account, alice) - assign(:type, status.stream_entry.activity_type.downcase) - - render(:template => 'stream_entries/show.html.haml') - - mf2 = Microformats2.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.format.name.to_s).to eq alice.display_name - expect(mf2.entry.author.format.url.to_s).not_to be_empty - end - - it "has valid h-cites for p-in-reply-to and p-comment" do + it 'has an h-feed with correct number of h-entry objects in it' do alice = Fabricate(:account, username: 'alice', display_name: 'Alice') - bob = Fabricate(:account, username: 'bob', display_name: 'Bob') - carl = Fabricate(:account, username: 'carl', display_name: 'Carl') status = Fabricate(:status, account: alice, text: 'Hello World') - reply = Fabricate(:status, account: bob, thread: status, text: 'Hello Alice') - comment = Fabricate(:status, account: carl, thread: reply, text: 'Hello Bob') + status2 = Fabricate(:status, account: alice, text: 'Hello World Again') + status3 = Fabricate(:status, account: alice, text: 'Are You Still There World?') - assign(:status, reply) - assign(:stream_entry, reply.stream_entry) assign(:account, alice) - assign(:type, reply.stream_entry.activity_type.downcase) - assign(:ancestors, reply.stream_entry.activity.ancestors(bob) ) - assign(:descendants, reply.stream_entry.activity.descendants(bob)) - - render(:template => 'stream_entries/show.html.haml') - - mf2 = Microformats2.parse(rendered) - - expect(mf2.entry.name.to_s).to eq reply.text - expect(mf2.entry.url.to_s).not_to be_empty + assign(:statuses, alice.statuses) + assign(:stream_entry, status.stream_entry) + assign(:type, status.stream_entry.activity_type.downcase) - expect(mf2.entry.comment.format.url.to_s).not_to be_empty - expect(mf2.entry.comment.format.author.format.name.to_s).to eq carl.display_name - expect(mf2.entry.comment.format.author.format.url.to_s).not_to be_empty + render - expect(mf2.entry.in_reply_to.format.url.to_s).not_to be_empty - expect(mf2.entry.in_reply_to.format.author.format.name.to_s).to eq alice.display_name - expect(mf2.entry.in_reply_to.format.author.format.url.to_s).not_to be_empty + expect(Nokogiri::HTML(rendered).search('.h-feed .h-entry').size).to eq 3 end - end - - -- cgit