tarrien/Mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Introduce access token fabricators (#4401)

Browse Source
This commit is contained in:
Akihiko Odaki
2017-07-27 22:16:07 +09:00
committed by Eugen Rochko
parent bb96ba13cf
commit 4f0b638cda
29 changed files with 36 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
spec/controllers/api/v1/accounts/credentials_controller_spec.rb
View File

@@ -4,7 +4,7 @@ describe Api::V1::Accounts::CredentialsController do
render_views
let(:user) { Fabricate(:user, account: Fabricate(:account, username: 'alice')) }
let(:token) { double acceptable?: true, resource_owner_id: user.id }
let(:token) { Fabricate(:accessible_access_token, resource_owner_id: user.id, scopes: 'write') }
before do
allow(controller).to receive(:doorkeeper_token) { token }

2
spec/controllers/api/v1/accounts/follower_accounts_controller_spec.rb
View File

@@ -4,7 +4,7 @@ describe Api::V1::Accounts::FollowerAccountsController do
render_views
let(:user) { Fabricate(:user, account: Fabricate(:account, username: 'alice')) }
let(:token) { double acceptable?: true, resource_owner_id: user.id }
let(:token) { Fabricate(:accessible_access_token, resource_owner_id: user.id, scopes: 'read') }
before do
Fabricate(:follow, target_account: user.account)

2
spec/controllers/api/v1/accounts/following_accounts_controller_spec.rb
View File

@@ -4,7 +4,7 @@ describe Api::V1::Accounts::FollowingAccountsController do
render_views
let(:user) { Fabricate(:user, account: Fabricate(:account, username: 'alice')) }
let(:token) { double acceptable?: true, resource_owner_id: user.id }
let(:token) { Fabricate(:accessible_access_token, resource_owner_id: user.id, scopes: 'read') }
before do
Fabricate(:follow, account: user.account)

2
spec/controllers/api/v1/accounts/relationships_controller_spec.rb
View File

@@ -4,7 +4,7 @@ describe Api::V1::Accounts::RelationshipsController do
render_views
let(:user) { Fabricate(:user, account: Fabricate(:account, username: 'alice')) }
let(:token) { double acceptable?: true, resource_owner_id: user.id }
let(:token) { Fabricate(:accessible_access_token, resource_owner_id: user.id, scopes: 'read') }
before do
allow(controller).to receive(:doorkeeper_token) { token }

2
spec/controllers/api/v1/accounts/search_controller_spec.rb
View File

@@ -4,7 +4,7 @@ RSpec.describe Api::V1::Accounts::SearchController, type: :controller do
render_views
let(:user) { Fabricate(:user, account: Fabricate(:account, username: 'alice')) }
let(:token) { double acceptable?: true, resource_owner_id: user.id }
let(:token) { Fabricate(:accessible_access_token, resource_owner_id: user.id, scopes: 'read') }
before do
allow(controller).to receive(:doorkeeper_token) { token }

2
spec/controllers/api/v1/accounts/statuses_controller_spec.rb
View File

@@ -4,7 +4,7 @@ describe Api::V1::Accounts::StatusesController do
render_views
let(:user) { Fabricate(:user, account: Fabricate(:account, username: 'alice')) }
let(:token) { double acceptable?: true, resource_owner_id: user.id }
let(:token) { Fabricate(:accessible_access_token, resource_owner_id: user.id, scopes: 'read') }
before do
allow(controller).to receive(:doorkeeper_token) { token }

2
spec/controllers/api/v1/accounts_controller_spec.rb
View File

@@ -4,7 +4,7 @@ RSpec.describe Api::V1::AccountsController, type: :controller do
render_views
let(:user) { Fabricate(:user, account: Fabricate(:account, username: 'alice')) }
let(:token) { double acceptable?: true, resource_owner_id: user.id }
let(:token) { Fabricate(:accessible_access_token, resource_owner_id: user.id, scopes: 'follow read') }
before do
allow(controller).to receive(:doorkeeper_token) { token }

2
spec/controllers/api/v1/blocks_controller_spec.rb
View File

@@ -4,7 +4,7 @@ RSpec.describe Api::V1::BlocksController, type: :controller do
render_views
let(:user) { Fabricate(:user, account: Fabricate(:account, username: 'alice')) }
let(:token) { double acceptable?: true, resource_owner_id: user.id }
let(:token) { Fabricate(:accessible_access_token, resource_owner_id: user.id, scopes: 'follow') }
before do
Fabricate(:block, account: user.account)

2
spec/controllers/api/v1/domain_blocks_controller_spec.rb
View File

@@ -4,7 +4,7 @@ RSpec.describe Api::V1::DomainBlocksController, type: :controller do
render_views
let(:user) { Fabricate(:user, account: Fabricate(:account, username: 'alice')) }
let(:token) { double acceptable?: true, resource_owner_id: user.id }
let(:token) { Fabricate(:accessible_access_token, resource_owner_id: user.id, scopes: 'follow') }
before do
user.account.block_domain!('example.com')

2
spec/controllers/api/v1/favourites_controller_spec.rb
View File

@@ -4,7 +4,7 @@ RSpec.describe Api::V1::FavouritesController, type: :controller do
render_views
let(:user) { Fabricate(:user) }
let(:token) { double acceptable?: true, resource_owner_id: user.id }
let(:token) { Fabricate(:accessible_access_token, resource_owner_id: user.id, scopes: 'read') }
before do
Fabricate(:favourite, account: user.account)

2
spec/controllers/api/v1/follow_requests_controller_spec.rb
View File

@@ -4,7 +4,7 @@ RSpec.describe Api::V1::FollowRequestsController, type: :controller do
render_views
let(:user) { Fabricate(:user, account: Fabricate(:account, username: 'alice', locked: true)) }
let(:token) { double acceptable?: true, resource_owner_id: user.id }
let(:token) { Fabricate(:accessible_access_token, resource_owner_id: user.id, scopes: 'follow') }
let(:follower) { Fabricate(:account, username: 'bob') }
before do

2
spec/controllers/api/v1/follows_controller_spec.rb
View File

@@ -4,7 +4,7 @@ RSpec.describe Api::V1::FollowsController, type: :controller do
render_views
let(:user) { Fabricate(:user, account: Fabricate(:account, username: 'alice')) }
let(:token) { double acceptable?: true, resource_owner_id: user.id }
let(:token) { Fabricate(:accessible_access_token, resource_owner_id: user.id, scopes: 'follow') }
before do
allow(controller).to receive(:doorkeeper_token) { token }

2
spec/controllers/api/v1/instances_controller_spec.rb
View File

@@ -6,7 +6,7 @@ RSpec.describe Api::V1::InstancesController, type: :controller do
render_views
let(:user) { Fabricate(:user, account: Fabricate(:account, username: 'alice')) }
let(:token) { double acceptable?: true, resource_owner_id: user.id }
let(:token) { Fabricate(:accessible_access_token, resource_owner_id: user.id) }
before do
allow(controller).to receive(:doorkeeper_token) { token }

2
spec/controllers/api/v1/media_controller_spec.rb
View File

@@ -4,7 +4,7 @@ RSpec.describe Api::V1::MediaController, type: :controller do
render_views
let(:user) { Fabricate(:user, account: Fabricate(:account, username: 'alice')) }
let(:token) { double acceptable?: true, resource_owner_id: user.id }
let(:token) { Fabricate(:accessible_access_token, resource_owner_id: user.id, scopes: 'write') }
before do
allow(controller).to receive(:doorkeeper_token) { token }

2
spec/controllers/api/v1/mutes_controller_spec.rb
View File

@@ -4,7 +4,7 @@ RSpec.describe Api::V1::MutesController, type: :controller do
render_views
let(:user) { Fabricate(:user, account: Fabricate(:account, username: 'alice')) }
let(:token) { double acceptable?: true, resource_owner_id: user.id }
let(:token) { Fabricate(:accessible_access_token, resource_owner_id: user.id, scopes: 'follow') }
before do
Fabricate(:mute, account: user.account)

2
spec/controllers/api/v1/notifications_controller_spec.rb
View File

@@ -4,7 +4,7 @@ RSpec.describe Api::V1::NotificationsController, type: :controller do
render_views
let(:user) { Fabricate(:user, account: Fabricate(:account, username: 'alice')) }
let(:token) { double acceptable?: true, resource_owner_id: user.id }
let(:token) { Fabricate(:accessible_access_token, resource_owner_id: user.id, scopes: 'read') }
let(:other) { Fabricate(:user, account: Fabricate(:account, username: 'bob')) }
before do

2
spec/controllers/api/v1/reports_controller_spec.rb
View File

@@ -6,7 +6,7 @@ RSpec.describe Api::V1::ReportsController, type: :controller do
render_views
let(:user) { Fabricate(:user, account: Fabricate(:account, username: 'alice')) }
let(:token) { double acceptable?: true, resource_owner_id: user.id }
let(:token) { Fabricate(:accessible_access_token, resource_owner_id: user.id, scopes: 'read write') }
before do
allow(controller).to receive(:doorkeeper_token) { token }

2
spec/controllers/api/v1/search_controller_spec.rb
View File

@@ -6,7 +6,7 @@ RSpec.describe Api::V1::SearchController, type: :controller do
render_views
let(:user) { Fabricate(:user, account: Fabricate(:account, username: 'alice')) }
let(:token) { double acceptable?: true, resource_owner_id: user.id }
let(:token) { Fabricate(:accessible_access_token, resource_owner_id: user.id, scopes: 'read') }
before do
allow(controller).to receive(:doorkeeper_token) { token }

2
spec/controllers/api/v1/statuses/favourited_by_accounts_controller_spec.rb
View File

@@ -5,7 +5,7 @@ RSpec.describe Api::V1::Statuses::FavouritedByAccountsController, type: :control
let(:user) { Fabricate(:user, account: Fabricate(:account, username: 'alice')) }
let(:app) { Fabricate(:application, name: 'Test app', website: 'http://testapp.com') }
let(:token) { double acceptable?: true, resource_owner_id: user.id, application: app }
let(:token) { Fabricate(:accessible_access_token, resource_owner_id: user.id, application: app) }
context 'with an oauth token' do
before do

2
spec/controllers/api/v1/statuses/favourites_controller_spec.rb
View File

@@ -7,7 +7,7 @@ describe Api::V1::Statuses::FavouritesController do
let(:user) { Fabricate(:user, account: Fabricate(:account, username: 'alice')) }
let(:app) { Fabricate(:application, name: 'Test app', website: 'http://testapp.com') }
let(:token) { double acceptable?: true, resource_owner_id: user.id, application: app }
let(:token) { Fabricate(:accessible_access_token, resource_owner_id: user.id, scopes: 'write', application: app) }
context 'with an oauth token' do
before do

2
spec/controllers/api/v1/statuses/mutes_controller_spec.rb
View File

@@ -7,7 +7,7 @@ describe Api::V1::Statuses::MutesController do
let(:user) { Fabricate(:user, account: Fabricate(:account, username: 'alice')) }
let(:app) { Fabricate(:application, name: 'Test app', website: 'http://testapp.com') }
let(:token) { double acceptable?: true, resource_owner_id: user.id, application: app }
let(:token) { Fabricate(:accessible_access_token, resource_owner_id: user.id, scopes: 'write', application: app) }
context 'with an oauth token' do
before do

2
spec/controllers/api/v1/statuses/reblogged_by_accounts_controller_spec.rb
View File

@@ -5,7 +5,7 @@ RSpec.describe Api::V1::Statuses::RebloggedByAccountsController, type: :controll
let(:user) { Fabricate(:user, account: Fabricate(:account, username: 'alice')) }
let(:app) { Fabricate(:application, name: 'Test app', website: 'http://testapp.com') }
let(:token) { double acceptable?: true, resource_owner_id: user.id, application: app }
let(:token) { Fabricate(:accessible_access_token, resource_owner_id: user.id, application: app) }
context 'with an oauth token' do
before do

2
spec/controllers/api/v1/statuses/reblogs_controller_spec.rb
View File

@@ -7,7 +7,7 @@ describe Api::V1::Statuses::ReblogsController do
let(:user) { Fabricate(:user, account: Fabricate(:account, username: 'alice')) }
let(:app) { Fabricate(:application, name: 'Test app', website: 'http://testapp.com') }
let(:token) { double acceptable?: true, resource_owner_id: user.id, application: app }
let(:token) { Fabricate(:accessible_access_token, resource_owner_id: user.id, scopes: 'write', application: app) }
context 'with an oauth token' do
before do

2
spec/controllers/api/v1/statuses_controller_spec.rb
View File

@@ -5,7 +5,7 @@ RSpec.describe Api::V1::StatusesController, type: :controller do
let(:user) { Fabricate(:user, account: Fabricate(:account, username: 'alice')) }
let(:app) { Fabricate(:application, name: 'Test app', website: 'http://testapp.com') }
let(:token) { double acceptable?: true, resource_owner_id: user.id, application: app }
let(:token) { Fabricate(:accessible_access_token, resource_owner_id: user.id, application: app, scopes: 'write') }
context 'with an oauth token' do
before do

4
spec/controllers/api/v1/timelines/home_controller_spec.rb
View File

@@ -12,7 +12,7 @@ describe Api::V1::Timelines::HomeController do
end
context 'with a user context' do
let(:token) { double acceptable?: true, resource_owner_id: user.id }
let(:token) { Fabricate(:accessible_access_token, resource_owner_id: user.id, scopes: 'read') }
describe 'GET #show' do
before do
@@ -30,7 +30,7 @@ describe Api::V1::Timelines::HomeController do
end
context 'without a user context' do
let(:token) { double acceptable?: true, resource_owner_id: nil }
let(:token) { Fabricate(:accessible_access_token, resource_owner_id: nil, scopes: 'read') }
describe 'GET #show' do
it 'returns http unprocessable entity' do

4
spec/controllers/api/v1/timelines/public_controller_spec.rb
View File

@@ -12,7 +12,7 @@ describe Api::V1::Timelines::PublicController do
end
context 'with a user context' do
let(:token) { double acceptable?: true, resource_owner_id: user.id }
let(:token) { Fabricate(:accessible_access_token, resource_owner_id: user.id) }
describe 'GET #show' do
before do
@@ -42,7 +42,7 @@ describe Api::V1::Timelines::PublicController do
end
context 'without a user context' do
let(:token) { double acceptable?: true, resource_owner_id: nil }
let(:token) { Fabricate(:accessible_access_token, resource_owner_id: nil) }
describe 'GET #show' do
it 'returns http success' do

4
spec/controllers/api/v1/timelines/tag_controller_spec.rb
View File

@@ -12,7 +12,7 @@ describe Api::V1::Timelines::TagController do
end
context 'with a user context' do
let(:token) { double acceptable?: true, resource_owner_id: user.id }
let(:token) { Fabricate(:accessible_access_token, resource_owner_id: user.id) }
describe 'GET #show' do
before do
@@ -28,7 +28,7 @@ describe Api::V1::Timelines::TagController do
end
context 'without a user context' do
let(:token) { double acceptable?: true, resource_owner_id: nil }
let(:token) { Fabricate(:accessible_access_token, resource_owner_id: nil) }
describe 'GET #show' do
it 'returns http success' do

2
spec/fabricators/access_token_fabricator.rb Normal file
View File

@@ -0,0 +1,2 @@
Fabricator :access_token, from: 'Doorkeeper::AccessToken' do
end

4
spec/fabricators/accessible_access_token_fabricator.rb Normal file
View File

@@ -0,0 +1,4 @@
Fabricator :accessible_access_token, from: :access_token do
expires_in { nil }
revoked_at { nil }
end