From: Anton Khorev Date: Thu, 23 Jan 2025 15:00:55 +0000 (+0300) Subject: Add user transient attribute to oauth_access_grant factory X-Git-Tag: live~246^2 X-Git-Url: https://git.openstreetmap.org./rails.git/commitdiff_plain/54c2787e87dcd5650c374ee31e07573f41a345ec?ds=inline;hp=--cc Add user transient attribute to oauth_access_grant factory --- 54c2787e87dcd5650c374ee31e07573f41a345ec diff --git a/test/controllers/oauth2_authorized_applications_controller_test.rb b/test/controllers/oauth2_authorized_applications_controller_test.rb index a2bce266d..250634781 100644 --- a/test/controllers/oauth2_authorized_applications_controller_test.rb +++ b/test/controllers/oauth2_authorized_applications_controller_test.rb @@ -17,10 +17,10 @@ class Oauth2AuthorizedApplicationsControllerTest < ActionDispatch::IntegrationTe def test_index user = create(:user) application1 = create(:oauth_application) - create(:oauth_access_grant, :resource_owner_id => user.id, :application => application1) + create(:oauth_access_grant, :user => user, :application => application1) create(:oauth_access_token, :user => user, :application => application1) application2 = create(:oauth_application) - create(:oauth_access_grant, :resource_owner_id => user.id, :application => application2) + create(:oauth_access_grant, :user => user, :application => application2) create(:oauth_access_token, :user => user, :application => application2) create(:oauth_application) @@ -38,9 +38,9 @@ class Oauth2AuthorizedApplicationsControllerTest < ActionDispatch::IntegrationTe def test_index_scopes user = create(:user) application1 = create(:oauth_application, :scopes => %w[read_prefs write_prefs write_diary read_gpx write_gpx]) - create(:oauth_access_grant, :resource_owner_id => user.id, :application => application1, :scopes => %w[read_prefs write_prefs]) + create(:oauth_access_grant, :user => user, :application => application1, :scopes => %w[read_prefs write_prefs]) create(:oauth_access_token, :user => user, :application => application1, :scopes => %w[read_prefs write_prefs]) - create(:oauth_access_grant, :resource_owner_id => user.id, :application => application1, :scopes => %w[read_prefs write_diary]) + create(:oauth_access_grant, :user => user, :application => application1, :scopes => %w[read_prefs write_diary]) create(:oauth_access_token, :user => user, :application => application1, :scopes => %w[read_prefs write_diary]) get oauth_authorized_applications_path @@ -63,10 +63,10 @@ class Oauth2AuthorizedApplicationsControllerTest < ActionDispatch::IntegrationTe def test_destroy user = create(:user) application1 = create(:oauth_application) - create(:oauth_access_grant, :resource_owner_id => user.id, :application => application1) + create(:oauth_access_grant, :user => user, :application => application1) create(:oauth_access_token, :user => user, :application => application1) application2 = create(:oauth_application) - create(:oauth_access_grant, :resource_owner_id => user.id, :application => application2) + create(:oauth_access_grant, :user => user, :application => application2) create(:oauth_access_token, :user => user, :application => application2) create(:oauth_application) diff --git a/test/factories/oauth_access_grant.rb b/test/factories/oauth_access_grant.rb index b9f53890b..2a9366267 100644 --- a/test/factories/oauth_access_grant.rb +++ b/test/factories/oauth_access_grant.rb @@ -1,9 +1,14 @@ FactoryBot.define do factory :oauth_access_grant, :class => "Doorkeeper::AccessGrant" do - resource_owner_id :factory => :user application :factory => :oauth_application + resource_owner_id { user.id } + expires_in { 86400 } redirect_uri { application.redirect_uri } + + transient do + user { create(:user) } # rubocop:disable FactoryBot/FactoryAssociationWithStrategy + end end end