commit: 3834e1e69b951d5b26768282bf3bd1aae8f45944
parent: 95bcbaa4340fe54954c2f15300cbc585d4468c8d
Author: Matt Jankowski <mjankowski@thoughtbot.com>
Date: Sat, 15 Apr 2017 21:40:33 -0400
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
Diffstat:
7 files changed, 103 insertions(+), 65 deletions(-)
diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
@@ -4,4 +4,8 @@ module ApplicationHelper
def active_nav_class(path)
current_page?(path) ? 'active' : ''
end
+
+ def show_landing_strip?
+ !user_signed_in? && !single_user_mode?
+ end
end
diff --git a/app/views/accounts/show.html.haml b/app/views/accounts/show.html.haml
@@ -14,7 +14,7 @@
%meta{ property: 'og:image:height', content: '120' }/
%meta{ property: 'twitter:card', content: 'summary' }/
-- if !user_signed_in? && !single_user_mode?
+- if show_landing_strip?
= render partial: 'shared/landing_strip', locals: { account: @account }
.h-feed
diff --git a/app/views/stream_entries/show.html.haml b/app/views/stream_entries/show.html.haml
@@ -20,7 +20,7 @@
%meta{ property: 'twitter:card', content: 'summary' }/
-- if !user_signed_in? && !single_user_mode?
+- if show_landing_strip?
= render partial: 'shared/landing_strip', locals: { account: @stream_entry.account }
.activity-stream.activity-stream-headless.h-entry
diff --git a/spec/helpers/application_helper_spec.rb b/spec/helpers/application_helper_spec.rb
@@ -16,4 +16,33 @@ describe ApplicationHelper do
expect(result).to eq ""
end
end
+
+ describe 'show_landing_strip?', without_verify_partial_doubles: true do
+ describe 'when signed in' do
+ before do
+ allow(helper).to receive(:user_signed_in?).and_return(true)
+ end
+ it 'does not show landing strip' do
+ expect(helper.show_landing_strip?).to eq false
+ end
+ end
+
+ describe 'when signed out' do
+ before do
+ allow(helper).to receive(:user_signed_in?).and_return(false)
+ end
+
+ it 'does not show landing strip on single user instance' do
+ allow(helper).to receive(:single_user_mode?).and_return(true)
+
+ expect(helper.show_landing_strip?).to eq false
+ end
+
+ it 'shows landing strip on multi user instance' do
+ allow(helper).to receive(:single_user_mode?).and_return(false)
+
+ expect(helper.show_landing_strip?).to eq true
+ end
+ end
+ end
end
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
@@ -13,6 +13,12 @@ RSpec.configure do |config|
config.mock_with :rspec do |mocks|
mocks.verify_partial_doubles = true
+
+ config.around(:example, :without_verify_partial_doubles) do |example|
+ mocks.verify_partial_doubles = false
+ example.call
+ mocks.verify_partial_doubles = true
+ end
end
config.before :each do
diff --git 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
-
-
diff --git a/spec/views/stream_entries/show.html.haml_spec.rb b/spec/views/stream_entries/show.html.haml_spec.rb
@@ -1,22 +1,65 @@
require 'rails_helper'
+$LOAD_PATH << '../lib'
+require 'tag_manager'
-describe "accounts/show.html.haml" do
+describe 'stream_entries/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
+
+ mf2 = Microformats2.parse(rendered)
+
+ expect(mf2.entry.name.to_s).to eq status.text
+ expect(mf2.entry.url.to_s).not_to be_empty
- it "has an h-feed with correct number of h-entry objects in it" do
+ 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
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')
- status2 = Fabricate(:status, account: alice, text: 'Hello World Again')
- status3 = Fabricate(:status, account: alice, text: 'Are You Still There World?')
+ reply = Fabricate(:status, account: bob, thread: status, text: 'Hello Alice')
+ comment = Fabricate(:status, account: carl, thread: reply, text: 'Hello Bob')
+ assign(:status, reply)
+ assign(:stream_entry, reply.stream_entry)
assign(:account, alice)
- assign(:statuses, alice.statuses)
+ 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 => 'accounts/show.html.haml')
+ render
- expect(Nokogiri::HTML(rendered).search('.h-feed .h-entry').size).to eq 3
+ mf2 = Microformats2.parse(rendered)
- end
+ expect(mf2.entry.name.to_s).to eq reply.text
+ expect(mf2.entry.url.to_s).not_to be_empty
-end
+ 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
+ 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
+ end
+end
