Fix tests
This commit is contained in:
parent
6deb9f966e
commit
6426819b6f
|
@ -9,4 +9,10 @@ class ApplicationController < ActionController::Base
|
|||
Rack::MiniProfiler.authorize_request
|
||||
end
|
||||
end
|
||||
|
||||
protected
|
||||
|
||||
def current_account
|
||||
current_user.try(:account)
|
||||
end
|
||||
end
|
||||
|
|
|
@ -54,6 +54,10 @@ class FanOutOnWriteService < BaseService
|
|||
def current_user
|
||||
@account.user
|
||||
end
|
||||
|
||||
def current_account
|
||||
@account
|
||||
end
|
||||
end
|
||||
|
||||
Rabl::Renderer.new('api/statuses/show', status, view_path: 'app/views', format: :json, scope: rabl_scope.new(receiver)).render
|
||||
|
|
|
@ -7,4 +7,4 @@ node(:avatar) { |account| asset_url(account.avatar.url(:large, false))
|
|||
node(:followers_count) { |account| account.followers.count }
|
||||
node(:following_count) { |account| account.following.count }
|
||||
node(:statuses_count) { |account| account.statuses.count }
|
||||
node(:following) { |account| current_user.account.following?(account) }
|
||||
node(:following) { |account| current_account.following?(account) }
|
||||
|
|
|
@ -6,8 +6,8 @@ node(:content) { |status| content_for_status(status) }
|
|||
node(:url) { |status| url_for_target(status) }
|
||||
node(:reblogs_count) { |status| status.reblogs_count }
|
||||
node(:favourites_count) { |status| status.favourites_count }
|
||||
node(:favourited) { |status| current_user.account.favourited?(status) }
|
||||
node(:reblogged) { |status| current_user.account.reblogged?(status) }
|
||||
node(:favourited) { |status| current_account.favourited?(status) }
|
||||
node(:reblogged) { |status| current_account.reblogged?(status) }
|
||||
|
||||
child :reblog => :reblog do
|
||||
extends('api/statuses/show')
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
default: &default
|
||||
adapter: postgresql
|
||||
pool: 15
|
||||
pool: 17
|
||||
timeout: 5000
|
||||
encoding: unicode
|
||||
|
||||
|
|
|
@ -1,2 +1,4 @@
|
|||
Rails.application.middleware.swap(Rack::Deflater, Rack::MiniProfiler)
|
||||
Rails.application.middleware.swap(Rack::MiniProfiler, Rack::Deflater)
|
||||
unless Rails.env == 'test'
|
||||
Rails.application.middleware.swap(Rack::Deflater, Rack::MiniProfiler)
|
||||
Rails.application.middleware.swap(Rack::MiniProfiler, Rack::Deflater)
|
||||
end
|
||||
|
|
Loading…
Reference in New Issue