Add user transient attribute to oauth_access_grant factory

diff --git a/test/controllers/oauth2_authorized_applications_controller_test.rb b/test/controllers/oauth2_authorized_applications_controller_test.rb
index a2bce266d2f10491ef275a9a196da21cc66189e5..250634781320aec58b31b88b8d802bf0e3da62ac 100644 (file)
--- 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)
   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_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)
 
     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])
   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_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
     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)
   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_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)
 
     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 b9f53890b9afc7876377c6ed2cfdc53dd89b75a5..2a936626768f503cacdb8a10a044b396c1e3e191 100644 (file)
--- 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
 FactoryBot.define do
   factory :oauth_access_grant, :class => "Doorkeeper::AccessGrant" do

-    resource_owner_id :factory => :user

     application :factory => :oauth_application
 
     application :factory => :oauth_application
 

+    resource_owner_id { user.id }
+

     expires_in { 86400 }
     redirect_uri { application.redirect_uri }
     expires_in { 86400 }
     redirect_uri { application.redirect_uri }

+
+    transient do
+      user { create(:user) } # rubocop:disable FactoryBot/FactoryAssociationWithStrategy
+    end

   end
 end
   end
 end