Use before_all block to setup requests/cache_spec data (#29437)
				
					
				
			This commit is contained in:
		@@ -21,6 +21,7 @@ require 'paperclip/matchers'
 | 
				
			|||||||
require 'capybara/rspec'
 | 
					require 'capybara/rspec'
 | 
				
			||||||
require 'chewy/rspec'
 | 
					require 'chewy/rspec'
 | 
				
			||||||
require 'email_spec/rspec'
 | 
					require 'email_spec/rspec'
 | 
				
			||||||
 | 
					require 'test_prof/recipes/rspec/before_all'
 | 
				
			||||||
 | 
					
 | 
				
			||||||
Dir[Rails.root.join('spec', 'support', '**', '*.rb')].each { |f| require f }
 | 
					Dir[Rails.root.join('spec', 'support', '**', '*.rb')].each { |f| require f }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -39,7 +39,7 @@ module TestEndpoints
 | 
				
			|||||||
    /api/v1/accounts/lookup?acct=alice
 | 
					    /api/v1/accounts/lookup?acct=alice
 | 
				
			||||||
    /api/v1/statuses/110224538612341312
 | 
					    /api/v1/statuses/110224538612341312
 | 
				
			||||||
    /api/v1/statuses/110224538612341312/context
 | 
					    /api/v1/statuses/110224538612341312/context
 | 
				
			||||||
    /api/v1/polls/12345
 | 
					    /api/v1/polls/123456789
 | 
				
			||||||
    /api/v1/trends/statuses
 | 
					    /api/v1/trends/statuses
 | 
				
			||||||
    /api/v1/directory
 | 
					    /api/v1/directory
 | 
				
			||||||
  ).freeze
 | 
					  ).freeze
 | 
				
			||||||
@@ -166,14 +166,18 @@ describe 'Caching behavior' do
 | 
				
			|||||||
    ActionController::Base.allow_forgery_protection = old
 | 
					    ActionController::Base.allow_forgery_protection = old
 | 
				
			||||||
  end
 | 
					  end
 | 
				
			||||||
 | 
					
 | 
				
			||||||
  let(:alice) { Fabricate(:account, username: 'alice') }
 | 
					  let(:alice) { Account.find_by(username: 'alice') }
 | 
				
			||||||
  let(:user)  { Fabricate(:user, role: UserRole.find_by(name: 'Moderator')) }
 | 
					  let(:user) { User.find_by(email: 'user@host.example') }
 | 
				
			||||||
 | 
					  let(:token) { Doorkeeper::AccessToken.find_by(resource_owner_id: user.id) }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
  before do
 | 
					  before_all do
 | 
				
			||||||
    status = Fabricate(:status, account: alice, id: '110224538612341312')
 | 
					    alice = Fabricate(:account, username: 'alice')
 | 
				
			||||||
    Fabricate(:status, account: alice, id: '110224538643211312', visibility: :private)
 | 
					    user = Fabricate(:user, email: 'user@host.example', role: UserRole.find_by(name: 'Moderator'))
 | 
				
			||||||
 | 
					    status = Fabricate(:status, account: alice, id: 110_224_538_612_341_312)
 | 
				
			||||||
 | 
					    Fabricate(:status, account: alice, id: 110_224_538_643_211_312, visibility: :private)
 | 
				
			||||||
    Fabricate(:invite, code: 'abcdef')
 | 
					    Fabricate(:invite, code: 'abcdef')
 | 
				
			||||||
    Fabricate(:poll, status: status, account: alice, id: '12345')
 | 
					    Fabricate(:poll, status: status, account: alice, id: 123_456_789)
 | 
				
			||||||
 | 
					    Fabricate(:accessible_access_token, resource_owner_id: user.id, scopes: 'read')
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    user.account.follow!(alice)
 | 
					    user.account.follow!(alice)
 | 
				
			||||||
  end
 | 
					  end
 | 
				
			||||||
@@ -321,8 +325,6 @@ describe 'Caching behavior' do
 | 
				
			|||||||
  end
 | 
					  end
 | 
				
			||||||
 | 
					
 | 
				
			||||||
  context 'with an auth token' do
 | 
					  context 'with an auth token' do
 | 
				
			||||||
    let!(:token) { Fabricate(:accessible_access_token, resource_owner_id: user.id, scopes: 'read') }
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
    TestEndpoints::ALWAYS_CACHED.each do |endpoint|
 | 
					    TestEndpoints::ALWAYS_CACHED.each do |endpoint|
 | 
				
			||||||
      describe endpoint do
 | 
					      describe endpoint do
 | 
				
			||||||
        before do
 | 
					        before do
 | 
				
			||||||
@@ -585,8 +587,6 @@ describe 'Caching behavior' do
 | 
				
			|||||||
    end
 | 
					    end
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    context 'with an auth token' do
 | 
					    context 'with an auth token' do
 | 
				
			||||||
      let!(:token) { Fabricate(:accessible_access_token, resource_owner_id: user.id, scopes: 'read') }
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
      TestEndpoints::ALWAYS_CACHED.each do |endpoint|
 | 
					      TestEndpoints::ALWAYS_CACHED.each do |endpoint|
 | 
				
			||||||
        describe endpoint do
 | 
					        describe endpoint do
 | 
				
			||||||
          before do
 | 
					          before do
 | 
				
			||||||
 
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user