From 2d032df407d2171334bd7f62d622fb1db1030f88 Mon Sep 17 00:00:00 2001 From: Peter Leitzen Date: Sat, 6 Mar 2021 00:14:29 +0100 Subject: [PATCH 1/2] Fix cop FactoryBot/InlineAssociation offenses for CA group stages --- .rubocop_manual_todo.yml | 1 - ee/spec/factories/analytics/cycle_analytics/group_stages.rb | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/.rubocop_manual_todo.yml b/.rubocop_manual_todo.yml index b6898ebe6066d0..a78e439482aca0 100644 --- a/.rubocop_manual_todo.yml +++ b/.rubocop_manual_todo.yml @@ -44,7 +44,6 @@ Graphql/Descriptions: # WIP See https://gitlab.com/gitlab-org/gitlab/-/issues/267606 FactoryBot/InlineAssociation: Exclude: - - 'ee/spec/factories/analytics/cycle_analytics/group_stages.rb' - 'ee/spec/factories/geo/event_log.rb' - 'ee/spec/factories/merge_request_blocks.rb' - 'ee/spec/factories/vulnerabilities/feedback.rb' diff --git a/ee/spec/factories/analytics/cycle_analytics/group_stages.rb b/ee/spec/factories/analytics/cycle_analytics/group_stages.rb index 640e76c2a673d8..e154874f22f3a5 100644 --- a/ee/spec/factories/analytics/cycle_analytics/group_stages.rb +++ b/ee/spec/factories/analytics/cycle_analytics/group_stages.rb @@ -7,6 +7,6 @@ end_event_identifier { Gitlab::Analytics::CycleAnalytics::StageEvents::MergeRequestMerged.identifier } group - value_stream { FactoryBot.build(:cycle_analytics_group_value_stream, group: group) } + value_stream { association(:cycle_analytics_group_value_stream, group: group) } end end -- GitLab From 49fbb1a4c1bf3585b1311afac4cee04b0bde4516 Mon Sep 17 00:00:00 2001 From: Peter Leitzen Date: Sat, 6 Mar 2021 00:13:21 +0100 Subject: [PATCH 2/2] Unexclude two files for RuboCop FactoryBot/InlineAssociation The offenses has already been fixed. --- .rubocop_manual_todo.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.rubocop_manual_todo.yml b/.rubocop_manual_todo.yml index a78e439482aca0..67dfeebaf7dea0 100644 --- a/.rubocop_manual_todo.yml +++ b/.rubocop_manual_todo.yml @@ -56,8 +56,6 @@ FactoryBot/InlineAssociation: - 'spec/factories/go_modules.rb' - 'spec/factories/group_group_links.rb' - 'spec/factories/import_export_uploads.rb' - - 'spec/factories/uploads.rb' - - 'spec/factories/wiki_pages.rb' # WIP: See https://gitlab.com/gitlab-org/gitlab/-/issues/220040 Rails/SaveBang: -- GitLab