From: Andy Allan Date: Wed, 6 Sep 2023 09:20:23 +0000 (+0100) Subject: Use implicit style for associations with factory overrides X-Git-Tag: live~559^2 X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/cb4f99fef27bfe2269f688fd4d0a3f8ee0149de4 Use implicit style for associations with factory overrides This matches our usage of implicit style for associations generally, e.g. `user`. --- diff --git a/.rubocop.yml b/.rubocop.yml index dc2a33a35..f8060f948 100644 --- a/.rubocop.yml +++ b/.rubocop.yml @@ -17,6 +17,11 @@ AllCops: Rails: Enabled: true +# Config can be removed after https://github.com/rubocop/rubocop-factory_bot/issues/53 +FactoryBot/AssociationStyle: + Include: + - 'test/factories/**/*' + Layout/ExtraSpacing: AllowForAlignment: true diff --git a/test/factories/changeset_comments.rb b/test/factories/changeset_comments.rb index 673a0a9d6..911e7c1b5 100644 --- a/test/factories/changeset_comments.rb +++ b/test/factories/changeset_comments.rb @@ -5,6 +5,6 @@ FactoryBot.define do changeset - association :author, :factory => :user + author :factory => :user end end diff --git a/test/factories/friendships.rb b/test/factories/friendships.rb index 4879373a8..12df2a945 100644 --- a/test/factories/friendships.rb +++ b/test/factories/friendships.rb @@ -1,6 +1,6 @@ FactoryBot.define do factory :friendship do - association :befriender, :factory => :user - association :befriendee, :factory => :user + befriender :factory => :user + befriendee :factory => :user end end diff --git a/test/factories/issues.rb b/test/factories/issues.rb index bb6b2dd52..cc6b4c367 100644 --- a/test/factories/issues.rb +++ b/test/factories/issues.rb @@ -1,8 +1,8 @@ FactoryBot.define do factory :issue do # Default to reporting users - association :reportable, :factory => :user - association :reported_user, :factory => :user + reportable :factory => :user + reported_user :factory => :user # Default to assigning to an administrator assigned_role { "administrator" } diff --git a/test/factories/messages.rb b/test/factories/messages.rb index cd148c789..4f8ee5437 100644 --- a/test/factories/messages.rb +++ b/test/factories/messages.rb @@ -4,8 +4,8 @@ FactoryBot.define do sequence(:body) { |n| "Body text for message #{n}" } sent_on { Time.now.utc } - association :sender, :factory => :user - association :recipient, :factory => :user + sender :factory => :user + recipient :factory => :user trait :unread do message_read { false } diff --git a/test/factories/oauth_access_grant.rb b/test/factories/oauth_access_grant.rb index caddea815..b9f53890b 100644 --- a/test/factories/oauth_access_grant.rb +++ b/test/factories/oauth_access_grant.rb @@ -1,7 +1,7 @@ FactoryBot.define do factory :oauth_access_grant, :class => "Doorkeeper::AccessGrant" do - association :resource_owner_id, :factory => :user - association :application, :factory => :oauth_application + resource_owner_id :factory => :user + application :factory => :oauth_application expires_in { 86400 } redirect_uri { application.redirect_uri } diff --git a/test/factories/oauth_access_token.rb b/test/factories/oauth_access_token.rb index 5b39cb400..3f862fbca 100644 --- a/test/factories/oauth_access_token.rb +++ b/test/factories/oauth_access_token.rb @@ -1,5 +1,5 @@ FactoryBot.define do factory :oauth_access_token, :class => "Doorkeeper::AccessToken" do - association :application, :factory => :oauth_application + application :factory => :oauth_application end end diff --git a/test/factories/oauth_applications.rb b/test/factories/oauth_applications.rb index 1e62d2c97..c865e0237 100644 --- a/test/factories/oauth_applications.rb +++ b/test/factories/oauth_applications.rb @@ -3,6 +3,6 @@ FactoryBot.define do sequence(:name) { |n| "OAuth application #{n}" } sequence(:redirect_uri) { |n| "https://example.com/app/#{n}" } - association :owner, :factory => :user + owner :factory => :user end end diff --git a/test/factories/old_node.rb b/test/factories/old_node.rb index a2ca0a2ee..985093fad 100644 --- a/test/factories/old_node.rb +++ b/test/factories/old_node.rb @@ -4,7 +4,7 @@ FactoryBot.define do longitude { 1 * GeoRecord::SCALE } changeset - association :current_node, :factory => :node + current_node :factory => :node visible { true } timestamp { Time.now.utc } diff --git a/test/factories/old_relation.rb b/test/factories/old_relation.rb index 1bc1b36cf..facf06dc0 100644 --- a/test/factories/old_relation.rb +++ b/test/factories/old_relation.rb @@ -5,6 +5,6 @@ FactoryBot.define do version { 1 } changeset - association :current_relation, :factory => :relation + current_relation :factory => :relation end end diff --git a/test/factories/old_relation_member.rb b/test/factories/old_relation_member.rb index 17495d7ea..99305cd98 100644 --- a/test/factories/old_relation_member.rb +++ b/test/factories/old_relation_member.rb @@ -4,6 +4,6 @@ FactoryBot.define do old_relation # Default to creating nodes, but could be ways or relations as members - association :member, :factory => :node + member :factory => :node end end diff --git a/test/factories/old_way.rb b/test/factories/old_way.rb index 265a477d3..b91bf8bf5 100644 --- a/test/factories/old_way.rb +++ b/test/factories/old_way.rb @@ -5,6 +5,6 @@ FactoryBot.define do version { 1 } changeset - association :current_way, :factory => :way + current_way :factory => :way end end diff --git a/test/factories/relation_member.rb b/test/factories/relation_member.rb index b4498a28d..bba2e7633 100644 --- a/test/factories/relation_member.rb +++ b/test/factories/relation_member.rb @@ -4,6 +4,6 @@ FactoryBot.define do relation # Default to creating nodes, but could be ways or relations as members - association :member, :factory => :node + member :factory => :node end end diff --git a/test/factories/user_blocks.rb b/test/factories/user_blocks.rb index fefbba45a..2f68dc8dc 100644 --- a/test/factories/user_blocks.rb +++ b/test/factories/user_blocks.rb @@ -4,7 +4,7 @@ FactoryBot.define do ends_at { Time.now.utc + 1.day } user - association :creator, :factory => :moderator_user + creator :factory => :moderator_user trait :needs_view do needs_view { true } @@ -15,7 +15,7 @@ FactoryBot.define do end trait :revoked do - association :revoker, :factory => :moderator_user + revoker :factory => :moderator_user end end end diff --git a/test/factories/user_role.rb b/test/factories/user_role.rb index 6523342f7..1916d9b2e 100644 --- a/test/factories/user_role.rb +++ b/test/factories/user_role.rb @@ -1,6 +1,6 @@ FactoryBot.define do factory :user_role do user - association :granter, :factory => :user + granter :factory => :user end end