Merge branch 'rc/use-factory_bot_rails' into 'master'

Replace factory_girl_rails with factory_bot_rails

See merge request gitlab-org/gitlab-ce!15919

Gemfile

@@ -311,7 +311,7 @@ group :development, :test do
   gem 'fuubar', '~> 2.2.0'
 
   gem 'database_cleaner', '~> 1.5.0'
-  gem 'factory_girl_rails', '~> 4.7.0'
+  gem 'factory_bot_rails', '~> 4.8.2'
   gem 'rspec-rails', '~> 3.6.0'
   gem 'rspec-retry', '~> 0.4.5'
   gem 'spinach-rails', '~> 0.2.1'

Gemfile.lock

@@ -195,10 +195,10 @@ GEM
     excon (0.57.1)
     execjs (2.6.0)
     expression_parser (0.9.0)
-    factory_girl (4.7.0)
+    factory_bot (4.8.2)
       activesupport (>= 3.0.0)
-    factory_girl_rails (4.7.0)
-      factory_girl (~> 4.7.0)
+    factory_bot_rails (4.8.2)
+      factory_bot (~> 4.8.2)
       railties (>= 3.0.0)
     faraday (0.12.2)
       multipart-post (>= 1.2, < 3)
@@ -1020,7 +1020,7 @@ DEPENDENCIES
   dropzonejs-rails (~> 0.7.1)
   email_reply_trimmer (~> 0.1)
   email_spec (~> 1.6.0)
-  factory_girl_rails (~> 4.7.0)
+  factory_bot_rails (~> 4.8.2)
   faraday (~> 0.12)
   ffaker (~> 2.4)
   flay (~> 2.8.0)

app/controllers/projects/notes_controller.rb

@@ -11,7 +11,7 @@ class Projects::NotesController < Projects::ApplicationController
   # Controller actions are returned from AbstractController::Base and methods of parent classes are
   #   excluded in order to return only specific controller related methods.
   # That is ok for the app (no :create method in ancestors)
-  #   but fails for tests because there is a :create method on FactoryGirl (one of the ancestors)
+  #   but fails for tests because there is a :create method on FactoryBot (one of the ancestors)
   #
   # see https://github.com/rails/rails/blob/v4.2.7/actionpack/lib/abstract_controller/base.rb#L78
   #

config/application.rb

@@ -163,7 +163,7 @@ module Gitlab
     config.middleware.insert_after ActionDispatch::Flash, 'Gitlab::Middleware::ReadOnly'
 
     config.generators do |g|
-      g.factory_girl false
+      g.factory_bot false
     end
 
     config.after_initialize do

db/fixtures/development/17_cycle_analytics.rb

@@ -140,8 +140,8 @@ class Gitlab::Seeder::CycleAnalytics
         issue.update(milestone: @project.milestones.sample)
       else
         label_name = "#{FFaker::Product.brand}-#{FFaker::Product.brand}-#{rand(1000)}"
-        list_label = FactoryGirl.create(:label, title: label_name, project: issue.project)
-        FactoryGirl.create(:list, board: FactoryGirl.create(:board, project: issue.project), label: list_label)
+        list_label = FactoryBot.create(:label, title: label_name, project: issue.project)
+        FactoryBot.create(:list, board: FactoryBot.create(:board, project: issue.project), label: list_label)
         issue.update(labels: [list_label])
       end
 

doc/development/gotchas.md

@@ -8,7 +8,7 @@ might encounter or should avoid during development of GitLab CE and EE.
 Consider the following factory:
 
 ```ruby
-FactoryGirl.define do
+FactoryBot.define do
   factory :label do
     sequence(:title) { |n| "label#{n}" }
   end
@@ -53,7 +53,7 @@ When run, this spec doesn't do what we might expect:
      (compared using ==)
 ```
 
-That's because FactoryGirl sequences are not reseted for each example.
+That's because FactoryBot sequences are not reseted for each example.
 
 Please remember that sequence-generated values exist only to avoid having to
 explicitly set attributes that have a uniqueness constraint when using a factory.

doc/development/testing_guide/best_practices.md

@@ -8,8 +8,8 @@ and effective _as well as_ fast.
 
 Here are some things to keep in mind regarding test performance:
 
-- `double` and `spy` are faster than `FactoryGirl.build(...)`
-- `FactoryGirl.build(...)` and `.build_stubbed` are faster than `.create`.
+- `double` and `spy` are faster than `FactoryBot.build(...)`
+- `FactoryBot.build(...)` and `.build_stubbed` are faster than `.create`.
 - Don't `create` an object when `build`, `build_stubbed`, `attributes_for`,
   `spy`, or `double` will do. Database persistence is slow!
 - Don't mark a feature as requiring JavaScript (through `@javascript` in
@@ -254,13 +254,13 @@ end
 
 ### Factories
 
-GitLab uses [factory_girl] as a test fixture replacement.
+GitLab uses [factory_bot] as a test fixture replacement.
 
 - Factory definitions live in `spec/factories/`, named using the pluralization
   of their corresponding model (`User` factories are defined in `users.rb`).
 - There should be only one top-level factory definition per file.
-- FactoryGirl methods are mixed in to all RSpec groups. This means you can (and
-  should) call `create(...)` instead of `FactoryGirl.create(...)`.
+- FactoryBot methods are mixed in to all RSpec groups. This means you can (and
+  should) call `create(...)` instead of `FactoryBot.create(...)`.
 - Make use of [traits] to clean up definitions and usages.
 - When defining a factory, don't define attributes that are not required for the
   resulting record to pass validation.
@@ -269,8 +269,8 @@ GitLab uses [factory_girl] as a test fixture replacement.
 - Factories don't have to be limited to `ActiveRecord` objects.
   [See example](https://gitlab.com/gitlab-org/gitlab-ce/commit/0b8cefd3b2385a21cfed779bd659978c0402766d).
 
-[factory_girl]: https://github.com/thoughtbot/factory_girl
-[traits]: http://www.rubydoc.info/gems/factory_girl/file/GETTING_STARTED.md#Traits
+[factory_bot]: https://github.com/thoughtbot/factory_bot
+[traits]: http://www.rubydoc.info/gems/factory_bot/file/GETTING_STARTED.md#Traits
 
 ### Fixtures
 

doc/development/testing_guide/index.md

@@ -33,7 +33,7 @@ changes should be tested.
 
 ## [Testing best practices](best_practices.md)
 
-Everything you should know about how to write good tests: RSpec, FactoryGirl,
+Everything you should know about how to write good tests: RSpec, FactoryBot,
 system tests, parameterized tests etc.
 
 ---

features/support/env.rb

@@ -27,7 +27,7 @@ Spinach.hooks.before_run do
   # web editor and merge
   TestEnv.disable_pre_receive
 
-  include FactoryGirl::Syntax::Methods
+  include FactoryBot::Syntax::Methods
   include GitlabRoutingHelper
 end
 

spec/factories/abuse_reports.rb

-FactoryGirl.define do
+FactoryBot.define do
   factory :abuse_report do
     reporter factory: :user
     user

spec/factories/appearances.rb

-# Read about factories at https://github.com/thoughtbot/factory_girl
+# Read about factories at https://github.com/thoughtbot/factory_bot
 
-FactoryGirl.define do
+FactoryBot.define do
   factory :appearance do
     title       "MepMep"
     description "This is my Community Edition instance"

spec/factories/application_settings.rb

-FactoryGirl.define do
+FactoryBot.define do
   factory :application_setting do
   end
 end

spec/factories/award_emoji.rb

-FactoryGirl.define do
+FactoryBot.define do
   factory :award_emoji do
     name "thumbsup"
     user

spec/factories/boards.rb

-FactoryGirl.define do
+FactoryBot.define do
   factory :board do
     project
 

spec/factories/broadcast_messages.rb

-FactoryGirl.define do
+FactoryBot.define do
   factory :broadcast_message do
     message "MyText"
     starts_at 1.day.ago

spec/factories/chat_names.rb

-FactoryGirl.define do
+FactoryBot.define do
   factory :chat_name, class: ChatName do
     user factory: :user
     service factory: :service

spec/factories/chat_teams.rb

-FactoryGirl.define do
+FactoryBot.define do
   factory :chat_team, class: ChatTeam do
     sequence(:team_id) { |n| "abcdefghijklm#{n}" }
     namespace factory: :group

spec/factories/ci/build_trace_section_names.rb

-FactoryGirl.define do
+FactoryBot.define do
   factory :ci_build_trace_section_name, class: Ci::BuildTraceSectionName do
     sequence(:name) { |n| "section_#{n}" }
     project factory: :project

spec/factories/ci/builds.rb

 include ActionDispatch::TestProcess
 
-FactoryGirl.define do
+FactoryBot.define do
   factory :ci_build, class: Ci::Build do
     name 'test'
     stage 'test'

spec/factories/ci/group_variables.rb

-FactoryGirl.define do
+FactoryBot.define do
   factory :ci_group_variable, class: Ci::GroupVariable do
     sequence(:key) { |n| "VARIABLE_#{n}" }
     value 'VARIABLE_VALUE'

spec/factories/ci/job_artifacts.rb

 include ActionDispatch::TestProcess
 
-FactoryGirl.define do
+FactoryBot.define do
   factory :ci_job_artifact, class: Ci::JobArtifact do
     job factory: :ci_build
     file_type :archive

spec/factories/ci/pipeline_schedule.rb

-FactoryGirl.define do
+FactoryBot.define do
   factory :ci_pipeline_schedule, class: Ci::PipelineSchedule do
     cron '0 1 * * *'
     cron_timezone Gitlab::Ci::CronParser::VALID_SYNTAX_SAMPLE_TIME_ZONE

spec/factories/ci/pipeline_schedule_variables.rb

-FactoryGirl.define do
+FactoryBot.define do
   factory :ci_pipeline_schedule_variable, class: Ci::PipelineScheduleVariable do
     sequence(:key) { |n| "VARIABLE_#{n}" }
     value 'VARIABLE_VALUE'

spec/factories/ci/pipeline_variables.rb

-FactoryGirl.define do
+FactoryBot.define do
   factory :ci_pipeline_variable, class: Ci::PipelineVariable do
     sequence(:key) { |n| "VARIABLE_#{n}" }
     value 'VARIABLE_VALUE'

spec/factories/ci/pipelines.rb

-FactoryGirl.define do
+FactoryBot.define do
   factory :ci_empty_pipeline, class: Ci::Pipeline do
     source :push
     ref 'master'

spec/factories/ci/runner_projects.rb

-FactoryGirl.define do
+FactoryBot.define do
   factory :ci_runner_project, class: Ci::RunnerProject do
     runner factory: :ci_runner
     project

spec/factories/ci/runners.rb

-FactoryGirl.define do
+FactoryBot.define do
   factory :ci_runner, class: Ci::Runner do
     sequence(:description) { |n| "My runner#{n}" }
 

spec/factories/ci/stages.rb

-FactoryGirl.define do
+FactoryBot.define do
   factory :ci_stage, class: Ci::LegacyStage do
     skip_create
 

spec/factories/ci/trigger_requests.rb

-FactoryGirl.define do
+FactoryBot.define do
   factory :ci_trigger_request, class: Ci::TriggerRequest do
     trigger factory: :ci_trigger
   end

spec/factories/ci/triggers.rb

-FactoryGirl.define do
+FactoryBot.define do
   factory :ci_trigger_without_token, class: Ci::Trigger do
     owner
 

spec/factories/ci/variables.rb

-FactoryGirl.define do
+FactoryBot.define do
   factory :ci_variable, class: Ci::Variable do
     sequence(:key) { |n| "VARIABLE_#{n}" }
     value 'VARIABLE_VALUE'

spec/factories/clusters/applications/helm.rb

-FactoryGirl.define do
+FactoryBot.define do
   factory :cluster_applications_helm, class: Clusters::Applications::Helm do
     cluster factory: %i(cluster provided_by_gcp)
 

spec/factories/clusters/applications/ingress.rb

-FactoryGirl.define do
+FactoryBot.define do
   factory :cluster_applications_ingress, class: Clusters::Applications::Ingress do
     cluster factory: %i(cluster provided_by_gcp)
 

spec/factories/clusters/clusters.rb

-FactoryGirl.define do
+FactoryBot.define do
   factory :cluster, class: Clusters::Cluster do
     user
     name 'test-cluster'

spec/factories/clusters/platforms/kubernetes.rb

-FactoryGirl.define do
+FactoryBot.define do
   factory :cluster_platform_kubernetes, class: Clusters::Platforms::Kubernetes do
     cluster
     namespace nil

spec/factories/clusters/providers/gcp.rb

-FactoryGirl.define do
+FactoryBot.define do
   factory :cluster_provider_gcp, class: Clusters::Providers::Gcp do
     cluster
     gcp_project_id 'test-gcp-project'

spec/factories/commit_statuses.rb

-FactoryGirl.define do
+FactoryBot.define do
   factory :commit_status, class: CommitStatus do
     name 'default'
     stage 'test'

spec/factories/commits.rb

 require_relative '../support/repo_helpers'
 
-FactoryGirl.define do
+FactoryBot.define do
   factory :commit do
     transient do
       author nil

spec/factories/container_repositories.rb

-FactoryGirl.define do
+FactoryBot.define do
   factory :container_repository do
     name 'test_container_image'
     project

spec/factories/conversational_development_index_metrics.rb

-FactoryGirl.define do
+FactoryBot.define do
   factory :conversational_development_index_metric, class: ConversationalDevelopmentIndex::Metric do
     leader_issues 9.256
     instance_issues 1.234

spec/factories/deploy_keys_projects.rb

-FactoryGirl.define do
+FactoryBot.define do
   factory :deploy_keys_project do
     deploy_key
     project

spec/factories/deployments.rb

-FactoryGirl.define do
+FactoryBot.define do
   factory :deployment, class: Deployment do
     sha '97de212e80737a608d939f648d959671fb0a0142'
     ref 'master'

spec/factories/emails.rb

-FactoryGirl.define do
+FactoryBot.define do
   factory :email do
     user
     email { generate(:email_alias) }

spec/factories/environments.rb

-FactoryGirl.define do
+FactoryBot.define do
   factory :environment, class: Environment do
     sequence(:name) { |n| "environment#{n}" }
 

spec/factories/events.rb

-FactoryGirl.define do
+FactoryBot.define do
   factory :event do
     project
     author factory: :user

spec/factories/file_uploaders.rb

-FactoryGirl.define do
+FactoryBot.define do
   factory :file_uploader do
     skip_create
 

spec/factories/fork_network_members.rb

-FactoryGirl.define do
+FactoryBot.define do
   factory :fork_network_member do
     association :project
     association :fork_network

spec/factories/fork_networks.rb

-FactoryGirl.define do
+FactoryBot.define do
   factory :fork_network do
     association :root_project, factory: :project
   end

spec/factories/forked_project_links.rb

-FactoryGirl.define do
+FactoryBot.define do
   factory :forked_project_link do
     association :forked_to_project, factory: [:project, :repository]
     association :forked_from_project, factory: [:project, :repository]

spec/factories/gitaly/commit.rb

-FactoryGirl.define do
+FactoryBot.define do
   sequence(:gitaly_commit_id) { Digest::SHA1.hexdigest(Time.now.to_f.to_s) }
 
   factory :gitaly_commit, class: Gitaly::GitCommit do

spec/factories/gitaly/commit_author.rb

-FactoryGirl.define do
+FactoryBot.define do
   factory :gitaly_commit_author, class: Gitaly::CommitAuthor do
     skip_create
 

spec/factories/gpg_key_subkeys.rb

 require_relative '../support/gpg_helpers'
 
-FactoryGirl.define do
+FactoryBot.define do
   factory :gpg_key_subkey do
     gpg_key
 

spec/factories/gpg_keys.rb

 require_relative '../support/gpg_helpers'
 
-FactoryGirl.define do
+FactoryBot.define do
   factory :gpg_key do
     key GpgHelpers::User1.public_key
     user

spec/factories/gpg_signature.rb

 require_relative '../support/gpg_helpers'
 
-FactoryGirl.define do
+FactoryBot.define do
   factory :gpg_signature do
     commit_sha { Digest::SHA1.hexdigest(SecureRandom.hex) }
     project

spec/factories/group_custom_attributes.rb

-FactoryGirl.define do
+FactoryBot.define do
   factory :group_custom_attribute do
     group
     sequence(:key) { |n| "key#{n}" }

spec/factories/group_members.rb

-FactoryGirl.define do
+FactoryBot.define do
   factory :group_member do
     access_level { GroupMember::OWNER }
     group

spec/factories/groups.rb

-FactoryGirl.define do
+FactoryBot.define do
   factory :group, class: Group, parent: :namespace do
     sequence(:name) { |n| "group#{n}" }
     path { name.downcase.gsub(/\s/, '_') }

spec/factories/identities.rb

-FactoryGirl.define do
+FactoryBot.define do
   factory :identity do
     provider 'ldapmain'
     extern_uid 'my-ldap-id'

spec/factories/instance_configuration.rb

-FactoryGirl.define do
+FactoryBot.define do
   factory :instance_configuration do
     skip_create
   end

spec/factories/issues.rb

-FactoryGirl.define do
+FactoryBot.define do
   factory :issue do
     title { generate(:title) }
     author

spec/factories/keys.rb

 require_relative '../support/helpers/key_generator_helper'
 
-FactoryGirl.define do
+FactoryBot.define do
   factory :key do
     title
     key { Spec::Support::Helpers::KeyGeneratorHelper.new(1024).generate + ' dummy@gitlab.com' }

spec/factories/label_links.rb

-FactoryGirl.define do
+FactoryBot.define do
   factory :label_link do
     label
     target factory: :issue

spec/factories/label_priorities.rb

-FactoryGirl.define do
+FactoryBot.define do
   factory :label_priority do
     project
     label

spec/factories/labels.rb

-FactoryGirl.define do
+FactoryBot.define do
   trait :base_label do
     title { generate(:label_title) }
     color "#990000"

spec/factories/lfs_objects.rb

 include ActionDispatch::TestProcess
 
-FactoryGirl.define do
+FactoryBot.define do
   factory :lfs_object do
     sequence(:oid) { |n| "b68143e6463773b1b6c6fd009a76c32aeec041faff32ba2ed42fd7f708a%05x" % n }
     size 499013

spec/factories/lfs_objects_projects.rb

-FactoryGirl.define do
+FactoryBot.define do
   factory :lfs_objects_project do
     lfs_object
     project

spec/factories/lists.rb

-FactoryGirl.define do
+FactoryBot.define do
   factory :list do
     board
     label

spec/factories/merge_requests.rb

-FactoryGirl.define do
+FactoryBot.define do
   factory :merge_request do
     title { generate(:title) }
     author

spec/factories/merge_requests_closing_issues.rb

-FactoryGirl.define do
+FactoryBot.define do
   factory :merge_requests_closing_issues do
     issue
     merge_request

spec/factories/milestones.rb

-FactoryGirl.define do
+FactoryBot.define do
   factory :milestone do
     title
 

spec/factories/namespaces.rb

-FactoryGirl.define do
+FactoryBot.define do
   factory :namespace do
     sequence(:name) { |n| "namespace#{n}" }
     path { name.downcase.gsub(/\s/, '_') }

spec/factories/notes.rb

@@ -2,7 +2,7 @@ require_relative '../support/repo_helpers'
 
 include ActionDispatch::TestProcess
 
-FactoryGirl.define do
+FactoryBot.define do
   factory :note do
     project
     note { generate(:title) }

spec/factories/notification_settings.rb

-FactoryGirl.define do
+FactoryBot.define do
   factory :notification_setting do
     source factory: :project
     user

spec/factories/oauth_access_grants.rb

-FactoryGirl.define do
+FactoryBot.define do
   factory :oauth_access_grant do
     resource_owner_id { create(:user).id }
     application

spec/factories/oauth_access_tokens.rb

-FactoryGirl.define do
+FactoryBot.define do
   factory :oauth_access_token do
     resource_owner
     application

spec/factories/oauth_applications.rb

-FactoryGirl.define do
+FactoryBot.define do
   factory :oauth_application, class: 'Doorkeeper::Application', aliases: [:application] do
     sequence(:name) { |n| "OAuth App #{n}" }
     uid { Doorkeeper::OAuth::Helpers::UniqueToken.generate }

spec/factories/pages_domains.rb

-FactoryGirl.define do
+FactoryBot.define do
   factory :pages_domain, class: 'PagesDomain' do
     domain 'my.domain.com'
 

spec/factories/personal_access_tokens.rb

-FactoryGirl.define do
+FactoryBot.define do
   factory :personal_access_token do
     user
     token { SecureRandom.hex(50) }

spec/factories/project_auto_devops.rb

-FactoryGirl.define do
+FactoryBot.define do
   factory :project_auto_devops do
     project
     enabled true

spec/factories/project_custom_attributes.rb

-FactoryGirl.define do
+FactoryBot.define do
   factory :project_custom_attribute do
     project
     sequence(:key) { |n| "key#{n}" }

spec/factories/project_group_links.rb

-FactoryGirl.define do
+FactoryBot.define do
   factory :project_group_link do
     project
     group

spec/factories/project_hooks.rb

-FactoryGirl.define do
+FactoryBot.define do
   factory :project_hook do
     url { generate(:url) }
     enable_ssl_verification false

spec/factories/project_members.rb

-FactoryGirl.define do
+FactoryBot.define do
   factory :project_member do
     user
     project

spec/factories/project_statistics.rb

-FactoryGirl.define do
+FactoryBot.define do
   factory :project_statistics do
     project
 

spec/factories/project_wikis.rb

-FactoryGirl.define do
+FactoryBot.define do
   factory :project_wiki do
     skip_create
 

spec/factories/projects.rb

 require_relative '../support/test_env'
 
-FactoryGirl.define do
+FactoryBot.define do
   # Project without repository
   #
   # Project does not have bare repository.

spec/factories/protected_branches.rb

-FactoryGirl.define do
+FactoryBot.define do
   factory :protected_branch do
     name
     project

spec/factories/protected_tags.rb

-FactoryGirl.define do
+FactoryBot.define do
   factory :protected_tag do
     name
     project

spec/factories/releases.rb

-FactoryGirl.define do
+FactoryBot.define do
   factory :release do
     tag "v1.1.0"
     description "Awesome release"

spec/factories/sent_notifications.rb

-FactoryGirl.define do
+FactoryBot.define do
   factory :sent_notification do
     project
     recipient factory: :user

spec/factories/sequences.rb

-FactoryGirl.define do
+FactoryBot.define do
   sequence(:username) { |n| "user#{n}" }
   sequence(:name) { |n| "John Doe#{n}" }
   sequence(:email) { |n| "user#{n}@example.org" }

spec/factories/service_hooks.rb

-FactoryGirl.define do
+FactoryBot.define do
   factory :service_hook do
     url { generate(:url) }
     service

spec/factories/services.rb

-FactoryGirl.define do
+FactoryBot.define do
   factory :service do
     project
     type 'Service'

spec/factories/snippets.rb

-FactoryGirl.define do
+FactoryBot.define do
   factory :snippet do
     author
     title { generate(:title) }

spec/factories/spam_logs.rb

-FactoryGirl.define do
+FactoryBot.define do
   factory :spam_log do
     user
     sequence(:source_ip) { |n| "42.42.42.#{n % 255}" }

spec/factories/subscriptions.rb

-FactoryGirl.define do
+FactoryBot.define do
   factory :subscription do
     user
     project

spec/factories/system_hooks.rb

-FactoryGirl.define do
+FactoryBot.define do
   factory :system_hook do
     url { generate(:url) }
   end

spec/factories/system_note_metadata.rb

-FactoryGirl.define do
+FactoryBot.define do
   factory :system_note_metadata do
     note
     action 'merge'

spec/factories/timelogs.rb

-# Read about factories at https://github.com/thoughtbot/factory_girl
+# Read about factories at https://github.com/thoughtbot/factory_bot
 
-FactoryGirl.define do
+FactoryBot.define do
   factory :timelog do
     time_spent 3600
     user

spec/factories/todos.rb

-FactoryGirl.define do
+FactoryBot.define do
   factory :todo do
     project
     author

spec/factories/trending_project.rb

-FactoryGirl.define do
+FactoryBot.define do
   # TrendingProject
   factory :trending_project, class: 'TrendingProject' do
     project

spec/factories/u2f_registrations.rb

-FactoryGirl.define do
+FactoryBot.define do
   factory :u2f_registration do
     certificate { FFaker::BaconIpsum.characters(728) }
     key_handle { FFaker::BaconIpsum.characters(86) }

spec/factories/uploads.rb

-FactoryGirl.define do
+FactoryBot.define do
   factory :upload do
     model { build(:project) }
     path { "uploads/-/system/project/avatar/avatar.jpg" }

spec/factories/user_agent_details.rb

-FactoryGirl.define do
+FactoryBot.define do
   factory :user_agent_detail do
     ip_address '127.0.0.1'
     user_agent 'AppleWebKit/537.36'

spec/factories/user_custom_attributes.rb

-FactoryGirl.define do
+FactoryBot.define do
   factory :user_custom_attribute do
     user
     sequence(:key) { |n| "key#{n}" }

spec/factories/users.rb

-FactoryGirl.define do
+FactoryBot.define do
   factory :user, aliases: [:author, :assignee, :recipient, :owner, :resource_owner] do
     email { generate(:email) }
     name { generate(:name) }

spec/factories/web_hook_log.rb

-FactoryGirl.define do
+FactoryBot.define do
   factory :web_hook_log do
     web_hook factory: :project_hook
     trigger 'push_hooks'

spec/factories/wiki_directories.rb

-FactoryGirl.define do
+FactoryBot.define do
   factory :wiki_directory do
     skip_create
 

spec/factories/wiki_pages.rb

 require 'ostruct'
 
-FactoryGirl.define do
+FactoryBot.define do
   factory :wiki_page do
     transient do
       attrs do

spec/factories_spec.rb

 require 'spec_helper'
 
 describe 'factories' do
-  FactoryGirl.factories.each do |factory|
+  FactoryBot.factories.each do |factory|
     describe "#{factory.name} factory" do
       it 'does not raise error when built' do
         expect { build(factory.name) }.not_to raise_error

spec/features/admin/admin_runners_spec.rb

@@ -13,8 +13,8 @@ describe "Admin Runners" do
 
     context "when there are runners" do
       before do
-        runner = FactoryGirl.create(:ci_runner, contacted_at: Time.now)
-        FactoryGirl.create(:ci_build, pipeline: pipeline, runner_id: runner.id)
+        runner = FactoryBot.create(:ci_runner, contacted_at: Time.now)
+        FactoryBot.create(:ci_build, pipeline: pipeline, runner_id: runner.id)
         visit admin_runners_path
       end
 
@@ -25,8 +25,8 @@ describe "Admin Runners" do
 
       describe 'search' do
         before do
-          FactoryGirl.create :ci_runner, description: 'runner-foo'
-          FactoryGirl.create :ci_runner, description: 'runner-bar'
+          FactoryBot.create :ci_runner, description: 'runner-foo'
+          FactoryBot.create :ci_runner, description: 'runner-bar'
         end
 
         it 'shows correct runner when description matches' do
@@ -62,11 +62,11 @@ describe "Admin Runners" do
   end
 
   describe "Runner show page" do
-    let(:runner) { FactoryGirl.create :ci_runner }
+    let(:runner) { FactoryBot.create :ci_runner }
 
     before do
-      @project1 = FactoryGirl.create(:project)
-      @project2 = FactoryGirl.create(:project)
+      @project1 = FactoryBot.create(:project)
+      @project2 = FactoryBot.create(:project)
       visit admin_runner_path(runner)
     end
 

spec/helpers/runners_helper_spec.rb

@@ -2,17 +2,17 @@ require 'spec_helper'
 
 describe RunnersHelper do
   it "returns - not contacted yet" do
-    runner = FactoryGirl.build :ci_runner
+    runner = FactoryBot.build :ci_runner
     expect(runner_status_icon(runner)).to include("not connected yet")
   end
 
   it "returns offline text" do
-    runner = FactoryGirl.build(:ci_runner, contacted_at: 1.day.ago, active: true)
+    runner = FactoryBot.build(:ci_runner, contacted_at: 1.day.ago, active: true)
     expect(runner_status_icon(runner)).to include("Runner is offline")
   end
 
   it "returns online text" do
-    runner = FactoryGirl.build(:ci_runner, contacted_at: 1.second.ago, active: true)
+    runner = FactoryBot.build(:ci_runner, contacted_at: 1.second.ago, active: true)
     expect(runner_status_icon(runner)).to include("Runner is online")
   end
 end

spec/lib/gitlab/background_migration/migrate_events_to_push_event_payloads_spec.rb

@@ -228,7 +228,7 @@ describe Gitlab::BackgroundMigration::MigrateEventsToPushEventPayloads, :migrati
   let(:projects) { table(:projects) }
   let(:project) { projects.create(namespace_id: namespace.id, creator_id: author.id) }
 
-  # We can not rely on FactoryGirl as the state of Event may change in ways that
+  # We can not rely on FactoryBot as the state of Event may change in ways that
   # the background migration does not expect, hence we use the Event class of
   # the migration itself.
   def create_push_event(project, author, data = nil)

spec/models/ci/pipeline_spec.rb

@@ -116,7 +116,7 @@ describe Ci::Pipeline, :mailer do
     end
 
     it "calculates average when there is one build without coverage" do
-      FactoryGirl.create(:ci_build, pipeline: pipeline)
+      FactoryBot.create(:ci_build, pipeline: pipeline)
       expect(pipeline.coverage).to be_nil
     end
   end
@@ -435,7 +435,7 @@ describe Ci::Pipeline, :mailer do
 
     describe 'merge request metrics' do
       let(:project) { create(:project, :repository) }
-      let(:pipeline) { FactoryGirl.create(:ci_empty_pipeline, status: 'created', project: project, ref: 'master', sha: project.repository.commit('master').id) }
+      let(:pipeline) { FactoryBot.create(:ci_empty_pipeline, status: 'created', project: project, ref: 'master', sha: project.repository.commit('master').id) }
       let!(:merge_request) { create(:merge_request, source_project: project, source_branch: pipeline.ref) }
 
       before do

spec/models/ci/runner_spec.rb

@@ -51,24 +51,24 @@ describe Ci::Runner do
 
   describe '#display_name' do
     it 'returns the description if it has a value' do
-      runner = FactoryGirl.build(:ci_runner, description: 'Linux/Ruby-1.9.3-p448')
+      runner = FactoryBot.build(:ci_runner, description: 'Linux/Ruby-1.9.3-p448')
       expect(runner.display_name).to eq 'Linux/Ruby-1.9.3-p448'
     end
 
     it 'returns the token if it does not have a description' do
-      runner = FactoryGirl.create(:ci_runner)
+      runner = FactoryBot.create(:ci_runner)
       expect(runner.display_name).to eq runner.description
     end
 
     it 'returns the token if the description is an empty string' do
-      runner = FactoryGirl.build(:ci_runner, description: '', token: 'token')
+      runner = FactoryBot.build(:ci_runner, description: '', token: 'token')
       expect(runner.display_name).to eq runner.token
     end
   end
 
   describe '#assign_to' do
-    let!(:project) { FactoryGirl.create :project }
-    let!(:shared_runner) { FactoryGirl.create(:ci_runner, :shared) }
+    let!(:project) { FactoryBot.create :project }
+    let!(:shared_runner) { FactoryBot.create(:ci_runner, :shared) }
 
     before do
       shared_runner.assign_to(project)
@@ -83,15 +83,15 @@ describe Ci::Runner do
     subject { described_class.online }
 
     before do
-      @runner1 = FactoryGirl.create(:ci_runner, :shared, contacted_at: 1.year.ago)
-      @runner2 = FactoryGirl.create(:ci_runner, :shared, contacted_at: 1.second.ago)
+      @runner1 = FactoryBot.create(:ci_runner, :shared, contacted_at: 1.year.ago)
+      @runner2 = FactoryBot.create(:ci_runner, :shared, contacted_at: 1.second.ago)
     end
 
     it { is_expected.to eq([@runner2])}
   end
 
   describe '#online?' do
-    let(:runner) { FactoryGirl.create(:ci_runner, :shared) }
+    let(:runner) { FactoryBot.create(:ci_runner, :shared) }
 
     subject { runner.online? }
 
@@ -268,7 +268,7 @@ describe Ci::Runner do
   end
 
   describe '#status' do
-    let(:runner) { FactoryGirl.create(:ci_runner, :shared, contacted_at: 1.second.ago) }
+    let(:runner) { FactoryBot.create(:ci_runner, :shared, contacted_at: 1.second.ago) }
 
     subject { runner.status }
 
@@ -442,9 +442,9 @@ describe Ci::Runner do
 
   describe "belongs_to_one_project?" do
     it "returns false if there are two projects runner assigned to" do
-      runner = FactoryGirl.create(:ci_runner)
-      project = FactoryGirl.create(:project)
-      project1 = FactoryGirl.create(:project)
+      runner = FactoryBot.create(:ci_runner)
+      project = FactoryBot.create(:project)
+      project1 = FactoryBot.create(:project)
       project.runners << runner
       project1.runners << runner
 
@@ -452,8 +452,8 @@ describe Ci::Runner do
     end
 
     it "returns true" do
-      runner = FactoryGirl.create(:ci_runner)
-      project = FactoryGirl.create(:project)
+      runner = FactoryBot.create(:ci_runner)
+      project = FactoryBot.create(:project)
       project.runners << runner
 
       expect(runner.belongs_to_one_project?).to be_truthy

spec/models/deployment_spec.rb

@@ -126,7 +126,7 @@ describe Deployment do
     subject { deployment.stop_action }
 
     context 'when no other actions' do
-      let(:deployment) { FactoryGirl.build(:deployment, deployable: build) }
+      let(:deployment) { FactoryBot.build(:deployment, deployable: build) }
 
       it { is_expected.to be_nil }
     end
@@ -135,13 +135,13 @@ describe Deployment do
       let!(:close_action) { create(:ci_build, :manual, pipeline: build.pipeline, name: 'close_app') }
 
       context 'when matching action is defined' do
-        let(:deployment) { FactoryGirl.build(:deployment, deployable: build, on_stop: 'close_other_app') }
+        let(:deployment) { FactoryBot.build(:deployment, deployable: build, on_stop: 'close_other_app') }
 
         it { is_expected.to be_nil }
       end
 
       context 'when no matching action is defined' do
-        let(:deployment) { FactoryGirl.build(:deployment, deployable: build, on_stop: 'close_app') }
+        let(:deployment) { FactoryBot.build(:deployment, deployable: build, on_stop: 'close_app') }
 
         it { is_expected.to eq(close_action) }
       end
@@ -159,7 +159,7 @@ describe Deployment do
 
     context 'when matching action is defined' do
       let(:build) { create(:ci_build) }
-      let(:deployment) { FactoryGirl.build(:deployment, deployable: build, on_stop: 'close_app') }
+      let(:deployment) { FactoryBot.build(:deployment, deployable: build, on_stop: 'close_app') }
       let!(:close_action) { create(:ci_build, :manual, pipeline: build.pipeline, name: 'close_app') }
 
       it { is_expected.to be_truthy }

spec/models/project_spec.rb

@@ -289,12 +289,12 @@ describe Project do
 
   describe 'project token' do
     it 'sets an random token if none provided' do
-      project = FactoryGirl.create :project, runners_token: ''
+      project = FactoryBot.create :project, runners_token: ''
       expect(project.runners_token).not_to eq('')
     end
 
     it 'does not set an random token if one provided' do
-      project = FactoryGirl.create :project, runners_token: 'my-token'
+      project = FactoryBot.create :project, runners_token: 'my-token'
       expect(project.runners_token).to eq('my-token')
     end
   end

spec/services/ci/register_job_service_spec.rb

@@ -2,11 +2,11 @@ require 'spec_helper'
 
 module Ci
   describe RegisterJobService do
-    let!(:project) { FactoryGirl.create :project, shared_runners_enabled: false }
-    let!(:pipeline) { FactoryGirl.create :ci_pipeline, project: project }
-    let!(:pending_job) { FactoryGirl.create :ci_build, pipeline: pipeline }
-    let!(:shared_runner) { FactoryGirl.create(:ci_runner, is_shared: true) }
-    let!(:specific_runner) { FactoryGirl.create(:ci_runner, is_shared: false) }
+    let!(:project) { FactoryBot.create :project, shared_runners_enabled: false }
+    let!(:pipeline) { FactoryBot.create :ci_pipeline, project: project }
+    let!(:pending_job) { FactoryBot.create :ci_build, pipeline: pipeline }
+    let!(:shared_runner) { FactoryBot.create(:ci_runner, is_shared: true) }
+    let!(:specific_runner) { FactoryBot.create(:ci_runner, is_shared: false) }
 
     before do
       specific_runner.assign_to(project)
@@ -74,11 +74,11 @@ module Ci
           let!(:project3) { create :project, shared_runners_enabled: true }
           let!(:pipeline3) { create :ci_pipeline, project: project3 }
           let!(:build1_project1) { pending_job }
-          let!(:build2_project1) { FactoryGirl.create :ci_build, pipeline: pipeline }
-          let!(:build3_project1) { FactoryGirl.create :ci_build, pipeline: pipeline }
-          let!(:build1_project2) { FactoryGirl.create :ci_build, pipeline: pipeline2 }
-          let!(:build2_project2) { FactoryGirl.create :ci_build, pipeline: pipeline2 }
-          let!(:build1_project3) { FactoryGirl.create :ci_build, pipeline: pipeline3 }
+          let!(:build2_project1) { FactoryBot.create :ci_build, pipeline: pipeline }
+          let!(:build3_project1) { FactoryBot.create :ci_build, pipeline: pipeline }
+          let!(:build1_project2) { FactoryBot.create :ci_build, pipeline: pipeline2 }
+          let!(:build2_project2) { FactoryBot.create :ci_build, pipeline: pipeline2 }
+          let!(:build1_project3) { FactoryBot.create :ci_build, pipeline: pipeline3 }
 
           it 'prefers projects without builds first' do
             # it gets for one build from each of the projects

spec/services/ci/retry_build_service_spec.rb

@@ -40,7 +40,7 @@ describe Ci::RetryBuildService do
              description: 'my-job', stage: 'test',  pipeline: pipeline,
              auto_canceled_by: create(:ci_empty_pipeline, project: project)) do |build|
                ##
-               # TODO, workaround for FactoryGirl limitation when having both
+               # TODO, workaround for FactoryBot limitation when having both
                # stage (text) and stage_id (integer) columns in the table.
                build.stage_id = stage.id
              end

spec/spec_helper.rb

@@ -183,7 +183,7 @@ RSpec::Matchers.define :match_asset_path do |expected|
   end
 end
 
-FactoryGirl::SyntaxRunner.class_eval do
+FactoryBot::SyntaxRunner.class_eval do
   include RSpec::Mocks::ExampleMethods
 end
 

spec/support/factory_girl.rb

 RSpec.configure do |config|
-  config.include FactoryGirl::Syntax::Methods
+  config.include FactoryBot::Syntax::Methods
 end

spec/support/markdown_feature.rb

@@ -8,7 +8,7 @@
 # The class renders `spec/fixtures/markdown.md.erb` using ERB, allowing for
 # reference to the factory-created objects.
 class MarkdownFeature
-  include FactoryGirl::Syntax::Methods
+  include FactoryBot::Syntax::Methods
 
   def user
     @user ||= create(:user)

spec/support/test_env.rb

@@ -82,10 +82,10 @@ module TestEnv
 
     setup_gitaly
 
-    # Create repository for FactoryGirl.create(:project)
+    # Create repository for FactoryBot.create(:project)
     setup_factory_repo
 
-    # Create repository for FactoryGirl.create(:forked_project_with_submodules)
+    # Create repository for FactoryBot.create(:forked_project_with_submodules)
     setup_forked_repo
   end
 

spec/uploaders/records_uploads_spec.rb

@@ -8,7 +8,7 @@ describe RecordsUploads do
       storage :file
 
       def model
-        FactoryGirl.build_stubbed(:user)
+        FactoryBot.build_stubbed(:user)
       end
     end
 

spec/views/projects/jobs/show.html.haml_spec.rb

@@ -187,7 +187,7 @@ describe 'projects/jobs/show' do
 
   context 'when incomplete trigger_request is used' do
     before do
-      build.trigger_request = FactoryGirl.build(:ci_trigger_request, trigger: nil)
+      build.trigger_request = FactoryBot.build(:ci_trigger_request, trigger: nil)
     end
 
     it 'test should not render token block' do
@@ -199,7 +199,7 @@ describe 'projects/jobs/show' do
 
   context 'when complete trigger_request is used' do
     before do
-      build.trigger_request = FactoryGirl.build(:ci_trigger_request)
+      build.trigger_request = FactoryBot.build(:ci_trigger_request)
     end
 
     it 'should render token' do