Skip to content

Commit 55b62b0

Browse files
author
lashnev
committed
Тесты
1 parent 0167925 commit 55b62b0

3 files changed

Lines changed: 18 additions & 6 deletions

File tree

platron/request/request_builders/recurring_set_schedule_buider.py

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
from platron.request.request_builders.request_builder import RequestBuilder
22
from platron.sdk_exception import SdkException
3+
import re
34

45

56
class RecurringSetScheduleBuilder(RequestBuilder):
@@ -38,6 +39,12 @@ def add_template(self, start_date, interval, period, max_periods=None):
3839
if max_periods != None:
3940
self.pg_template.update({'pg_max_periods': max_periods})
4041

42+
def after_xml_created(self, xml):
43+
without_middle_tags = re.sub(r'</n\d+><n\d+>', '</pg_dates><pg_dates>', xml)
44+
without_start_tags = re.sub(r'<n\d+>', '', without_middle_tags)
45+
without_end_tags = re.sub(r'</n\d+>', '', without_start_tags)
46+
return without_end_tags
47+
4148
@staticmethod
4249
def __get_intervals():
4350
return {'day': True, 'week': True, 'month': True}

tests/integration/receipt_test.py

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,15 +10,20 @@
1010
class ReceiptTest(BaseIntegrationTest):
1111

1212
def test_create_transaction_chain(self):
13-
builder = InitPaymentBuilder('10.00', 'test')
13+
builder = InitPaymentBuilder('50.00', 'test')
1414
client = PostClient(self.get_merchant_id(), self.get_secret_key())
1515
result = client.request(builder)
1616
root = fromstring(result)
1717
pg_payment_id = root.find('pg_payment_id').text
1818

1919
builder = ReceiptBuilder('payment', pg_payment_id)
20+
builder.add_additional_payment('credit', '20')
21+
2022
receipt_item1 = Item('test', '10.00', '1')
23+
receipt_item1.add_agent('commissionaire', 'test agent', '123456789012', '79050000000')
2124
receipt_item2 = Item('test2', '20.00', '1')
25+
receipt_item2.add_agent('commissionaire', 'test agent', '123456789012', '79050000000')
26+
2227
builder.add_item(receipt_item1)
2328
builder.add_item(receipt_item2)
2429

tests/unit/request/request_builders/recurring_set_schedule_builder_test.py

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,19 +7,19 @@ class RecurringSetScheduleBuilderTest(unittest.TestCase):
77

88
def test_get_params(self):
99
builder = RecurringSetScheduleBuilder('12345', '100')
10-
builder.add_template('2018-01-01', 'week', '10', '100')
11-
builder.add_dates({'1': '2018-10-10', '2': '2019-10-10'})
10+
builder.add_template('2018-01-01 00:00:00', 'week', '10', '100')
11+
builder.add_dates({'1': '2018-10-10 00:00:00', '2': '2019-10-10 00:00:00'})
1212

1313
params = builder.get_params()
1414
template = params.get('pg_template')
1515
dates = params.get('pg_dates')
1616

1717
self.assertEquals('12345', params.get('pg_recurring_profile'))
18-
self.assertEquals('2018-01-01', template.get('pg_start_date'))
18+
self.assertEquals('2018-01-01 00:00:00', template.get('pg_start_date'))
1919
self.assertEquals('week', template.get('pg_interval'))
2020
self.assertEquals('10', template.get('pg_period'))
2121
self.assertEquals('100', template.get('pg_max_periods'))
22-
self.assertEquals('2018-10-10', dates.get('1'));
22+
self.assertEquals('2018-10-10 00:00:00', dates.get('1'));
2323

2424
with self.assertRaises(SdkException):
25-
builder.add_template('2018-01-01', 'wrong_interval', '10', '100')
25+
builder.add_template('2018-01-01 00:00:00', 'wrong_interval', '10', '100')

0 commit comments

Comments
 (0)