Skip to content

Commit d787651

Browse files
authored
Merge pull request #613 from recurly/account_time_zone
Add `preferred_time_zone` to Account
2 parents 1e0e6bc + 835715b commit d787651

File tree

7 files changed

+19
-7
lines changed

7 files changed

+19
-7
lines changed

.github/workflows/ci.yml

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,20 @@
11
name: CI
22
on: [push]
3-
concurrency:
3+
concurrency:
44
group: ${{ github.ref }}
55
cancel-in-progress: true
66
jobs:
77
build:
8-
runs-on: ubuntu-latest
8+
runs-on: ${{ matrix.os }}
99
name: Python ${{ matrix.python }} tests
1010
strategy:
1111
matrix:
12-
python: [2.7, 3.6, 3.7, 3.8, 3.9]
12+
python: [2.7, 3.7, 3.8, 3.9]
13+
os: [ubuntu-latest]
14+
include:
15+
# Python 3.6 is not included in ubuntu latest (currently 22)
16+
- python: 3.6
17+
os: ubuntu-20.04
1318
steps:
1419
- uses: actions/checkout@v3
1520
- name: Setup python

recurly/__init__.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -191,6 +191,7 @@ class Account(Resource):
191191
'has_paused_subscription',
192192
'has_past_due_invoice',
193193
'preferred_locale',
194+
'preferred_time_zone',
194195
'custom_fields',
195196
'transaction_type',
196197
'dunning_campaign_id',

tests/fixtures/account/child-accounts.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@ Content-Type: application/xml; charset=utf-8
3030
<company_name nil="nil"></company_name>
3131
<vat_number nil="nil"></vat_number>
3232
<preferred_locale nil="nil"></preferred_locale>
33+
<preferred_time_zone nil="nil"></preferred_time_zone>
3334
<address>
3435
<address1 nil="nil"></address1>
3536
<address2 nil="nil"></address2>

tests/fixtures/account/created-with-parent.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,4 +44,5 @@ Location: https://api.recurly.com/v2/accounts/testmock
4444
</address>
4545
<accept_language nil="nil"></accept_language>
4646
<preferred_locale>en-US</preferred_locale>
47+
<preferred_time_zone nil="nil"></preferred_time_zone>
4748
</account>

tests/fixtures/account/created.xml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ Content-Type: application/xml; charset=utf-8
99
<account>
1010
<account_code>testmock</account_code>
1111
<preferred_locale>en-US</preferred_locale>
12+
<preferred_time_zone>America/Los_Angeles</preferred_time_zone>
1213
<vat_number>444444-UK</vat_number>
1314
</account>
1415

@@ -43,4 +44,5 @@ Location: https://api.recurly.com/v2/accounts/testmock
4344
<accept_language nil="nil"></accept_language>
4445
<vat_location_enabled type="boolean">true</vat_location_enabled>
4546
<preferred_locale>en-US</preferred_locale>
47+
<preferred_time_zone>America/Los_Angeles</preferred_time_zone>
4648
</account>

tests/fixtures/billing-info/account-becs-created.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,7 @@ Location: https://api.recurly.com/v2/accounts/binfo-mock-5
4747
<company_name nil="nil"></company_name>
4848
<vat_number nil="nil"></vat_number>
4949
<preferred_locale nil="nil"></preferred_locale>
50+
<preferred_time_zone nil="nil"></preferred_time_zone>
5051
<address>
5152
<address1 nil="nil"></address1>
5253
<address2 nil="nil"></address2>

tests/test_resources.py

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -303,6 +303,7 @@ def test_account(self):
303303
account = Account(account_code=account_code)
304304
account.vat_number = '444444-UK'
305305
account.preferred_locale = 'en-US'
306+
account.preferred_time_zone = 'America/Los_Angeles'
306307
with self.mock_request('account/created.xml'):
307308
account.save()
308309
self.assertEqual(account._url, urljoin(recurly.base_uri(), 'accounts/%s' % account_code))
@@ -1286,7 +1287,7 @@ def test_account_entitlements(self):
12861287
'https://api.recurly.com/v2/subscriptions/rhind9aehvrt',
12871288
'https://api.recurly.com/v2/external_subscriptions/rlhjggnogtc5'
12881289
])
1289-
1290+
12901291
def test_invoice_templates(self):
12911292
with self.mock_request('invoice_templates/list.xml'):
12921293
template = InvoiceTemplate.all()[0]
@@ -2795,7 +2796,7 @@ def test_list_external_subscriptions(self):
27952796

27962797
with self.mock_request('external-subscription/list.xml'):
27972798
external_subscriptions = ExternalSubscription.all(per_page = 200)
2798-
2799+
27992800
self.assertEqual(len(external_subscriptions), 2)
28002801

28012802
self.assertEqual(external_subscriptions[0].external_resource.external_object_reference, 'teste')
@@ -2824,7 +2825,7 @@ def test_get_external_subscription(self):
28242825

28252826
with self.mock_request('external-subscription/get.xml'):
28262827
external_subscription = ExternalSubscription.get('ru2208s6hmf0')
2827-
2828+
28282829
self.assertEqual(external_subscription.external_resource.external_object_reference, 'teste')
28292830
self.assertEqual(external_subscription.external_product_reference, None)
28302831
self.assertEqual(external_subscription.last_purchased, None)
@@ -2899,7 +2900,7 @@ def test_get_external_product(self):
28992900

29002901
with self.mock_request('external-product/get.xml'):
29012902
external_product = ExternalProduct.get('ru1u1gms4msk')
2902-
2903+
29032904
self.assertEqual(external_product.plan.plan_code, '5_abril')
29042905
self.assertEqual(external_product.plan.name, '5 de abril')
29052906
self.assertEqual(external_product.name, 'product_name_teste')

0 commit comments

Comments
 (0)