Acceptance tests for user

app/models/list.rb

@@ -163,7 +163,7 @@ class List
       for user in users
         user.active_list_id = nil
         user.save
-        broadcast_user user.id, 'list_closed', broadcast_info
+        #broadcast_user user.id, 'list_closed', broadcast_info
       end
       broadcast_supplier supplier_id, 'list_closed', broadcast_info
     end
@@ -333,7 +333,7 @@ class List
         user
         product_orders
       ])
-      broadcast_users 'new_order', user_payload
+      broadcast_users 'new_order', supplier_orders_placed_count: orders_placed_count, payload: user_payload
       broadcast_supplier supplier.id, 'new_order', supplier_orders_placed_count: orders_placed_count, payload: supplier_payload
     end
     #broadcast_supplier supplier.id, 'orders_placed_count', count: orders_placed_count # done inside new order payload

app/models/list/join_requests.rb

@@ -20,7 +20,7 @@ class List
         self.join_request_user_ids |= [requester.id]
         self.is_dirty
         if save
-          broadcast_users 'user_join_request', payload: JSONAPI::Serializer.serialize( join_request_for_user(requester), serializer: Users::JoinRequestSerializer, include: %w[list user])
+          broadcast_users 'user_join_request', payload: Users::JoinRequestSerializer.serialize(join_request_for_user(requester), include: %w[list user])
         end
       end
     end

app/models/user.rb

@@ -13,7 +13,9 @@ class User
   property :oauth_expires_at
   property :auth_data
 
-  devise :database_authenticatable, :recoverable, :rememberable, :trackable, :omniauthable, :omniauth_providers => [:facebook, :instagram] #, :token_authenticatable , :registerable
+  devise_plugins = [:database_authenticatable, :recoverable, :rememberable, :trackable, :omniauthable, {omniauth_providers: [:facebook, :instagram]}] #, :token_authenticatable , :registerable
+  devise_plugins -= [:trackable] if Rails.env.test? # creates conflicts
+  devise *devise_plugins
 
   property :authentication_token