diff --git a/spec/controllers/api/v0/reports_controller_spec.rb b/spec/controllers/api/v0/reports_controller_spec.rb index d5403990c0..e50c55cbdc 100644 --- a/spec/controllers/api/v0/reports_controller_spec.rb +++ b/spec/controllers/api/v0/reports_controller_spec.rb @@ -3,7 +3,7 @@ require "spec_helper" describe Api::V0::ReportsController, type: :controller do - let(:enterprise_user) { create(:user, enterprises: create(:enterprise)) } + let(:enterprise_user) { create(:user, enterprises: [create(:enterprise)]) } let(:params) { { report_type: 'packing', diff --git a/spec/factories/user_factory.rb b/spec/factories/user_factory.rb index 80b2ceca10..e52d6c878d 100644 --- a/spec/factories/user_factory.rb +++ b/spec/factories/user_factory.rb @@ -6,10 +6,6 @@ FactoryBot.define do end factory :user, class: Spree::User do - transient do - enterprises { [] } - end - email { generate(:random_email) } login { email } password { 'secret' } @@ -34,18 +30,8 @@ FactoryBot.define do end end - after(:create) do |user, proxy| - user.spree_roles.clear # Remove admin role - - user.enterprises << proxy.enterprises - end - factory :admin_user do spree_roles { [Spree::Role.find_or_create_by!(name: 'admin')] } - - after(:create) do |user| - user.spree_roles << Spree::Role.find_or_create_by!(name: 'admin') - end end factory :oidc_user do