From e88c6a5c3c188731f7784141b8835c410163cbeb Mon Sep 17 00:00:00 2001 From: ThibG Date: Wed, 5 Dec 2018 02:12:29 +0100 Subject: Fix thread depth computation in statuses_controller (#9426) * Add test that should currently fail * Fix depth computation (will still fail if statuses have been filtered out) * Fix handling of broken threads --- spec/controllers/statuses_controller_spec.rb | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) (limited to 'spec') diff --git a/spec/controllers/statuses_controller_spec.rb b/spec/controllers/statuses_controller_spec.rb index b4f3c5a08..1bb6636c6 100644 --- a/spec/controllers/statuses_controller_spec.rb +++ b/spec/controllers/statuses_controller_spec.rb @@ -115,14 +115,18 @@ describe StatusesController do end it 'assigns @descendant_threads for threads with :next_status key if they are hitting the depth limit' do - stub_const 'StatusesController::DESCENDANTS_DEPTH_LIMIT', 1 + stub_const 'StatusesController::DESCENDANTS_DEPTH_LIMIT', 2 status = Fabricate(:status) - child = Fabricate(:status, in_reply_to_id: status.id) + child0 = Fabricate(:status, in_reply_to_id: status.id) + child1 = Fabricate(:status, in_reply_to_id: child0.id) + child2 = Fabricate(:status, in_reply_to_id: child0.id) get :show, params: { account_username: status.account.username, id: status.id } - expect(assigns(:descendant_threads)[0][:statuses].pluck(:id)).not_to include child.id - expect(assigns(:descendant_threads)[0][:next_status].id).to eq child.id + expect(assigns(:descendant_threads)[0][:statuses].pluck(:id)).not_to include child1.id + expect(assigns(:descendant_threads)[1][:statuses].pluck(:id)).not_to include child2.id + expect(assigns(:descendant_threads)[0][:next_status].id).to eq child1.id + expect(assigns(:descendant_threads)[1][:next_status].id).to eq child2.id end it 'returns a success' do -- cgit From e2910dff1208fe44564a60acabaf108b413c6be9 Mon Sep 17 00:00:00 2001 From: ysksn Date: Thu, 6 Dec 2018 17:38:49 +0900 Subject: Add spec for Identity.find_for_oauth (#9441) --- spec/models/identity_spec.rb | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) (limited to 'spec') diff --git a/spec/models/identity_spec.rb b/spec/models/identity_spec.rb index 53f355410..689c9b797 100644 --- a/spec/models/identity_spec.rb +++ b/spec/models/identity_spec.rb @@ -1,5 +1,16 @@ require 'rails_helper' RSpec.describe Identity, type: :model do - pending "add some examples to (or delete) #{__FILE__}" + describe '.find_for_oauth' do + let(:auth) { Fabricate(:identity, user: Fabricate(:user)) } + + it 'calls .find_or_create_by' do + expect(described_class).to receive(:find_or_create_by).with(uid: auth.uid, provider: auth.provider) + described_class.find_for_oauth(auth) + end + + it 'returns an instance of Identity' do + expect(described_class.find_for_oauth(auth)).to be_instance_of Identity + end + end end -- cgit From 155cf126807ab25da4d0e5da55b2d598c981e2ab Mon Sep 17 00:00:00 2001 From: ysksn Date: Thu, 6 Dec 2018 17:39:15 +0900 Subject: Remove pending spec (#9442) `#from_account` isn't defined. --- spec/models/notification_spec.rb | 4 ---- 1 file changed, 4 deletions(-) (limited to 'spec') diff --git a/spec/models/notification_spec.rb b/spec/models/notification_spec.rb index 403eb8c33..59c582cde 100644 --- a/spec/models/notification_spec.rb +++ b/spec/models/notification_spec.rb @@ -1,10 +1,6 @@ require 'rails_helper' RSpec.describe Notification, type: :model do - describe '#from_account' do - pending - end - describe '#target_status' do let(:notification) { Fabricate(:notification, activity: activity) } let(:status) { Fabricate(:status) } -- cgit