Skip to content

Commit 6a0b741

Browse files
committed
Merge branch 'master' of github.com:CuriousLearner/django-phone-verify into kavenegar-api
2 parents e4532ba + 5a1aad2 commit 6a0b741

File tree

8 files changed

+299
-303
lines changed

8 files changed

+299
-303
lines changed

conftest.py

Lines changed: 22 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,20 @@
66
"""
77

88
# Standard Library
9+
import copy
910
import functools
1011

11-
import django
12-
1312
# Third Party Stuff
1413
import pytest
14+
import django
1515
from django.conf import settings
1616

17+
from tests import test_settings
18+
19+
backends = {"twilio.TwilioBackend", "nexmo.NexmoBackend", "kavenegar.KavenegarBackend"}
20+
sandbox_backends = {"twilio.TwilioSandboxBackend", "nexmo.NexmoSandboxBackend"}
21+
all_backends = list(backends) + list(sandbox_backends)
22+
1723

1824
class PartialMethodCaller:
1925
def __init__(self, obj, **partial_params):
@@ -48,6 +54,20 @@ def json(self):
4854
return _Client()
4955

5056

57+
@pytest.fixture(params=all_backends)
58+
def backend(request):
59+
phone_verification_settings = copy.deepcopy(
60+
test_settings.DJANGO_SETTINGS.get("PHONE_VERIFICATION")
61+
)
62+
phone_verification_settings["BACKEND"] = f"phone_verify.backends.{request.param}"
63+
if (
64+
request.param == "nexmo.NexmoSandboxBackend"
65+
or request.param == "nexmo.NexmoBackend"
66+
):
67+
phone_verification_settings["OPTIONS"]["KEY"] = "fake"
68+
return phone_verification_settings
69+
70+
5171
def pytest_configure():
5272
from tests import test_settings
5373

phone_verify/backends/nexmo.py

Lines changed: 2 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010

1111

1212
class NexmoBackend(BaseBackend):
13-
1413
def __init__(self, **options):
1514
super().__init__(**options)
1615

@@ -23,11 +22,7 @@ def __init__(self, **options):
2322
self.client = nexmo.Client(key=self._key, secret=self._secret)
2423

2524
def send_sms(self, number, message):
26-
self.client.send_message({
27-
'from': self._from,
28-
'to': number,
29-
'text': message,
30-
})
25+
self.client.send_message({"from": self._from, "to": number, "text": message})
3126

3227
def send_bulk_sms(self, numbers, message):
3328
for number in numbers:
@@ -47,11 +42,7 @@ def __init__(self, **options):
4742
self.client = nexmo.Client(key=self._key, secret=self._secret)
4843

4944
def send_sms(self, number, message):
50-
self.client.send_message({
51-
'from': self._from,
52-
'to': number,
53-
'text': message,
54-
})
45+
self.client.send_message({"from": self._from, "to": number, "text": message})
5546

5647
def send_bulk_sms(self, numbers, message):
5748
for number in numbers:

tests/__init__.py

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1 @@
11
# -*- coding: utf-8 -*-
2-
BACKEND_SERVICES = [
3-
("phone_verify.backends.twilio.TwilioBackend", "twilio.rest.Client"),
4-
('phone_verify.backends.kavenegar.KavenegarBackend', "kavenegar.KavenegarAPI")
5-
]

0 commit comments

Comments
 (0)