Skip to content

Commit 394377b

Browse files
committed
prefactor: session tests assert logical equivalence of URIs
instead of string equivalence.
1 parent 5549949 commit 394377b

File tree

1 file changed

+12
-8
lines changed

1 file changed

+12
-8
lines changed

test/session_test.rb

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ def setup
9494
end
9595

9696
test "ignore everything but the subdomain in the shop" do
97-
assert_equal(
97+
assert_equal_uri(
9898
"https://testshop.myshopify.com",
9999
ShopifyAPI::Session.new(
100100
domain: "http://user:[email protected]/path",
@@ -105,7 +105,7 @@ def setup
105105
end
106106

107107
test "append the myshopify domain if not given" do
108-
assert_equal(
108+
assert_equal_uri(
109109
"https://testshop.myshopify.com",
110110
ShopifyAPI::Session.new(domain: "testshop", token: "any-token", api_version: any_api_version).site
111111
)
@@ -283,7 +283,7 @@ def setup
283283
)
284284
scope = ["write_products"]
285285
permission_url = session.create_permission_url(scope, "http://my_redirect_uri.com")
286-
assert_equal(
286+
assert_equal_uri(
287287
"https://localhost.myshopify.com/admin/oauth/authorize?client_id=My_test_key&" \
288288
"scope=write_products&redirect_uri=http://my_redirect_uri.com",
289289
permission_url
@@ -299,7 +299,7 @@ def setup
299299
)
300300
scope = ["write_products", "write_customers"]
301301
permission_url = session.create_permission_url(scope, "http://my_redirect_uri.com")
302-
assert_equal(
302+
assert_equal_uri(
303303
"https://localhost.myshopify.com/admin/oauth/authorize?client_id=My_test_key&" \
304304
"scope=write_products,write_customers&redirect_uri=http://my_redirect_uri.com",
305305
permission_url
@@ -315,7 +315,7 @@ def setup
315315
)
316316
scope = []
317317
permission_url = session.create_permission_url(scope, "http://my_redirect_uri.com")
318-
assert_equal(
318+
assert_equal_uri(
319319
"https://localhost.myshopify.com/admin/oauth/authorize?client_id=My_test_key&" \
320320
"scope=&redirect_uri=http://my_redirect_uri.com",
321321
permission_url
@@ -331,7 +331,7 @@ def setup
331331
)
332332
scope = []
333333
permission_url = session.create_permission_url(scope, "http://my_redirect_uri.com", state: "My nonce")
334-
assert_equal(
334+
assert_equal_uri(
335335
"https://localhost.myshopify.com/admin/oauth/authorize?client_id=My_test_key&" \
336336
"scope=&redirect_uri=http://my_redirect_uri.com&state=My%20nonce",
337337
permission_url
@@ -347,7 +347,7 @@ def setup
347347
)
348348
scope = []
349349
permission_url = session.create_permission_url(scope, "http://my_redirect_uri.com", grant_options: "per-user")
350-
assert_equal(
350+
assert_equal_uri(
351351
"https://localhost.myshopify.com/admin/oauth/authorize?client_id=My_test_key&" \
352352
"scope=&redirect_uri=http://my_redirect_uri.com&grant_options[]=per-user",
353353
permission_url
@@ -380,7 +380,7 @@ def setup
380380
token: "any-token",
381381
api_version: any_api_version
382382
)
383-
assert_equal("https://testshop.myshopify.com", session.site)
383+
assert_equal_uri("https://testshop.myshopify.com", session.site)
384384
end
385385

386386
test "return_token_if_signature_is_valid" do
@@ -618,6 +618,10 @@ def setup
618618

619619
private
620620

621+
def assert_equal_uri(expected, actual)
622+
assert_equal(Addressable::URI.parse(expected), Addressable::URI.parse(actual))
623+
end
624+
621625
def make_sorted_params(params)
622626
params.with_indifferent_access.except(
623627
:signature, :hmac, :action, :controller

0 commit comments

Comments
 (0)