From d110aebfcd15fedac43f796ad67a7165cc99b8b6 Mon Sep 17 00:00:00 2001
From: Keith Kim <karmakaze@users.noreply.github.com>
Date: Wed, 4 Dec 2019 16:16:21 -0500
Subject: [PATCH] Updates from PR review--just use Fulfillment (no V2)

---
 lib/shopify_api/resources/fulfillment_order.rb | 4 ++--
 lib/shopify_api/resources/fulfillment_v2.rb    | 4 ----
 lib/shopify_api/resources/order.rb             | 4 ++--
 test/assigned_fulfillment_order_test.rb        | 4 ++--
 test/fulfillment_order_test.rb                 | 6 +++---
 test/order_test.rb                             | 2 +-
 6 files changed, 10 insertions(+), 14 deletions(-)
 delete mode 100644 lib/shopify_api/resources/fulfillment_v2.rb

diff --git a/lib/shopify_api/resources/fulfillment_order.rb b/lib/shopify_api/resources/fulfillment_order.rb
index 5a97b9ace..2a20c6dc4 100644
--- a/lib/shopify_api/resources/fulfillment_order.rb
+++ b/lib/shopify_api/resources/fulfillment_order.rb
@@ -9,8 +9,8 @@ def self.all(options = {})
     end
 
     def fulfillments(options = {})
-      fulfillments = get(:fulfillments, options)
-      fulfillments.map { |fulfillment| FulfillmentV2.new(fulfillment.as_json) }
+      fulfillment_hashes = get(:fulfillments, options)
+      fulfillment_hashes.map { |fulfillment_hash| Fulfillment.new(fulfillment_hash) }
     end
   end
 end
diff --git a/lib/shopify_api/resources/fulfillment_v2.rb b/lib/shopify_api/resources/fulfillment_v2.rb
deleted file mode 100644
index 1aea373eb..000000000
--- a/lib/shopify_api/resources/fulfillment_v2.rb
+++ /dev/null
@@ -1,4 +0,0 @@
-module ShopifyAPI
-  class FulfillmentV2 < Base
-  end
-end
diff --git a/lib/shopify_api/resources/order.rb b/lib/shopify_api/resources/order.rb
index 435157058..56a38395a 100644
--- a/lib/shopify_api/resources/order.rb
+++ b/lib/shopify_api/resources/order.rb
@@ -31,8 +31,8 @@ def capture(amount = "", currency: nil)
     end
 
     def fulfillment_orders(options = {})
-      fulfillment_orders = get(:fulfillment_orders, options)
-      fulfillment_orders.map { |fulfillment_order| FulfillmentOrder.new(fulfillment_order.as_json) }
+      fulfillment_order_hashes = get(:fulfillment_orders, options)
+      fulfillment_order_hashes.map { |fulfillment_order_hash| FulfillmentOrder.new(fulfillment_order_hash) }
     end
 
     class ClientDetails < Base
diff --git a/test/assigned_fulfillment_order_test.rb b/test/assigned_fulfillment_order_test.rb
index 11e640d4a..c28b96147 100644
--- a/test/assigned_fulfillment_order_test.rb
+++ b/test/assigned_fulfillment_order_test.rb
@@ -14,7 +14,7 @@ class AssignedFulFillmentOrderTest < Test::Unit::TestCase
 
         assert_equal 2, assigned_fulfillment_orders.count
         assigned_fulfillment_orders.each do |fulfillment_order|
-          assert_equal 'ShopifyAPI::FulfillmentOrder', fulfillment_order.class.name
+          assert fulfillment_order.is_a?(ShopifyAPI::FulfillmentOrder)
           assert_equal 'in_progress', fulfillment_order.status
           assert_equal 'cancellation_accepted', fulfillment_order.request_status
         end
@@ -32,7 +32,7 @@ class AssignedFulFillmentOrderTest < Test::Unit::TestCase
 
         assert_equal 2, assigned_fulfillment_orders.count
         assigned_fulfillment_orders.each do |fulfillment_order|
-          assert_equal 'ShopifyAPI::FulfillmentOrder', fulfillment_order.class.name
+          assert fulfillment_order.is_a?(ShopifyAPI::FulfillmentOrder)
           assert_equal assigned_location_id, fulfillment_order.assigned_location_id
         end
       end
diff --git a/test/fulfillment_order_test.rb b/test/fulfillment_order_test.rb
index d9c16dc3a..353e859a1 100644
--- a/test/fulfillment_order_test.rb
+++ b/test/fulfillment_order_test.rb
@@ -11,7 +11,7 @@ def setup
     context "#find" do
       should "be able to find fulfillment order" do
         fulfillment_order = ShopifyAPI::FulfillmentOrder.find(519788021)
-        assert_equal 'ShopifyAPI::FulfillmentOrder', fulfillment_order.class.name
+        assert fulfillment_order.is_a?(ShopifyAPI::FulfillmentOrder)
         assert_equal 519788021, fulfillment_order.id
         assert_equal 450789469, fulfillment_order.order_id
       end
@@ -27,7 +27,7 @@ def setup
 
         assert_equal [519788021, 519788022], fulfillment_orders.map(&:id).sort
         fulfillment_orders.each do |fulfillment_order|
-          assert_equal 'ShopifyAPI::FulfillmentOrder', fulfillment_order.class.name
+          assert fulfillment_order.is_a?(ShopifyAPI::FulfillmentOrder)
           assert_equal 450789469, fulfillment_order.order_id
         end
       end
@@ -50,7 +50,7 @@ def setup
 
         assert_equal 1, fulfillments.count
         fulfillment = fulfillments.first
-        assert_equal 'ShopifyAPI::FulfillmentV2', fulfillment.class.name
+        assert fulfillment.is_a?(ShopifyAPI::Fulfillment)
         assert_equal 450789469, fulfillment.order_id
       end
     end
diff --git a/test/order_test.rb b/test/order_test.rb
index f857fc6de..f877cee45 100644
--- a/test/order_test.rb
+++ b/test/order_test.rb
@@ -82,7 +82,7 @@ class OrderTest < Test::Unit::TestCase
 
     assert_equal [519788021, 519788022], fulfillment_orders.map(&:id).sort
     fulfillment_orders.each do |fulfillment_order|
-      assert_equal 'ShopifyAPI::FulfillmentOrder', fulfillment_order.class.name
+      assert fulfillment_order.is_a?(ShopifyAPI::FulfillmentOrder)
       assert_equal 450789469, fulfillment_order.order_id
     end
   end