Further spec greening

spec/serializers/join_request_serializer_spec.rb

@@ -1,19 +0,0 @@
-require 'spec_helper'
-
-describe JoinRequestSerializer do
-  it 'works' do
-    user = create :user
-    list = create :list
-    join_request = list.join_request_for_user(user)
-    JoinRequestSerializer.new(join_request).as_json.deep_symbolize_keys.should =~ {
-      users: [UserUserSerializer.new(user).as_json(root: false)],
-      join_request: {
-        id: "jr-#{user.id}",
-        created_at: nil,
-        updated_at: nil,
-        list_id: list.id,
-        user_id: user.id
-      }
-    }
-  end
-end

spec/serializers/suppliers/order_serializer_spec.rb

@@ -6,8 +6,8 @@ describe Suppliers::OrderSerializer, type: :serializer do
     order = create :order, user: user
     order.product_orders # preload empty
     result = nil
-    expect{ result = JSONAPI::Serializer.serialize order, serializer: described_class, include: %w[user user.order] }.not_to perform_any_queries
-    result[:included].size.should eq 4
+    expect{ result = described_class.serialize(order, include: %w[user]).deep_symbolize_keys }.not_to perform_any_queries
+    result[:included].size.should eq 1
   end
 
 end

spec/serializers/users/join_request_serializer_spec.rb

@@ -0,0 +1,11 @@
+require 'spec_helper'
+
+describe Users::JoinRequestSerializer do
+  it 'works' do
+    user = create :user
+    list = create :list
+    join_request = list.join_request_for_user(user)
+    result = described_class.serialize(join_request).deep_symbolize_keys
+    result[:data].should match hash_including(type: 'join-requests', id: "jr-#{user.id}")
+  end
+end

spec/serializers/users/list_serializer_spec.rb

@@ -12,15 +12,10 @@ describe Users::ListSerializer, type: :serializer do
     l.add_user create :user
     l.add_user create :user
     list = List.find(l.id)
-    [list].include_relations(:users)
+    list.users # cache users
     result = nil
     #result = expect{ JSONAPI::Serializer.serialize(list, serializer: described_class) }.not_to perform_any_queries
-    expect{ result = JSONAPI::Serializer.serialize(list, serializer: described_class, include: %w[supplier users]) }.not_to exceed_query_limit 1 # supplier
-    binding.pry
-
-
-    #expect{ object_as_json orders }.not_to exceed_query_limit 0
-    #expect{ object_as_json list }.not_to exceed_query_limit 0
+    expect{ result = described_class.serialize(list, include: %w[supplier users]) }.not_to exceed_query_limit 1 # supplier
   end
 
 end

spec/serializers/users/order_serializer_spec.rb

@@ -13,8 +13,7 @@ describe Users::OrderSerializer, type: :serializer do
     orders = list.orders.include_relation(:product_orders)
     #expect{ object_as_json orders }.not_to exceed_query_limit 0
     result = nil
-    expect{ result = JSONAPI::Serializer.serialize(orders, serializer: described_class, include: 'product_orders', is_collection: true)}.not_to perform_any_queries
-    binding.pry
+    expect{ result = described_class.serialize(orders, include: 'product_orders', is_collection: true).deep_symbolize_keys }.not_to perform_any_queries
     result[:included].size.should eq 4
   end
 

spec/serializers/users/table_serializer_spec.rb

@@ -4,8 +4,6 @@ describe Users::TableSerializer, type: :serializer do
   it "does not perform extra queries" do
     table = create :table
     result = object_as_json(table)
-    binding.pry
-    result[:included].size.should eq 4
   end
 
 end