Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Use before_all block to setup requests/cache_spec data #29437

Merged
merged 1 commit into from Mar 13, 2024
Merged

Use before_all block to setup requests/cache_spec data #29437

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
1 change: 1 addition & 0 deletions spec/rails_helper.rb
View file
Open in desktop
Expand Up @@ -21,6 +21,7 @@
require 'capybara/rspec'
require 'chewy/rspec'
require 'email_spec/rspec'
require 'test_prof/recipes/rspec/before_all'

Dir[Rails.root.join('spec', 'support', '**', '*.rb')].each { |f| require f }

Expand Down
22 changes: 11 additions & 11 deletions spec/requests/cache_spec.rb
View file
Open in desktop
Expand Up @@ -39,7 +39,7 @@ module TestEndpoints
/api/v1/accounts/lookup?acct=alice
/api/v1/statuses/110224538612341312
/api/v1/statuses/110224538612341312/context
/api/v1/polls/12345
/api/v1/polls/123456789
/api/v1/trends/statuses
/api/v1/directory
).freeze
Expand Down Expand Up @@ -166,14 +166,18 @@ module DisabledAnonymousAPI
ActionController::Base.allow_forgery_protection = old
end

let(:alice) { Fabricate(:account, username: 'alice') }
let(:user) { Fabricate(:user, role: UserRole.find_by(name: 'Moderator')) }
let(:alice) { Account.find_by(username: 'alice') }
let(:user) { User.find_by(email: 'user@host.example') }
let(:token) { Doorkeeper::AccessToken.find_by(resource_owner_id: user.id) }

before do
status = Fabricate(:status, account: alice, id: '110224538612341312')
Fabricate(:status, account: alice, id: '110224538643211312', visibility: :private)
before_all do
alice = Fabricate(:account, username: 'alice')
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(: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)
end
Expand Down Expand Up @@ -321,8 +325,6 @@ module DisabledAnonymousAPI
end

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|
describe endpoint do
before do
Expand Down Expand Up @@ -585,8 +587,6 @@ module DisabledAnonymousAPI
end

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|
describe endpoint do
before do
Expand Down