Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion lib/shopify/adapters/http.ex
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,10 @@ defmodule Shopify.Adapters.HTTP do
end

def handle_response({:ok, %HTTPoison.Response{} = resp}, resource) do
Shopify.Response.new(%{body: resp.body, code: resp.status_code, headers: resp.headers}, resource)
Shopify.Response.new(
%{body: resp.body, code: resp.status_code, headers: resp.headers},
resource
)
end

def handle_response({:error, %HTTPoison.Error{reason: reason}}, _resource) do
Expand Down
4 changes: 3 additions & 1 deletion lib/shopify/resources/image.ex
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,9 @@ defmodule Shopify.Image do
:product_id,
:src,
:updated_at,
:variant_ids
:variant_ids,
:width,
:height
]

@doc false
Expand Down
3 changes: 2 additions & 1 deletion lib/shopify/resources/inventory_level.ex
Original file line number Diff line number Diff line change
Expand Up @@ -134,5 +134,6 @@ defmodule Shopify.InventoryLevel do
@doc false
def all_url, do: @plural <> ".json"

defp unprocessable_entity(msg), do: Shopify.Response.new(%{body: msg, code: 422, headers: []}, empty_resource())
defp unprocessable_entity(msg),
do: Shopify.Response.new(%{body: msg, code: 422, headers: []}, empty_resource())
end
3 changes: 3 additions & 0 deletions lib/shopify/resources/order.ex
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,9 @@ defmodule Shopify.Order do
}

defstruct [
:send_receipt,
:send_fulfillment_receipt,
:inventory_behaviour,
:billing_address,
:browser_ip,
:buyer_accepts_marketing,
Expand Down
3 changes: 2 additions & 1 deletion lib/shopify/resources/page.ex
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,8 @@ defmodule Shopify.Page do
:published_at,
:template_suffix,
:published,
:metafields
:metafields,
:collects
]

@doc false
Expand Down
17 changes: 10 additions & 7 deletions test/adapters/http_test.exs
Original file line number Diff line number Diff line change
Expand Up @@ -10,13 +10,16 @@ defmodule Shopify.Adapters.HTTPTest do
end

test "it returns correct Response struct" do
result = {:ok, %HTTPoison.Response{
body: "{\"product\":{\"id\":123}}",
headers: [{"X-Shopify-Shop-Api-Call-Limit", "1/80"}],
status_code: 200
}}

assert {:ok, %Response{} = response} = HTTP.handle_response(result, %{"product" => %Product{}})
result =
{:ok,
%HTTPoison.Response{
body: "{\"product\":{\"id\":123}}",
headers: [{"X-Shopify-Shop-Api-Call-Limit", "1/80"}],
status_code: 200
}}

assert {:ok, %Response{} = response} =
HTTP.handle_response(result, %{"product" => %Product{}})

assert response.code == 200
assert response.data == %Product{id: 123}
Expand Down
16 changes: 14 additions & 2 deletions test/shopify_payments/payout_test.exs
Original file line number Diff line number Diff line change
Expand Up @@ -7,15 +7,27 @@ defmodule Shopify.ShopifyPayments.PayoutTest do
assert {:ok, response} = Shopify.session() |> Payout.find(1)
assert %Shopify.Response{} = response
assert 200 == response.code
fixture = Fixture.load("../test/fixtures/shopify_payments/payouts/1.json", "payout", Payout.empty_resource())

fixture =
Fixture.load(
"../test/fixtures/shopify_payments/payouts/1.json",
"payout",
Payout.empty_resource()
)

assert fixture == response.data
end

test "client can request all payouts" do
assert {:ok, response} = Shopify.session() |> Payout.all()
assert %Shopify.Response{} = response
assert 200 == response.code
fixture = Fixture.load("../test/fixtures/shopify_payments/payouts.json", "payouts", [Payout.empty_resource()])

fixture =
Fixture.load("../test/fixtures/shopify_payments/payouts.json", "payouts", [
Payout.empty_resource()
])

assert fixture == response.data
end
end