Skip to content

Commit 0afdd94

Browse files
committed
tests minor enhancements
1 parent f1462ca commit 0afdd94

File tree

2 files changed

+9
-14
lines changed

2 files changed

+9
-14
lines changed

slick_reporting/app_settings.py

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,8 @@
1-
import pytz
21
from django.conf import settings
32
from django.utils.functional import lazy
43

54
import datetime
65

7-
from django.utils.timezone import now
86

97

108
def get_first_of_this_year():

tests/tests.py

Lines changed: 9 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,6 @@
3535
SimpleSales2,
3636
)
3737

38-
3938
User = get_user_model()
4039
SUPER_LOGIN = dict(username="superlogin", password="password")
4140
year = now().year
@@ -278,7 +277,7 @@ def setUpTestData(cls):
278277
price=10,
279278
flag="sales-return",
280279
)
281-
sale5 = ComplexSales.objects.create(
280+
ComplexSales.objects.create(
282281
doc_date=datetime.datetime(year, 3, 2),
283282
client=cls.client2,
284283
product=cls.product1,
@@ -454,7 +453,7 @@ def test_view_filter_to_field_set(self):
454453
)
455454
self.assertEqual(response.status_code, 200)
456455

457-
view_report_data = response.json()
456+
response.json()
458457
self.assertTrue(len(data), 2)
459458
# self.assertEqual(view_report_data['data'], data)
460459

@@ -537,6 +536,7 @@ def test_view_filter(self):
537536
columns=["slug", "name"],
538537
time_series_pattern="monthly",
539538
time_series_columns=["__total__", "__balance__"],
539+
kwargs_filters={"client_id__in": [self.client1.pk, self.client2.pk]},
540540
)
541541
data = report_generator.get_report_data()
542542
response = self.client.get(
@@ -547,34 +547,31 @@ def test_view_filter(self):
547547
HTTP_X_REQUESTED_WITH="XMLHttpRequest",
548548
)
549549
self.assertEqual(response.status_code, 200)
550-
view_report_data = response.json()
551550
self.assertTrue(len(data), 2)
552-
# self.assertEqual(view_report_data['data'], data)
551+
view_report_data = response.json()
552+
self.assertEqual(view_report_data["data"], data)
553553

554554
def test_view_filter_to_field_set(self):
555555
report_generator = ReportGenerator(
556556
report_model=SimpleSales2,
557557
date_field="doc_date",
558558
group_by="client",
559559
columns=["slug", "name"],
560-
# time_series_pattern="monthly",
561-
# time_series_columns=["__total__", "__balance__"],
560+
time_series_pattern="monthly",
561+
time_series_columns=["__total__", "__balance__"],
562562
)
563563
data = report_generator.get_report_data()
564564
response = self.client.get(
565565
reverse("report-to-field-set"),
566-
# data={
567-
# "client_id": [self.client2.name, self.client1.name],
568-
# },
569566
HTTP_X_REQUESTED_WITH="XMLHttpRequest",
570567
)
571568
self.assertEqual(response.status_code, 200)
572569

573570
self.assertTrue(len(data), 2)
574571

575-
# view_report_data = response.json()
572+
view_report_data = response.json()
576573

577-
# self.assertEqual(view_report_data['data'], data)
574+
self.assertEqual(view_report_data["data"], data)
578575

579576
def test_ajax(self):
580577
report_generator = ReportGenerator(

0 commit comments

Comments
 (0)