Fix DynamicAttributeDefinedStatically cop

15 files changed, 26 insertions, 45 deletions

diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
index 77ebfd64b81..b3b58c83269 100644
--- a/.rubocop_todo.yml
+++ b/.rubocop_todo.yml
@@ -10,24 +10,6 @@
 Capybara/CurrentPathExpectation:
   Enabled: false
 
-# Offense count: 23
-FactoryBot/DynamicAttributeDefinedStatically:
-  Exclude:
-    - 'spec/factories/broadcast_messages.rb'
-    - 'spec/factories/ci/builds.rb'
-    - 'spec/factories/ci/runners.rb'
-    - 'spec/factories/clusters/applications/helm.rb'
-    - 'spec/factories/clusters/platforms/kubernetes.rb'
-    - 'spec/factories/emails.rb'
-    - 'spec/factories/gpg_keys.rb'
-    - 'spec/factories/group_members.rb'
-    - 'spec/factories/merge_requests.rb'
-    - 'spec/factories/notes.rb'
-    - 'spec/factories/oauth_access_grants.rb'
-    - 'spec/factories/project_members.rb'
-    - 'spec/factories/todos.rb'
-    - 'spec/factories/uploads.rb'
-
 # Offense count: 167
 # Cop supports --auto-correct.
 Layout/EmptyLinesAroundArguments:
diff --git a/spec/factories/broadcast_messages.rb b/spec/factories/broadcast_messages.rb
index 9a65e7f8a3f..1a2be5e9552 100644
--- a/spec/factories/broadcast_messages.rb
+++ b/spec/factories/broadcast_messages.rb
@@ -1,17 +1,17 @@
 FactoryBot.define do
   factory :broadcast_message do
     message "MyText"
-    starts_at 1.day.ago
-    ends_at 1.day.from_now
+    starts_at { 1.day.ago }
+    ends_at { 1.day.from_now }
 
     trait :expired do
-      starts_at 5.days.ago
-      ends_at 3.days.ago
+      starts_at { 5.days.ago }
+      ends_at { 3.days.ago }
     end
 
     trait :future do
-      starts_at 5.days.from_now
-      ends_at 6.days.from_now
+      starts_at { 5.days.from_now }
+      ends_at { 6.days.from_now }
     end
   end
 end
diff --git a/spec/factories/ci/builds.rb b/spec/factories/ci/builds.rb
index 9813190925b..0baa4ecc4e0 100644
--- a/spec/factories/ci/builds.rb
+++ b/spec/factories/ci/builds.rb
@@ -159,12 +159,12 @@ FactoryBot.define do
     end
 
     trait :erased do
-      erased_at Time.now
+      erased_at { Time.now }
       erased_by factory: :user
     end
 
     trait :queued do
-      queued_at Time.now
+      queued_at { Time.now }
       runner factory: :ci_runner
     end
 
@@ -194,7 +194,7 @@ FactoryBot.define do
     end
 
     trait :expired do
-      artifacts_expire_at 1.minute.ago
+      artifacts_expire_at { 1.minute.ago }
     end
 
     trait :with_commit do
diff --git a/spec/factories/ci/runners.rb b/spec/factories/ci/runners.rb
index 347e4f433e2..f564e7bee47 100644
--- a/spec/factories/ci/runners.rb
+++ b/spec/factories/ci/runners.rb
@@ -9,7 +9,7 @@ FactoryBot.define do
     runner_type :instance_type
 
     trait :online do
-      contacted_at Time.now
+      contacted_at { Time.now }
     end
 
     trait :instance do
diff --git a/spec/factories/clusters/applications/helm.rb b/spec/factories/clusters/applications/helm.rb
index c13b0249d94..d76d6a7334a 100644
--- a/spec/factories/clusters/applications/helm.rb
+++ b/spec/factories/clusters/applications/helm.rb
@@ -29,7 +29,7 @@ FactoryBot.define do
 
     trait :timeouted do
       installing
-      updated_at ClusterWaitForAppInstallationWorker::TIMEOUT.ago
+      updated_at { ClusterWaitForAppInstallationWorker::TIMEOUT.ago }
     end
 
     factory :clusters_applications_ingress, class: Clusters::Applications::Ingress do
diff --git a/spec/factories/clusters/platforms/kubernetes.rb b/spec/factories/clusters/platforms/kubernetes.rb
index 36ac2372204..4a0d1b181ea 100644
--- a/spec/factories/clusters/platforms/kubernetes.rb
+++ b/spec/factories/clusters/platforms/kubernetes.rb
@@ -3,11 +3,10 @@ FactoryBot.define do
     cluster
     namespace nil
     api_url 'https://kubernetes.example.com'
-    token 'a' * 40
+    token { 'a' * 40 }
 
     trait :configured do
       api_url 'https://kubernetes.example.com'
-      token 'a' * 40
       username 'xxxxxx'
       password 'xxxxxx'
 
diff --git a/spec/factories/emails.rb b/spec/factories/emails.rb
index d23ddf9d79b..feacd5ccf15 100644
--- a/spec/factories/emails.rb
+++ b/spec/factories/emails.rb
@@ -3,7 +3,7 @@ FactoryBot.define do
     user
     email { generate(:email_alias) }
 
-    trait(:confirmed) { confirmed_at Time.now }
+    trait(:confirmed) { confirmed_at { Time.now } }
     trait(:skip_validate) { to_create {|instance| instance.save(validate: false) } }
   end
 end
diff --git a/spec/factories/gpg_keys.rb b/spec/factories/gpg_keys.rb
index 51b8ddc9934..3c0f43cc1b6 100644
--- a/spec/factories/gpg_keys.rb
+++ b/spec/factories/gpg_keys.rb
@@ -2,11 +2,11 @@ require_relative '../support/helpers/gpg_helpers'
 
 FactoryBot.define do
   factory :gpg_key do
-    key GpgHelpers::User1.public_key
+    key { GpgHelpers::User1.public_key }
     user
 
     factory :gpg_key_with_subkeys do
-      key GpgHelpers::User1.public_key_with_extra_signing_key
+      key { GpgHelpers::User1.public_key_with_extra_signing_key }
     end
   end
 end
diff --git a/spec/factories/group_members.rb b/spec/factories/group_members.rb
index 47036560b9d..12be63e5d92 100644
--- a/spec/factories/group_members.rb
+++ b/spec/factories/group_members.rb
@@ -9,7 +9,7 @@ FactoryBot.define do
     trait(:developer) { access_level GroupMember::DEVELOPER }
     trait(:maintainer) { access_level GroupMember::MAINTAINER }
     trait(:owner)     { access_level GroupMember::OWNER }
-    trait(:access_request) { requested_at Time.now }
+    trait(:access_request) { requested_at { Time.now } }
 
     trait(:invited) do
       user_id nil
diff --git a/spec/factories/merge_requests.rb b/spec/factories/merge_requests.rb
index b8b089b069b..8094c43b065 100644
--- a/spec/factories/merge_requests.rb
+++ b/spec/factories/merge_requests.rb
@@ -80,7 +80,7 @@ FactoryBot.define do
 
     trait :merge_when_pipeline_succeeds do
       merge_when_pipeline_succeeds true
-      merge_user author
+      merge_user { author }
     end
 
     trait :remove_source_branch do
diff --git a/spec/factories/notes.rb b/spec/factories/notes.rb
index 6844ed8aa4a..2d1f48bf249 100644
--- a/spec/factories/notes.rb
+++ b/spec/factories/notes.rb
@@ -90,7 +90,7 @@ FactoryBot.define do
       noteable nil
       noteable_type 'Commit'
       noteable_id nil
-      commit_id RepoHelpers.sample_commit.id
+      commit_id { RepoHelpers.sample_commit.id }
     end
 
     trait :legacy_diff_note do
diff --git a/spec/factories/oauth_access_grants.rb b/spec/factories/oauth_access_grants.rb
index 9e6af24c4eb..02c51cd9899 100644
--- a/spec/factories/oauth_access_grants.rb
+++ b/spec/factories/oauth_access_grants.rb
@@ -3,7 +3,7 @@ FactoryBot.define do
     resource_owner_id { create(:user).id }
     application
     token { Doorkeeper::OAuth::Helpers::UniqueToken.generate }
-    expires_in 2.hours
+    expires_in { 2.hours }
 
     redirect_uri { application.redirect_uri }
     scopes { application.scopes }
diff --git a/spec/factories/project_members.rb b/spec/factories/project_members.rb
index 22a8085ea45..c72e0487895 100644
--- a/spec/factories/project_members.rb
+++ b/spec/factories/project_members.rb
@@ -8,7 +8,7 @@ FactoryBot.define do
     trait(:reporter)  { access_level ProjectMember::REPORTER }
     trait(:developer) { access_level ProjectMember::DEVELOPER }
     trait(:maintainer) { access_level ProjectMember::MAINTAINER }
-    trait(:access_request) { requested_at Time.now }
+    trait(:access_request) { requested_at { Time.now } }
 
     trait(:invited) do
       user_id nil
diff --git a/spec/factories/todos.rb b/spec/factories/todos.rb
index 14486c80341..ed3d87eb76b 100644
--- a/spec/factories/todos.rb
+++ b/spec/factories/todos.rb
@@ -49,7 +49,7 @@ FactoryBot.define do
     author
     user
     action { Todo::ASSIGNED }
-    commit_id RepoHelpers.sample_commit.id
+    commit_id { RepoHelpers.sample_commit.id }
     target_type "Commit"
   end
 end
diff --git a/spec/factories/uploads.rb b/spec/factories/uploads.rb
index 81c485fba1a..7256f785e1f 100644
--- a/spec/factories/uploads.rb
+++ b/spec/factories/uploads.rb
@@ -1,7 +1,7 @@
 FactoryBot.define do
   factory :upload do
     model { build(:project) }
-    size 100.kilobytes
+    size { 100.kilobytes }
     uploader "AvatarUploader"
     mount_point :avatar
     secret nil
@@ -19,13 +19,13 @@ FactoryBot.define do
       uploader "PersonalFileUploader"
       path { File.join(secret, filename) }
       model { build(:personal_snippet) }
-      secret SecureRandom.hex
+      secret { SecureRandom.hex }
     end
 
     trait :issuable_upload do
       uploader "FileUploader"
       path { File.join(secret, filename) }
-      secret SecureRandom.hex
+      secret { SecureRandom.hex }
     end
 
     trait :with_file do
@@ -43,14 +43,14 @@ FactoryBot.define do
       model { build(:group) }
       path { File.join(secret, filename) }
       uploader "NamespaceFileUploader"
-      secret SecureRandom.hex
+      secret { SecureRandom.hex }
     end
 
     trait :favicon_upload do
       model { build(:appearance) }
       path { File.join(secret, filename) }
       uploader "FaviconUploader"
-      secret SecureRandom.hex
+      secret { SecureRandom.hex }
     end
 
     trait :attachment_upload do