Skip to content

Replace machinist with FactoryBot for test data setup #5121

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
philippthun merged 1 commit into from
Jun 29, 2026
Merged

Replace machinist with FactoryBot for test data setup #5121

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
2 changes: 1 addition & 1 deletion Gemfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ end

group :test do
gem 'codeclimate-test-reporter', '>= 1.0.8', require: false
gem 'machinist', '~> 1.0.6'
gem 'factory_bot', '~> 6.5'
Comment thread
johha marked this conversation as resolved.
gem 'mock_redis'
gem 'parallel_tests'
gem 'rack-test'
Expand Down
5 changes: 3 additions & 2 deletions Gemfile.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,6 +86,8 @@ GEM
erubi (1.13.1)
excon (1.5.0)
logger
factory_bot (6.6.0)
activesupport (>= 6.1.0)
faraday (0.17.6)
multipart-post (>= 1.2, < 3)
ffi (1.17.4)
Expand Down Expand Up @@ -224,7 +226,6 @@ GEM
loofah (2.25.1)
crass (~> 1.0.2)
nokogiri (>= 1.12.0)
machinist (1.0.6)
method_source (1.1.0)
mime-types (3.7.0)
logger
Expand Down Expand Up @@ -561,6 +562,7 @@ DEPENDENCIES
concurrent-ruby
debug (~> 1.11)
digest-xxhash
factory_bot (~> 6.5)
fluent-logger
fog-aliyun
fog-aws
Expand All @@ -572,7 +574,6 @@ DEPENDENCIES
json-diff
json-schema
listen
machinist (~> 1.0.6)
mime-types (~> 3.7)
mock_redis
multipart-parser
Expand Down
5 changes: 2 additions & 3 deletions lib/cloud_controller/console.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,9 +36,8 @@

if ENV['NEW_RELIC_ENV'] == 'development'
$LOAD_PATH.unshift(File.expand_path('../../spec/support', __dir__))
require 'machinist/sequel'
require 'machinist/object'
require 'fakes/blueprints'
require 'factories'
require 'sham_shim'
end

module VCAP::CloudController
Expand Down
48 changes: 24 additions & 24 deletions spec/acceptance/async_bindings_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,16 +33,16 @@ module VCAP::CloudController
end

context 'when a service instance is shared' do
let(:service_instance) { ManagedServiceInstance.make }
let(:target_space) { Space.make }
let(:service_instance) { create(:managed_service_instance) }
let(:target_space) { create(:space) }

before do
service_instance.add_shared_space(target_space)
end

context 'when there are bindings in the target space' do
let(:target_app) { AppModel.make(space: target_space) }
let!(:target_binding) { ServiceBinding.make(app: target_app, service_instance: service_instance) }
let(:target_app) { create(:app_model, space: target_space) }
let!(:target_binding) { create(:service_binding, app: target_app, service_instance: service_instance) }

it 'issues an unbind and fails the instance deletion if the service instance is deleted recursively and accepts_incomplete is true' do
delete("/v2/service_instances/#{service_instance.guid}", 'recursive=true&accepts_incomplete=true', admin_headers)
Expand Down Expand Up @@ -70,8 +70,8 @@ module VCAP::CloudController

context 'and when there are bindings in the source space' do
let(:source_space) { service_instance.space }
let(:source_app) { AppModel.make(space: source_space) }
let!(:source_binding) { ServiceBinding.make(app: source_app, service_instance: service_instance) }
let(:source_app) { create(:app_model, space: source_space) }
let!(:source_binding) { create(:service_binding, app: source_app, service_instance: service_instance) }

it 'issues unbinds and fails the instance deletion if the service instance is deleted recursively and accepts_incomplete is true' do
delete("/v2/service_instances/#{service_instance.guid}", 'recursive=true&accepts_incomplete=true', admin_headers)
Expand Down Expand Up @@ -121,15 +121,15 @@ module VCAP::CloudController

context 'when DELETE /v3/apps/:guid is called' do
context 'and multiple service bindings exist' do
let(:space) { Space.make }
let(:app_model) { VCAP::CloudController::AppModel.make(name: 'app_name', space: space) }
let(:package) { VCAP::CloudController::PackageModel.make(app: app_model) }
let!(:droplet) { VCAP::CloudController::DropletModel.make(package: package, app: app_model) }
let!(:process) { VCAP::CloudController::ProcessModel.make(app: app_model) }
let!(:deployment) { VCAP::CloudController::DeploymentModel.make(app: app_model) }
let(:space) { create(:space) }
let(:app_model) { create(:app_model, name: 'app_name', space: space) }
let(:package) { create(:package_model, app: app_model) }
let!(:droplet) { create(:droplet_model, package: package, app: app_model) }
let!(:process) { create(:process_model, app: app_model) }
let!(:deployment) { create(:deployment_model, app: app_model) }

let!(:service_binding1) { ServiceBinding.make(app: app_model, service_instance: ManagedServiceInstance.make(space:)) }
let!(:service_binding2) { ServiceBinding.make(app: app_model, service_instance: ManagedServiceInstance.make(space:)) }
let!(:service_binding1) { create(:service_binding, app: app_model, service_instance: create(:managed_service_instance, space:)) }
let!(:service_binding2) { create(:service_binding, app: app_model, service_instance: create(:managed_service_instance, space:)) }

it 'returns a list of errors for the service bindings' do
delete("/v3/apps/#{app_model.guid}", nil, admin_headers)
Expand Down Expand Up @@ -157,8 +157,8 @@ module VCAP::CloudController
context 'and multiple service bindings exist' do
let(:process) { ProcessModelFactory.make }

let!(:service_binding1) { ServiceBinding.make(app: process.app, service_instance: ManagedServiceInstance.make(space: process.space)) }
let!(:service_binding2) { ServiceBinding.make(app: process.app, service_instance: ManagedServiceInstance.make(space: process.space)) }
let!(:service_binding1) { create(:service_binding, app: process.app, service_instance: create(:managed_service_instance, space: process.space)) }
let!(:service_binding2) { create(:service_binding, app: process.app, service_instance: create(:managed_service_instance, space: process.space)) }

it 'returns a concatenated error for the service bindings' do
delete("/v2/apps/#{process.app.guid}", 'recursive=true', admin_headers)
Expand All @@ -180,8 +180,8 @@ module VCAP::CloudController
context 'and multiple service bindings exist' do
let(:process) { ProcessModelFactory.make }

let!(:service_binding1) { ServiceBinding.make(app: process.app, service_instance: ManagedServiceInstance.make(space: process.space)) }
let!(:service_binding2) { ServiceBinding.make(app: process.app, service_instance: ManagedServiceInstance.make(space: process.space)) }
let!(:service_binding1) { create(:service_binding, app: process.app, service_instance: create(:managed_service_instance, space: process.space)) }
let!(:service_binding2) { create(:service_binding, app: process.app, service_instance: create(:managed_service_instance, space: process.space)) }

it 'returns a concatenated error for the service bindings' do
delete("/v2/spaces/#{process.space.guid}", 'recursive=true', admin_headers)
Expand All @@ -203,8 +203,8 @@ module VCAP::CloudController
context 'and multiple service bindings exist' do
let(:process) { ProcessModelFactory.make }

let!(:service_binding1) { ServiceBinding.make(app: process.app, service_instance: ManagedServiceInstance.make(space: process.space)) }
let!(:service_binding2) { ServiceBinding.make(app: process.app, service_instance: ManagedServiceInstance.make(space: process.space)) }
let!(:service_binding1) { create(:service_binding, app: process.app, service_instance: create(:managed_service_instance, space: process.space)) }
let!(:service_binding2) { create(:service_binding, app: process.app, service_instance: create(:managed_service_instance, space: process.space)) }

it 'returns a concatenated error for the service bindings' do
delete("/v2/organizations/#{process.organization.guid}", 'recursive=true', admin_headers)
Expand All @@ -224,8 +224,8 @@ module VCAP::CloudController

context 'when PUT /v2/service_instances/:guid is called and when an async binding operation is in progress' do
let(:process) { ProcessModelFactory.make }
let(:service_binding) { ServiceBinding.make(app: process.app, service_instance: ManagedServiceInstance.make(space: process.space)) }
let!(:service_binding_operation) { ServiceBindingOperation.make(state: 'in progress', type: operation_type, service_binding_id: service_binding.id) }
let(:service_binding) { create(:service_binding, app: process.app, service_instance: create(:managed_service_instance, space: process.space)) }
let!(:service_binding_operation) { create(:service_binding_operation, state: 'in progress', type: operation_type, service_binding_id: service_binding.id) }

let(:body) do
{
Expand Down Expand Up @@ -270,8 +270,8 @@ module VCAP::CloudController

context 'when DELETE /v2/service_instances/:guid is called and when an async binding operation is in progress' do
let(:process) { ProcessModelFactory.make }
let(:service_binding) { ServiceBinding.make(app: process.app, service_instance: ManagedServiceInstance.make(space: process.space)) }
let!(:service_binding_operation) { ServiceBindingOperation.make(state: 'in progress', type: operation_type, service_binding_id: service_binding.id) }
let(:service_binding) { create(:service_binding, app: process.app, service_instance: create(:managed_service_instance, space: process.space)) }
let!(:service_binding_operation) { create(:service_binding_operation, state: 'in progress', type: operation_type, service_binding_id: service_binding.id) }

context 'when the binding operation is create' do
let(:operation_type) { 'create' }
Expand Down
32 changes: 16 additions & 16 deletions spec/acceptance/broker_api_compatibility/broker_api_v2.13_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -227,7 +227,7 @@
let(:catalog) { default_catalog(plan_updateable: true) }

context 'service broker registration' do
let(:user) { VCAP::CloudController::User.make }
let(:user) { create(:user) }

before do
setup_broker_with_user(user)
Expand All @@ -246,7 +246,7 @@
end

context 'service provision request' do
let(:user) { VCAP::CloudController::User.make }
let(:user) { create(:user) }

before do
provision_service(user:)
Expand All @@ -264,7 +264,7 @@
end

context 'service deprovision request' do
let(:user) { VCAP::CloudController::User.make }
let(:user) { create(:user) }

before do
provision_service(user:)
Expand All @@ -283,7 +283,7 @@
end

context 'service update request' do
let(:user) { VCAP::CloudController::User.make }
let(:user) { create(:user) }

before do
provision_service(user:)
Expand All @@ -302,7 +302,7 @@
end

context 'service binding request' do
let(:user) { VCAP::CloudController::User.make }
let(:user) { create(:user) }

before do
provision_service
Expand All @@ -322,7 +322,7 @@
end

context 'service unbind request' do
let(:user) { VCAP::CloudController::User.make }
let(:user) { create(:user) }
let(:async) { false }

before do
Expand Down Expand Up @@ -367,7 +367,7 @@
end

context 'create service key request' do
let(:user) { VCAP::CloudController::User.make }
let(:user) { create(:user) }

before do
provision_service
Expand All @@ -386,7 +386,7 @@
end

context 'delete service key request' do
let(:user) { VCAP::CloudController::User.make }
let(:user) { create(:user) }

before do
provision_service
Expand All @@ -407,8 +407,8 @@

context 'create route binding' do
let(:catalog) { default_catalog(plan_updateable: true, requires: ['route_forwarding']) }
let(:user) { VCAP::CloudController::User.make }
let(:route) { VCAP::CloudController::Route.make(space: @space) }
let(:user) { create(:user) }
let(:route) { create(:route, space: @space) }

before do
provision_service
Expand All @@ -428,8 +428,8 @@

context 'delete route binding' do
let(:catalog) { default_catalog(plan_updateable: true, requires: ['route_forwarding']) }
let(:user) { VCAP::CloudController::User.make }
let(:route) { VCAP::CloudController::Route.make(space: @space) }
let(:user) { create(:user) }
let(:route) { create(:route, space: @space) }

before do
provision_service
Expand All @@ -449,9 +449,9 @@
end

context 'when multiple users operate on a service instance' do
let(:user_a) { VCAP::CloudController::User.make }
let(:user_b) { VCAP::CloudController::User.make }
let(:user_c) { VCAP::CloudController::User.make }
let(:user_a) { create(:user) }
let(:user_b) { create(:user) }
let(:user_c) { create(:user) }

before do
provision_service(user: user_a)
Expand Down Expand Up @@ -547,7 +547,7 @@

context 'for bind route service' do
let(:catalog) { default_catalog(requires: ['route_forwarding']) }
let(:route) { VCAP::CloudController::Route.make(space: @space) }
let(:route) { create(:route, space: @space) }

before do
provision_service
Expand Down
4 changes: 2 additions & 2 deletions spec/acceptance/broker_api_compatibility/broker_api_v2.14_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@
end

it 'sends the broker the X-Broker-Api-Originating-Identity header' do
user = VCAP::CloudController::User.make
user = create(:user)

get("/v2/service_bindings/#{@binding_guid}/parameters",
{}.to_json,
Expand Down Expand Up @@ -249,7 +249,7 @@
end

describe 'update service dashboard url' do
let(:service_instance) { VCAP::CloudController::ManagedServiceInstance.make(space_guid: @space_guid, service_plan_guid: @plan_guid) }
let(:service_instance) { create(:managed_service_instance, space_guid: @space_guid, service_plan_guid: @plan_guid) }
let(:catalog) { default_catalog(plan_updateable: true) }

before do
Expand Down
26 changes: 12 additions & 14 deletions spec/acceptance/broker_api_compatibility/broker_api_v2.15_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@
end

context 'when deprovisioning a service instance' do
let(:service_instance) { VCAP::CloudController::ManagedServiceInstance.make(space_guid: @space_guid, service_plan_guid: @plan_guid) }
let(:service_instance) { create(:managed_service_instance, space_guid: @space_guid, service_plan_guid: @plan_guid) }

before do
@service_instance_guid = service_instance.guid
Expand All @@ -81,7 +81,7 @@
end

context 'when updating a service instance' do
let(:service_instance) { VCAP::CloudController::ManagedServiceInstance.make(space_guid: @space_guid, service_plan_guid: @plan_guid) }
let(:service_instance) { create(:managed_service_instance, space_guid: @space_guid, service_plan_guid: @plan_guid) }

before do
@service_instance_guid = service_instance.guid
Expand All @@ -105,7 +105,7 @@

describe 'service bindings' do
context 'when creating a service binding' do
let(:service_instance) { VCAP::CloudController::ManagedServiceInstance.make(space_guid: @space_guid, service_plan_guid: @plan_guid) }
let(:service_instance) { create(:managed_service_instance, space_guid: @space_guid, service_plan_guid: @plan_guid) }

before do
@service_instance_guid = service_instance.guid
Expand All @@ -128,7 +128,7 @@
end

context 'when removing a service binding' do
let(:service_instance) { VCAP::CloudController::ManagedServiceInstance.make(space_guid: @space_guid, service_plan_guid: @plan_guid) }
let(:service_instance) { create(:managed_service_instance, space_guid: @space_guid, service_plan_guid: @plan_guid) }

before do
@service_instance_guid = service_instance.guid
Expand Down Expand Up @@ -182,7 +182,7 @@
end

context 'when updating a service instance' do
let(:service_instance) { VCAP::CloudController::ManagedServiceInstance.make(space_guid: @space_guid, service_plan_guid: @plan_guid) }
let(:service_instance) { create(:managed_service_instance, space_guid: @space_guid, service_plan_guid: @plan_guid) }

before do
@service_instance_guid = service_instance.guid
Expand All @@ -201,7 +201,7 @@
end

context 'when deleting a service instance' do
let(:service_instance) { VCAP::CloudController::ManagedServiceInstance.make(space_guid: @space_guid, service_plan_guid: @plan_guid) }
let(:service_instance) { create(:managed_service_instance, space_guid: @space_guid, service_plan_guid: @plan_guid) }

before do
@service_instance_guid = service_instance.guid
Expand All @@ -222,7 +222,7 @@

describe 'service bindings' do
context 'when creating a service binding' do
let(:service_instance) { VCAP::CloudController::ManagedServiceInstance.make(space_guid: @space_guid, service_plan_guid: @plan_guid) }
let(:service_instance) { create(:managed_service_instance, space_guid: @space_guid, service_plan_guid: @plan_guid) }

before do
@service_instance_guid = service_instance.guid
Expand All @@ -240,7 +240,7 @@
end

context 'when removing a service binding' do
let(:service_instance) { VCAP::CloudController::ManagedServiceInstance.make(space_guid: @space_guid, service_plan_guid: @plan_guid) }
let(:service_instance) { create(:managed_service_instance, space_guid: @space_guid, service_plan_guid: @plan_guid) }

before do
@service_instance_guid = service_instance.guid
Expand Down Expand Up @@ -403,7 +403,7 @@
end

context 'for bind route service' do
let(:route) { VCAP::CloudController::Route.make(space: @space) }
let(:route) { create(:route, space: @space) }

before do
create_route_binding(route)
Expand Down Expand Up @@ -514,11 +514,9 @@

context 'when updating the service with the provided maintenance_info' do
let(:service_instance) do
VCAP::CloudController::ManagedServiceInstance.make(
space_guid: @space_guid,
service_plan_guid: @plan_guid,
maintenance_info: { 'version' => '1.0.0' }
)
create(:managed_service_instance, space_guid: @space_guid,
service_plan_guid: @plan_guid,
maintenance_info: { 'version' => '1.0.0' })
end

before do
Expand Down
Loading
Loading