8000 Update tests after rebase · yikaraman/twilio-python@eb2a46b · GitHub
[go: up one dir, main page]
Skip to content

Commit eb2a46b

Browse files
skimbrelskimbrel
committed
Update tests after rebase
1 parent fc1ed8a commit eb2a46b

File tree

4 files changed

+19
-11
lines changed

4 files changed

+19
-11
lines changed

‎tests/pricing/test_numbers.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@ def test_number_countries(self, request):
2929
"GET",
3030
"{}/PhoneNumbers/Countries".format(BASE_URI),
3131
auth=AUTH,
32+
use_json_extension=False,
3233
)
3334

3435
@patch('twilio.rest.resources.base.make_twilio_request')
@@ -61,4 +62,5 @@ def test_number_country(self, request):
6162
"GET",
6263
"{}/PhoneNumbers/Countries/EE".format(BASE_URI),
6364
auth=AUTH,
65+
use_json_extension=False,
6466
)

‎tests/pricing/test_voice.py

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@ def test_voice_countries(self, request):
3232
"GET",
3333
"{}/Voice/Countries".format(BASE_URI),
3434
auth=AUTH,
35+
use_json_extension=False,
3536
)
3637

3738
@patch('twilio.rest.resources.base.make_twilio_request')
@@ -57,6 +58,7 @@ def test_voice_country(self, request):
5758
"GET",
5859
"{}/Voice/Countries/EE".format(BASE_URI),
5960
auth=AUTH,
61+
use_json_extension=False,
6062
)
6163

6264
@patch('twilio.rest.resources.base.make_twilio_request')
@@ -75,4 +77,5 @@ def test_voice_number(self, request):
7577
"GET",
7678
"{}/Voice/Numbers/+14089673429".format(BASE_URI),
7779
auth=AUTH,
80+
use_json_extension=False,
7881
)

‎twilio/rest/resources/pricing/phone_numbers.py

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
from .. import InstanceResource, ListResource
1+
from .. import NextGenInstanceResource, NextGenListResource
22

33

44
class PhoneNumbers(object):
@@ -12,7 +12,7 @@ def __init__(self, base_uri, auth, timeout):
1212
self.countries = PhoneNumberCountries(self.uri, auth, timeout)
1313

1414

15-
class PhoneNumberCountry(InstanceResource):
15+
class PhoneNumberCountry(NextGenInstanceResource):
1616
"""Pricing information for Twilio Phone Numbers in a specific country.
1717
1818
Twilio numbers are billed monthly, and the prices returned reflect
@@ -44,7 +44,7 @@ class PhoneNumberCountry(InstanceResource):
4444
id_key = "iso_country"
4545

4646

47-
class PhoneNumberCountries(ListResource):
47+
class PhoneNumberCountries(NextGenListResource):
4848
"""A list of countries where Twilio Phone Numbers are available.
4949
5050
The returned list of PhoneNumberCountry objects will not have pricing
@@ -65,7 +65,8 @@ def get(self, iso_country):
6565
return self.get_instance(iso_country)
6666

6767
def list(self):
68-
"""Retrieve the list of countries in which Twilio Number is available."""
68+
"""Retrieve the list of countries in which Twilio Numbers are
69+
available."""
6970

7071
resp, page = self.request("GET", self.uri)
7172

‎twilio/rest/resources/pricing/voice.py

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
from .. import InstanceResource, ListResource
1+
from .. import NextGenInstanceResource, NextGenListResource
22

33

44
class Voice(object):
@@ -13,7 +13,7 @@ def __init__(self, base_uri, auth, timeout):
1313
self.numbers = VoiceNumbers(self.uri, auth, timeout)
1414

1515

16-
class VoiceCountry(InstanceResource):
16+
class VoiceCountry(NextGenInstanceResource):
1717
"""Pricing information for Twilio Voice services in a specific country.
1818
1919
.. attribute:: country
@@ -55,7 +55,7 @@ class VoiceCountry(InstanceResource):
5555
id_key = "iso_country"
5656

5757

58-
class VoiceCountries(ListResource):
58+
class VoiceCountries(NextGenListResource):
5959

6060
instance = VoiceCountry
6161
key = "countries"
@@ -70,13 +70,14 @@ def get(self, iso_country):
7070
return self.get_instance(iso_country)
7171

7272
def list(self):
73-
"""Retrieve the list of countries in which Twilio Voice is available."""
73+
"""Retrieve the list of countries in which Twilio Voice is
74+
available."""
7475
resp, page = self.request("GET", self.uri)
7576

7677
return [self.load_instance(i) for i in page[self.key]]
7778

7879

79-
class VoiceNumber(InstanceResource):
80+
class VoiceNumber(NextGenInstanceResource):
8081
"""Pricing information for Twilio Voice services to and from a given
8182
phone number.
8283
@@ -94,7 +95,8 @@ class VoiceNumber(InstanceResource):
9495
9596
.. attribute:: outbound_call_price
9697
97-
A dict containing pricing information for outbound calls to this number:
98+
A dict containing pricing information for outbound calls to this
99+
number:
98100
- base_price: the base price per minute for a call to this number
99101
- current_price: the current price per minute (including discounts,
100102
etc.) for a call to this number
@@ -114,7 +116,7 @@ class VoiceNumber(InstanceResource):
114116
id_key = "number"
115117

116118

117-
class VoiceNumbers(ListResource):
119+
class VoiceNumbers(NextGenListResource):
118120

119121
instance = VoiceNumber
120122
key = "numbers"

0 commit comments

Comments
 (0)
0