Skip to content

Commit 6fc31a9

Browse files
jsklanjsklan
committed
simplify endpoint calls
1 parent 924edfa commit 6fc31a9

File tree

10 files changed

+23
-89
lines changed

10 files changed

+23
-89
lines changed

‎test/square/integration/client_tests/test_cash_drawers.rb‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,7 @@
1717

1818
puts "request #{_request.to_h}" if verbose?
1919

20-
response = client.cash_drawers.shifts.list(
21-
location_id: _request[:location_id],
22-
begin_time: _request[:begin_time],
23-
end_time: _request[:end_time]
24-
)
20+
response = client.cash_drawers.shifts.list(request: _request.to_h)
2521
refute_nil response
2622

2723
puts "response #{response.to_h}" if verbose?

‎test/square/integration/client_tests/test_catalog.rb‎

Lines changed: 10 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -188,10 +188,7 @@ def get_test_file
188188

189189
puts "request #{_request.to_h}" if verbose?
190190

191-
response = client.catalog.batch_upsert(
192-
idempotency_key: _request[:idempotency_key],
193-
batches: _request[:batches]
194-
)
191+
response = client.catalog.batch_upsert(request: _request.to_h)
195192

196193
assert response
197194
assert_equal 2, response.objects.length
@@ -233,10 +230,7 @@ def get_test_file
233230
puts "request #{_request.to_h}" if verbose?
234231

235232
# Create the catalog objects in a bulk request
236-
create_catalog_objects_resp = client.catalog.batch_upsert(
237-
idempotency_key: _request[:idempotency_key],
238-
batches: _request[:batches]
239-
)
233+
create_catalog_objects_resp = client.catalog.batch_upsert(request: _request.to_h)
240234
assert_equal 200, create_catalog_objects_resp.objects.length
241235
sleep(2) # Wait after bulk creation
242236

@@ -304,10 +298,7 @@ def get_test_file
304298

305299
puts "create_catalog_request #{_create_request.keys}" if verbose?
306300

307-
create_catalog_resp = client.catalog.batch_upsert(
308-
idempotency_key: _create_request[:idempotency_key],
309-
batches: _create_request[:batches]
310-
)
301+
create_catalog_resp = client.catalog.batch_upsert(request: _create_request.to_h)
311302

312303
puts 'Catalog object created' if verbose?
313304
assert_equal 1, create_catalog_resp.objects.length
@@ -338,12 +329,9 @@ def get_test_file
338329
}
339330
}
340331

341-
puts "image_upload_request #{_image_request[:request]}" if verbose?
332+
puts "image_upload_request #{_image_request[:request].to_h}" if verbose?
342333

343-
create_catalog_image_resp = client.catalog.images.create(
344-
image_file: _image_request[:image_file],
345-
request: _image_request[:request]
346-
)
334+
create_catalog_image_resp = client.catalog.images.create(request: _image_request.to_h)
347335

348336
puts 'Image uploaded successfully' if verbose?
349337
assert create_catalog_image_resp.image
@@ -452,9 +440,7 @@ def get_test_file
452440

453441
puts "request #{_request.to_h}" if verbose?
454442

455-
response = client.catalog.batch_get(
456-
object_ids: _request[:object_ids]
457-
)
443+
response = client.catalog.batch_get(request: _request.to_h)
458444

459445
assert response.objects
460446
assert_equal 3, response.objects.length
@@ -486,10 +472,7 @@ def get_test_file
486472

487473
puts "request #{_request.to_h}" if verbose?
488474

489-
response = client.catalog.update_item_taxes(
490-
item_ids: _request[:item_ids],
491-
taxes_to_enable: _request[:taxes_to_enable]
492-
)
475+
response = client.catalog.update_item_taxes(request: _request.to_h)
493476

494477
assert response.updated_at
495478

@@ -523,10 +506,7 @@ def get_test_file
523506

524507
puts "request #{_request.to_h}" if verbose?
525508

526-
response = client.catalog.update_item_modifier_lists(
527-
item_ids: _request[:item_ids],
528-
modifier_lists_to_enable: _request[:modifier_lists_to_enable]
529-
)
509+
response = client.catalog.update_item_modifier_lists(request: _request.to_h)
530510

531511
assert response.updated_at
532512

@@ -599,10 +579,7 @@ def get_test_file
599579

600580
puts "request #{_request.to_h}" if verbose?
601581

602-
response = client.catalog.object.upsert(
603-
object: _request[:object],
604-
idempotency_key: _request[:idempotency_key]
605-
)
582+
response = client.catalog.object.upsert(request: _request.to_h)
606583

607584
catalog_object = response.catalog_object
608585

@@ -633,10 +610,7 @@ def get_test_file
633610

634611
puts "create_request #{_create_request.keys}" if verbose?
635612

636-
create_resp = client.catalog.object.upsert(
637-
object: _create_request[:object],
638-
idempotency_key: _create_request[:idempotency_key]
639-
)
613+
create_resp = client.catalog.object.upsert(request: _create_request.to_h)
640614

641615
sleep(2) # Wait before retrieve
642616

‎test/square/integration/client_tests/test_customers_groups.rb‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -142,10 +142,7 @@ def delete_test_customer_group(group_id)
142142
puts "request #{_request.to_h}" if verbose?
143143

144144
assert_raises(Square::SquareError) do
145-
client.customers.groups.create(
146-
idempotency_key: _request[:idempotency_key],
147-
group: _request[:group]
148-
)
145+
client.customers.groups.create(request: _request.to_h)
149146
end
150147
end
151148
end

‎test/square/integration/client_tests/test_devices.rb‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -41,10 +41,7 @@
4141

4242
puts "request #{_request.to_h}" if verbose?
4343

44-
response = client.devices.codes.create(
45-
idempotency_key: _request[:idempotency_key],
46-
device_code: _request[:device_code]
47-
)
44+
response = client.devices.codes.create(request: _request.to_h)
4845
refute_nil response.device_code
4946
assert_equal "TERMINAL_API", response.device_code.product_type
5047

‎test/square/integration/client_tests/test_mobile.rb‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010

1111
puts "request #{_request.to_h}" if verbose?
1212

13-
response = client.mobile.authorization_code(location_id: _request[:location_id])
13+
response = client.mobile.authorization_code(request: _request.to_h)
1414
refute_nil response.authorization_code
1515
refute_nil response.expires_at
1616

‎test/square/integration/client_tests/test_orders.rb‎

Lines changed: 4 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -49,10 +49,7 @@
4949

5050
puts "request #{_request.to_h}" if verbose?
5151

52-
response = client.orders.create(
53-
idempotency_key: _request[:idempotency_key],
54-
order: _request[:order]
55-
)
52+
response = client.orders.create(request: _request.to_h)
5653
refute_nil response.order
5754
assert_equal @location_id, response.order.location_id
5855
assert_equal "New Item", response.order.line_items.first.name
@@ -123,12 +120,7 @@
123120

124121
puts "request #{_request.to_h}" if verbose?
125122

126-
response = client.orders.update(
127-
order_id: _request[:order_id],
128-
idempotency_key: _request[:idempotency_key],
129-
order: _request[:order],
130-
fields_to_clear: _request[:fields_to_clear]
131-
)
123+
response = client.orders.update(request: _request.to_h)
132124
refute_nil response.order
133125
assert_equal @order_id, response.order.id
134126
assert_equal "Updated Item", response.order.line_items.first.name
@@ -149,12 +141,7 @@
149141

150142
puts "request #{_request.to_h}" if verbose?
151143

152-
response = client.orders.pay(
153-
order_id: _request[:order_id],
154-
idempotency_key: _request[:idempotency_key],
155-
order_version: _request[:order_version],
156-
payment_ids: _request[:payment_ids]
157-
)
144+
response = client.orders.pay(request: _request.to_h)
158145
refute_nil response.order
159146
assert_equal @order_id, response.order.id
160147

@@ -183,7 +170,7 @@
183170

184171
puts "request #{_request.to_h}" if verbose?
185172

186-
response = client.orders.calculate(order: _request[:order])
173+
response = client.orders.calculate(request: _request.to_h)
187174
refute_nil response.order
188175
refute_nil response.order.total_money
189176

‎test/square/integration/client_tests/test_payments.rb‎

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -55,13 +55,7 @@
5555

5656
puts "request #{_request.to_h}" if verbose?
5757

58-
response = client.payments.create(
59-
source_id: _request[:source_id],
60-
idempotency_key: _request[:idempotency_key],
61-
amount_money: _request[:amount_money],
62-
app_fee_money: _request[:app_fee_money],
63-
autocomplete: _request[:autocomplete]
64-
)
58+
response = client.payments.create(request: _request.to_h)
6559
refute_nil response.payment
6660
assert_equal 10, response.payment.app_fee_money.amount
6761
assert_equal "USD", response.payment.app_fee_money.currency

‎test/square/integration/client_tests/test_refunds.rb‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -76,11 +76,7 @@
7676

7777
puts "request #{_request.to_h}" if verbose?
7878

79-
response = client.refunds.refund_payment(
80-
idempotency_key: _request[:idempotency_key],
81-
payment_id: _request[:payment_id],
82-
amount_money: _request[:amount_money]
83-
)
79+
response = client.refunds.refund_payment(request: _request.to_h)
8480
refute_nil response.refund
8581
assert_equal payment_response.payment.id, response.refund.payment_id
8682

‎test/square/integration/client_tests/test_team_members.rb‎

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -39,9 +39,7 @@ def create_test_team_member(location_ids)
3939

4040
puts "create_request #{_create_request.to_h}" if verbose?
4141

42-
create_members_resp = client.team_members.batch_create(
43-
team_members: _create_request[:team_members]
44-
)
42+
create_members_resp = client.team_members.batch_create(request: _create_request.to_h)
4543
refute_nil create_members_resp.team_members
4644

4745
created_member_ids = []
@@ -73,9 +71,7 @@ def create_test_team_member(location_ids)
7371

7472
puts "update_request #{_update_request.to_h}" if verbose?
7573

76-
update_team_members_resp = client.team_members.batch_update(
77-
team_members: _update_request[:team_members]
78-
)
74+
update_team_members_resp = client.team_members.batch_update(request: _update_request.to_h)
7975

8076
team_members = update_team_members_resp.team_members
8177
assert_equal 3, team_members.keys.length

‎test/square/integration/client_tests/test_terminal.rb‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -40,10 +40,7 @@
4040

4141
puts "request #{_request.to_h}" if verbose?
4242

43-
response = client.terminal.checkouts.create(
44-
idempotency_key: _request[:idempotency_key],
45-
checkout: _request[:checkout]
46-
)
43+
response = client.terminal.checkouts.create(request: _request.to_h)
4744
refute_nil response.checkout
4845
assert_equal @sandbox_device_id, response.checkout.device_options.device_id
4946
assert_equal 100, response.checkout.amount_money.amount

0 commit comments

Comments
 (0)