[Spree 2.1] Fix creation of enterprises/users in specs

app/controllers/api/enterprise_attachment_controller.rb

@@ -1,3 +1,5 @@
+require 'api/admin/enterprise_serializer'
+
 module Api
   class EnterpriseAttachmentController < BaseController
     class MissingImplementationError < StandardError; end

app/models/enterprise.rb

@@ -93,9 +93,9 @@ class Enterprise < ActiveRecord::Base
   validate :enforce_ownership_limit, if: lambda { owner_id_changed? && !owner_id.nil? }
 
   before_validation :initialize_permalink, if: lambda { permalink.nil? }
-  before_validation :ensure_owner_is_manager, if: lambda { owner_id_changed? && !owner_id.nil? }
   before_validation :set_unused_address_fields
   after_validation :geocode_address
+  after_validation :ensure_owner_is_manager, if: lambda { owner_id_changed? && !owner_id.nil? }
 
   after_touch :touch_distributors
   after_create :set_default_contact
@@ -410,7 +410,7 @@ def geocode_address
   end
 
   def ensure_owner_is_manager
-    #users << owner unless users.include?(owner)
+    users << owner unless users.include?(owner)
   end
 
   def enforce_ownership_limit

spec/factories/enterprise_factory.rb

@@ -1,11 +1,24 @@
 FactoryBot.define do
   factory :enterprise, class: Enterprise do
+    transient do
+      users []
+      logo {}
+      promo_image {}
+    end
+
     owner { FactoryBot.create :user }
     sequence(:name) { |n| "Enterprise #{n}" }
     sells 'any'
     description 'enterprise'
     long_description '<p>Hello, world!</p><p>This is a paragraph.</p>'
     address { FactoryBot.create(:address) }
+
+    after(:create) do |enterprise, proxy|
+      proxy.users.each do |user|
+        enterprise.users << user unless enterprise.users.include?(user)
+      end
+      enterprise.update_attributes logo: proxy.logo, promo_image: proxy.promo_image
+    end
   end
 
   factory :supplier_enterprise, parent: :enterprise do

spec/factories/user_factory.rb

@@ -1,5 +1,9 @@
 FactoryBot.modify do
   factory :user do
+    transient do
+      enterprises []
+    end
+
     confirmation_sent_at '1970-01-01 00:00:00'
     confirmed_at '1970-01-01 00:00:01'
 
@@ -13,8 +17,10 @@
       end
     end
 
-    after(:create) do |user|
+    after(:create) do |user, proxy|
       user.spree_roles.clear # Remove admin role
+
+      user.enterprises << proxy.enterprises
     end
   end