From efc6b6e480e55478fa309adf84d5ccb26b336107 Mon Sep 17 00:00:00 2001 From: Raphael Michel Date: Tue, 27 Sep 2016 10:49:39 +0200 Subject: [PATCH] Resolved various warnings, upgrade bootstrap3 --- src/pretix/control/views/item.py | 3 +- src/pretix/control/views/orders.py | 2 +- src/requirements/production.txt | 2 +- src/tests/base/__init__.py | 4 +- src/tests/base/test_cache.py | 4 +- src/tests/plugins/banktransfer/test_import.py | 2 +- src/tests/presale/test_cart.py | 60 ++++++++--------- src/tests/presale/test_checkout.py | 66 +++++++++---------- src/tests/presale/test_orders.py | 14 ++-- 9 files changed, 79 insertions(+), 78 deletions(-) diff --git a/src/pretix/control/views/item.py b/src/pretix/control/views/item.py index 10b1637c62..7a29bf09d6 100644 --- a/src/pretix/control/views/item.py +++ b/src/pretix/control/views/item.py @@ -394,7 +394,8 @@ class QuestionView(EventPermissionRequiredMixin, QuestionMixin, ChartContainingV if self.request.GET.get("status", "") != "": s = self.request.GET.get("status", "") if s == 'o': - qs = qs.filter(orderposition__order__status=Order.STATUS_PENDING, expires__lt=now().date()) + qs = qs.filter(orderposition__order__status=Order.STATUS_PENDING, + expires__lt=now().replace(hour=0, minute=0, second=0)) elif s == 'ne': qs = qs.filter(orderposition__order__status__in=[Order.STATUS_PENDING, Order.STATUS_EXPIRED]) else: diff --git a/src/pretix/control/views/orders.py b/src/pretix/control/views/orders.py index 78191140f8..065766e255 100644 --- a/src/pretix/control/views/orders.py +++ b/src/pretix/control/views/orders.py @@ -59,7 +59,7 @@ class OrderList(EventPermissionRequiredMixin, ListView): if self.request.GET.get("status", "") != "": s = self.request.GET.get("status", "") if s == 'o': - qs = qs.filter(status=Order.STATUS_PENDING, expires__lt=now().date()) + qs = qs.filter(status=Order.STATUS_PENDING, expires__lt=now().replace(hour=0, minute=0, second=0)) elif s == 'ne': qs = qs.filter(status__in=[Order.STATUS_PENDING, Order.STATUS_EXPIRED]) else: diff --git a/src/requirements/production.txt b/src/requirements/production.txt index d61b93a0d1..57fcd5f3dd 100644 --- a/src/requirements/production.txt +++ b/src/requirements/production.txt @@ -2,7 +2,7 @@ Django>=1.10,<1.11 python-dateutil pytz -django-bootstrap3>=6.2,<6.3 +django-bootstrap3>=7.1,<7.2 git+https://github.com/pretix/django-formset-js.git@master#egg=django-formset-js django-compressor==2.1 reportlab>=3.2,<3.3 diff --git a/src/tests/base/__init__.py b/src/tests/base/__init__.py index a66cacd94c..cf9882c504 100644 --- a/src/tests/base/__init__.py +++ b/src/tests/base/__init__.py @@ -6,12 +6,12 @@ class SoupTest(TestCase): def get_doc(self, *args, **kwargs): response = self.client.get(*args, **kwargs) - return BeautifulSoup(response.rendered_content) + return BeautifulSoup(response.rendered_content, "lxml") def post_doc(self, *args, **kwargs): kwargs['follow'] = True response = self.client.post(*args, **kwargs) - return BeautifulSoup(response.rendered_content) + return BeautifulSoup(response.rendered_content, "lxml") def extract_form_fields(soup): diff --git a/src/tests/base/test_cache.py b/src/tests/base/test_cache.py index 77b2217acc..41d2311695 100644 --- a/src/tests/base/test_cache.py +++ b/src/tests/base/test_cache.py @@ -33,7 +33,7 @@ class CacheTest(TestCase): def test_longkey(self): self.cache.set(self.testkey * 100, "foo") - self.assertEquals(self.cache.get(self.testkey * 100), "foo") + self.assertEqual(self.cache.get(self.testkey * 100), "foo") def test_invalidation(self): self.cache.set(self.testkey, "foo") @@ -46,4 +46,4 @@ class CacheTest(TestCase): 'b': 'bar', } self.cache.set_many(inp) - self.assertEquals(inp, self.cache.get_many(inp.keys())) + self.assertEqual(inp, self.cache.get_many(inp.keys())) diff --git a/src/tests/plugins/banktransfer/test_import.py b/src/tests/plugins/banktransfer/test_import.py index ec39d9b429..64c821a3c0 100644 --- a/src/tests/plugins/banktransfer/test_import.py +++ b/src/tests/plugins/banktransfer/test_import.py @@ -67,7 +67,7 @@ Buchungstag;Valuta;Buchungstext;Auftraggeber / Empfänger;Verwendungszweck;Betra r = client.post('/control/event/dummy/dummy/banktransfer/import/', { 'file': file }) - doc = BeautifulSoup(r.content) + doc = BeautifulSoup(r.content, "lxml") assert r.status_code == 200 assert len(doc.select("input[name=date]")) > 0 data = { diff --git a/src/tests/presale/test_cart.py b/src/tests/presale/test_cart.py index 34424c1e4a..de8f2bb660 100644 --- a/src/tests/presale/test_cart.py +++ b/src/tests/presale/test_cart.py @@ -46,7 +46,7 @@ class CartTest(CartTestMixin, TestCase): }, follow=True) self.assertRedirects(response, '/%s/%s/' % (self.orga.slug, self.event.slug), target_status_code=200) - doc = BeautifulSoup(response.rendered_content) + doc = BeautifulSoup(response.rendered_content, "lxml") self.assertIn('Early-bird', doc.select('.cart .cart-row')[0].select('strong')[0].text) self.assertIn('1', doc.select('.cart .cart-row')[0].select('.count')[0].text) self.assertIn('23', doc.select('.cart .cart-row')[0].select('.price')[0].text) @@ -66,7 +66,7 @@ class CartTest(CartTestMixin, TestCase): }, follow=True) self.assertRedirects(response, '/%s/%s/' % (self.orga.slug, self.event.slug), target_status_code=200) - doc = BeautifulSoup(response.rendered_content) + doc = BeautifulSoup(response.rendered_content, "lxml") self.assertIn('Early-bird', doc.select('.cart .cart-row')[0].select('strong')[0].text) self.assertIn('1', doc.select('.cart .cart-row')[0].select('.count')[0].text) self.assertIn('24', doc.select('.cart .cart-row')[0].select('.price')[0].text) @@ -86,7 +86,7 @@ class CartTest(CartTestMixin, TestCase): }, follow=True) self.assertRedirects(response, '/%s/%s/' % (self.orga.slug, self.event.slug), target_status_code=200) - doc = BeautifulSoup(response.rendered_content) + doc = BeautifulSoup(response.rendered_content, "lxml") self.assertIn('Early-bird', doc.select('.cart .cart-row')[0].select('strong')[0].text) self.assertIn('1', doc.select('.cart .cart-row')[0].select('.count')[0].text) self.assertIn('23', doc.select('.cart .cart-row')[0].select('.price')[0].text) @@ -106,7 +106,7 @@ class CartTest(CartTestMixin, TestCase): }, follow=True) self.assertRedirects(response, '/%s/%s/' % (self.orga.slug, self.event.slug), target_status_code=200) - doc = BeautifulSoup(response.rendered_content) + doc = BeautifulSoup(response.rendered_content, "lxml") self.assertIn('Early-bird', doc.select('.cart .cart-row')[0].select('strong')[0].text) self.assertIn('1', doc.select('.cart .cart-row')[0].select('.count')[0].text) self.assertIn('23', doc.select('.cart .cart-row')[0].select('.price')[0].text) @@ -134,7 +134,7 @@ class CartTest(CartTestMixin, TestCase): }, follow=True) self.assertRedirects(response, '/%s/%s/' % (self.orga.slug, self.event.slug), target_status_code=200) - doc = BeautifulSoup(response.rendered_content) + doc = BeautifulSoup(response.rendered_content, "lxml") self.assertIn('Shirt', doc.select('.cart .cart-row')[0].select('strong')[0].text) self.assertIn('Red', doc.select('.cart .cart-row')[0].text) self.assertIn('1', doc.select('.cart .cart-row')[0].select('.count')[0].text) @@ -155,7 +155,7 @@ class CartTest(CartTestMixin, TestCase): }, follow=True) self.assertRedirects(response, '/%s/%s/' % (self.orga.slug, self.event.slug), target_status_code=200) - doc = BeautifulSoup(response.rendered_content) + doc = BeautifulSoup(response.rendered_content, "lxml") self.assertIn('Shirt', doc.select('.cart .cart-row')[0].select('strong')[0].text) self.assertIn('Red', doc.select('.cart .cart-row')[0].text) self.assertIn('1', doc.select('.cart .cart-row')[0].select('.count')[0].text) @@ -173,7 +173,7 @@ class CartTest(CartTestMixin, TestCase): }, follow=True) self.assertRedirects(response, '/%s/%s/' % (self.orga.slug, self.event.slug), target_status_code=200) - doc = BeautifulSoup(response.rendered_content) + doc = BeautifulSoup(response.rendered_content, "lxml") self.assertIn('Early-bird', doc.select('.cart .cart-row')[0].select('strong')[0].text) self.assertIn('2', doc.select('.cart .cart-row')[0].select('.count')[0].text) self.assertIn('23', doc.select('.cart .cart-row')[0].select('.price')[0].text) @@ -192,7 +192,7 @@ class CartTest(CartTestMixin, TestCase): }, follow=True) self.assertRedirects(response, '/%s/%s/' % (self.orga.slug, self.event.slug), target_status_code=200) - doc = BeautifulSoup(response.rendered_content) + doc = BeautifulSoup(response.rendered_content, "lxml") self.assertIn('Early-bird', doc.select('.cart')[0].text) self.assertIn('Shirt', doc.select('.cart')[0].text) objs = list(CartPosition.objects.filter(cart_id=self.session_key, event=self.event)) @@ -207,7 +207,7 @@ class CartTest(CartTestMixin, TestCase): }, follow=True) self.assertRedirects(response, '/%s/%s/' % (self.orga.slug, self.event.slug), target_status_code=200) - doc = BeautifulSoup(response.rendered_content) + doc = BeautifulSoup(response.rendered_content, "lxml") self.assertIn('numbers only', doc.select('.alert-danger')[0].text) self.assertFalse(CartPosition.objects.filter(cart_id=self.session_key, event=self.event).exists()) @@ -216,7 +216,7 @@ class CartTest(CartTestMixin, TestCase): }, follow=True) self.assertRedirects(response, '/%s/%s/' % (self.orga.slug, self.event.slug), target_status_code=200) - doc = BeautifulSoup(response.rendered_content) + doc = BeautifulSoup(response.rendered_content, "lxml") self.assertIn('numbers only', doc.select('.alert-danger')[0].text) self.assertFalse(CartPosition.objects.filter(cart_id=self.session_key, event=self.event).exists()) response = self.client.post('/%s/%s/cart/add' % (self.orga.slug, self.event.slug), { @@ -224,7 +224,7 @@ class CartTest(CartTestMixin, TestCase): }, follow=True) self.assertRedirects(response, '/%s/%s/' % (self.orga.slug, self.event.slug), target_status_code=200) - doc = BeautifulSoup(response.rendered_content) + doc = BeautifulSoup(response.rendered_content, "lxml") self.assertIn('numbers only', doc.select('.alert-danger')[0].text) self.assertFalse(CartPosition.objects.filter(cart_id=self.session_key, event=self.event).exists()) @@ -233,7 +233,7 @@ class CartTest(CartTestMixin, TestCase): }, follow=True) self.assertRedirects(response, '/%s/%s/' % (self.orga.slug, self.event.slug), target_status_code=200) - doc = BeautifulSoup(response.rendered_content) + doc = BeautifulSoup(response.rendered_content, "lxml") self.assertIn('numbers only', doc.select('.alert-danger')[0].text) self.assertFalse(CartPosition.objects.filter(cart_id=self.session_key, event=self.event).exists()) @@ -241,7 +241,7 @@ class CartTest(CartTestMixin, TestCase): }, follow=True) self.assertRedirects(response, '/%s/%s/' % (self.orga.slug, self.event.slug), target_status_code=200) - doc = BeautifulSoup(response.rendered_content) + doc = BeautifulSoup(response.rendered_content, "lxml") self.assertIn('did not select any products', doc.select('.alert-warning')[0].text) self.assertFalse(CartPosition.objects.filter(cart_id=self.session_key, event=self.event).exists()) @@ -256,7 +256,7 @@ class CartTest(CartTestMixin, TestCase): }, follow=True) self.assertRedirects(response, '/%s/%s/' % (self.orga.slug, self.event.slug), target_status_code=200) - doc = BeautifulSoup(response.rendered_content) + doc = BeautifulSoup(response.rendered_content, "lxml") self.assertIn('not available', doc.select('.alert-danger')[0].text) self.assertFalse(CartPosition.objects.filter(cart_id=self.session_key, event=self.event).exists()) @@ -267,7 +267,7 @@ class CartTest(CartTestMixin, TestCase): }, follow=True) self.assertRedirects(response, '/%s/%s/' % (self.orga.slug, self.event.slug), target_status_code=200) - doc = BeautifulSoup(response.rendered_content) + doc = BeautifulSoup(response.rendered_content, "lxml") self.assertIn('no longer available', doc.select('.alert-danger')[0].text) self.assertFalse(CartPosition.objects.filter(cart_id=self.session_key, event=self.event).exists()) @@ -307,7 +307,7 @@ class CartTest(CartTestMixin, TestCase): }, follow=True) self.assertRedirects(response, '/%s/%s/' % (self.orga.slug, self.event.slug), target_status_code=200) - doc = BeautifulSoup(response.rendered_content) + doc = BeautifulSoup(response.rendered_content, "lxml") self.assertIn('more than', doc.select('.alert-danger')[0].text) self.assertEqual(CartPosition.objects.filter(cart_id=self.session_key, event=self.event).count(), 1) @@ -319,7 +319,7 @@ class CartTest(CartTestMixin, TestCase): }, follow=True) self.assertRedirects(response, '/%s/%s/' % (self.orga.slug, self.event.slug), target_status_code=200) - doc = BeautifulSoup(response.rendered_content) + doc = BeautifulSoup(response.rendered_content, "lxml") self.assertIn('no longer available', doc.select('.alert-danger')[0].text) self.assertFalse(CartPosition.objects.filter(cart_id=self.session_key, event=self.event).exists()) @@ -331,7 +331,7 @@ class CartTest(CartTestMixin, TestCase): }, follow=True) self.assertRedirects(response, '/%s/%s/' % (self.orga.slug, self.event.slug), target_status_code=200) - doc = BeautifulSoup(response.rendered_content) + doc = BeautifulSoup(response.rendered_content, "lxml") self.assertIn('no longer available', doc.select('.alert-danger')[0].text) self.assertIn('Early-bird', doc.select('.cart .cart-row')[0].select('strong')[0].text) self.assertIn('1', doc.select('.cart .cart-row')[0].select('.count')[0].text) @@ -396,7 +396,7 @@ class CartTest(CartTestMixin, TestCase): response = self.client.post('/%s/%s/cart/add' % (self.orga.slug, self.event.slug), { 'item_%d' % self.ticket.id: '1', }, follow=True) - doc = BeautifulSoup(response.rendered_content) + doc = BeautifulSoup(response.rendered_content, "lxml") self.assertIn('no longer available', doc.select('.alert-danger')[0].text) self.assertFalse(CartPosition.objects.filter(id=cp1.id).exists()) @@ -408,7 +408,7 @@ class CartTest(CartTestMixin, TestCase): response = self.client.post('/%s/%s/cart/remove' % (self.orga.slug, self.event.slug), { 'item_%d' % self.ticket.id: '1', }, follow=True) - doc = BeautifulSoup(response.rendered_content) + doc = BeautifulSoup(response.rendered_content, "lxml") self.assertIn('updated', doc.select('.alert-success')[0].text) self.assertFalse(CartPosition.objects.filter(cart_id=self.session_key, event=self.event).exists()) @@ -420,7 +420,7 @@ class CartTest(CartTestMixin, TestCase): response = self.client.post('/%s/%s/cart/remove' % (self.orga.slug, self.event.slug), { 'variation_%d_%d' % (self.shirt.id, self.shirt_red.id): '1', }, follow=True) - doc = BeautifulSoup(response.rendered_content) + doc = BeautifulSoup(response.rendered_content, "lxml") self.assertIn('updated', doc.select('.alert-success')[0].text) self.assertFalse(CartPosition.objects.filter(cart_id=self.session_key, event=self.event).exists()) @@ -436,7 +436,7 @@ class CartTest(CartTestMixin, TestCase): response = self.client.post('/%s/%s/cart/remove' % (self.orga.slug, self.event.slug), { 'item_%d' % self.ticket.id: '1', }, follow=True) - doc = BeautifulSoup(response.rendered_content) + doc = BeautifulSoup(response.rendered_content, "lxml") self.assertIn('updated', doc.select('.alert-success')[0].text) self.assertEqual(CartPosition.objects.filter(cart_id=self.session_key, event=self.event).count(), 1) @@ -452,7 +452,7 @@ class CartTest(CartTestMixin, TestCase): response = self.client.post('/%s/%s/cart/remove' % (self.orga.slug, self.event.slug), { 'item_%d' % self.ticket.id: '2', }, follow=True) - doc = BeautifulSoup(response.rendered_content) + doc = BeautifulSoup(response.rendered_content, "lxml") self.assertIn('updated', doc.select('.alert-success')[0].text) self.assertFalse(CartPosition.objects.filter(cart_id=self.session_key, event=self.event).exists()) @@ -468,7 +468,7 @@ class CartTest(CartTestMixin, TestCase): response = self.client.post('/%s/%s/cart/remove' % (self.orga.slug, self.event.slug), { 'item_%d' % self.ticket.id: '1', }, follow=True) - doc = BeautifulSoup(response.rendered_content) + doc = BeautifulSoup(response.rendered_content, "lxml") self.assertIn('updated', doc.select('.alert-success')[0].text) objs = list(CartPosition.objects.filter(cart_id=self.session_key, event=self.event)) self.assertEqual(len(objs), 1) @@ -559,7 +559,7 @@ class CartTest(CartTestMixin, TestCase): response = self.client.post('/%s/%s/cart/add' % (self.orga.slug, self.event.slug), { 'item_%d_voucher' % self.ticket.id: v.code, }, follow=True) - doc = BeautifulSoup(response.rendered_content) + doc = BeautifulSoup(response.rendered_content, "lxml") self.assertIn('already been used', doc.select('.alert-danger')[0].text) self.assertFalse(CartPosition.objects.filter(cart_id=self.session_key, event=self.event).exists()) @@ -569,7 +569,7 @@ class CartTest(CartTestMixin, TestCase): response = self.client.post('/%s/%s/cart/add' % (self.orga.slug, self.event.slug), { 'item_%d_voucher' % self.ticket.id: v.code, }, follow=True) - doc = BeautifulSoup(response.rendered_content) + doc = BeautifulSoup(response.rendered_content, "lxml") self.assertIn('expired', doc.select('.alert-danger')[0].text) self.assertFalse(CartPosition.objects.filter(cart_id=self.session_key, event=self.event).exists()) @@ -577,7 +577,7 @@ class CartTest(CartTestMixin, TestCase): response = self.client.post('/%s/%s/cart/add' % (self.orga.slug, self.event.slug), { 'item_%d_voucher' % self.ticket.id: 'ABC', }, follow=True) - doc = BeautifulSoup(response.rendered_content) + doc = BeautifulSoup(response.rendered_content, "lxml") self.assertIn('not known', doc.select('.alert-danger')[0].text) self.assertFalse(CartPosition.objects.filter(cart_id=self.session_key, event=self.event).exists()) @@ -588,7 +588,7 @@ class CartTest(CartTestMixin, TestCase): response = self.client.post('/%s/%s/cart/add' % (self.orga.slug, self.event.slug), { 'item_%d_voucher' % self.ticket.id: v.code, }, follow=True) - doc = BeautifulSoup(response.rendered_content) + doc = BeautifulSoup(response.rendered_content, "lxml") self.assertIn('no longer available', doc.select('.alert-danger')[0].text) self.assertFalse(CartPosition.objects.filter(cart_id=self.session_key, event=self.event).exists()) @@ -614,7 +614,7 @@ class CartTest(CartTestMixin, TestCase): response = self.client.post('/%s/%s/cart/add' % (self.orga.slug, self.event.slug), { 'item_%d' % self.ticket.id: '1', }, follow=True) - doc = BeautifulSoup(response.rendered_content) + doc = BeautifulSoup(response.rendered_content, "lxml") self.assertIn('no longer available', doc.select('.alert-danger')[0].text) self.assertFalse(CartPosition.objects.filter(cart_id=self.session_key, event=self.event).exists()) response = self.client.post('/%s/%s/cart/add' % (self.orga.slug, self.event.slug), { @@ -640,7 +640,7 @@ class CartTest(CartTestMixin, TestCase): response = self.client.post('/%s/%s/cart/add' % (self.orga.slug, self.event.slug), { 'item_%d_voucher' % self.ticket.id: v.code, }, follow=True) - doc = BeautifulSoup(response.rendered_content) + doc = BeautifulSoup(response.rendered_content, "lxml") self.assertIn('already used', doc.select('.alert-danger')[0].text) self.assertEqual(1, CartPosition.objects.filter(cart_id=self.session_key, event=self.event).count()) diff --git a/src/tests/presale/test_checkout.py b/src/tests/presale/test_checkout.py index 1dddeb9bee..8cae4fc703 100644 --- a/src/tests/presale/test_checkout.py +++ b/src/tests/presale/test_checkout.py @@ -60,7 +60,7 @@ class CheckoutTestCase(TestCase): price=20, expires=now() + timedelta(minutes=10) ) response = self.client.get('/%s/%s/checkout/questions/' % (self.orga.slug, self.event.slug), follow=True) - doc = BeautifulSoup(response.rendered_content) + doc = BeautifulSoup(response.rendered_content, "lxml") self.assertEqual(len(doc.select('input[name=%s-question_%s]' % (cr1.id, q1.id))), 1) self.assertEqual(len(doc.select('input[name=%s-question_%s]' % (cr2.id, q1.id))), 1) @@ -75,7 +75,7 @@ class CheckoutTestCase(TestCase): '%s-question_%s' % (cr2.id, q2.id): '', 'email': 'admin@localhost' }, follow=True) - doc = BeautifulSoup(response.rendered_content) + doc = BeautifulSoup(response.rendered_content, "lxml") self.assertGreaterEqual(len(doc.select('.has-error')), 1) # Corrected request @@ -104,7 +104,7 @@ class CheckoutTestCase(TestCase): price=23, expires=now() + timedelta(minutes=10) ) response = self.client.get('/%s/%s/checkout/questions/' % (self.orga.slug, self.event.slug), follow=True) - doc = BeautifulSoup(response.rendered_content) + doc = BeautifulSoup(response.rendered_content, "lxml") self.assertEqual(len(doc.select('input[name=%s-attendee_name]' % cr1.id)), 1) # Not all required fields filled out, expect failure @@ -112,7 +112,7 @@ class CheckoutTestCase(TestCase): '%s-attendee_name' % cr1.id: '', 'email': 'admin@localhost' }, follow=True) - doc = BeautifulSoup(response.rendered_content) + doc = BeautifulSoup(response.rendered_content, "lxml") self.assertGreaterEqual(len(doc.select('.has-error')), 1) # Corrected request @@ -134,7 +134,7 @@ class CheckoutTestCase(TestCase): price=23, expires=now() + timedelta(minutes=10) ) response = self.client.get('/%s/%s/checkout/questions/' % (self.orga.slug, self.event.slug), follow=True) - doc = BeautifulSoup(response.rendered_content) + doc = BeautifulSoup(response.rendered_content, "lxml") self.assertEqual(len(doc.select('input[name=%s-attendee_name]' % cr1.id)), 1) # Not all fields filled out, expect success @@ -157,7 +157,7 @@ class CheckoutTestCase(TestCase): price=23, expires=now() + timedelta(minutes=10) ) response = self.client.get('/%s/%s/checkout/payment/' % (self.orga.slug, self.event.slug), follow=True) - doc = BeautifulSoup(response.rendered_content) + doc = BeautifulSoup(response.rendered_content, "lxml") self.assertEqual(len(doc.select('input[name=payment]')), 2) response = self.client.post('/%s/%s/checkout/payment/' % (self.orga.slug, self.event.slug), { 'payment': 'banktransfer' @@ -227,7 +227,7 @@ class CheckoutTestCase(TestCase): self._set_session('payment', 'banktransfer') response = self.client.post('/%s/%s/checkout/confirm/' % (self.orga.slug, self.event.slug), follow=True) - doc = BeautifulSoup(response.rendered_content) + doc = BeautifulSoup(response.rendered_content, "lxml") self.assertEqual(len(doc.select(".thank-you")), 1) self.assertFalse(CartPosition.objects.filter(id=cr1.id).exists()) self.assertEqual(Order.objects.count(), 1) @@ -242,7 +242,7 @@ class CheckoutTestCase(TestCase): self._set_session('payment', 'banktransfer') response = self.client.post('/%s/%s/checkout/confirm/' % (self.orga.slug, self.event.slug), follow=True) - doc = BeautifulSoup(response.rendered_content) + doc = BeautifulSoup(response.rendered_content, "lxml") self.assertEqual(len(doc.select(".thank-you")), 1) self.assertFalse(CartPosition.objects.filter(id=cr1.id).exists()) self.assertEqual(Order.objects.count(), 1) @@ -256,7 +256,7 @@ class CheckoutTestCase(TestCase): self._set_session('payment', 'banktransfer') response = self.client.post('/%s/%s/checkout/confirm/' % (self.orga.slug, self.event.slug), follow=True) - doc = BeautifulSoup(response.rendered_content) + doc = BeautifulSoup(response.rendered_content, "lxml") self.assertEqual(len(doc.select(".thank-you")), 1) self.assertFalse(CartPosition.objects.filter(id=cr1.id).exists()) self.assertEqual(Order.objects.count(), 1) @@ -272,7 +272,7 @@ class CheckoutTestCase(TestCase): self._set_session('payment', 'banktransfer') response = self.client.post('/%s/%s/checkout/confirm/' % (self.orga.slug, self.event.slug), follow=True) - doc = BeautifulSoup(response.rendered_content) + doc = BeautifulSoup(response.rendered_content, "lxml") self.assertEqual(len(doc.select(".alert-danger")), 1) cr1 = CartPosition.objects.get(id=cr1.id) self.assertEqual(cr1.price, 24) @@ -288,7 +288,7 @@ class CheckoutTestCase(TestCase): self._set_session('payment', 'banktransfer') response = self.client.post('/%s/%s/checkout/confirm/' % (self.orga.slug, self.event.slug), follow=True) - doc = BeautifulSoup(response.rendered_content) + doc = BeautifulSoup(response.rendered_content, "lxml") self.assertEqual(len(doc.select(".alert-danger")), 1) cr1 = CartPosition.objects.get(id=cr1.id) self.assertEqual(cr1.price, 24) @@ -303,7 +303,7 @@ class CheckoutTestCase(TestCase): self._set_session('payment', 'banktransfer') response = self.client.post('/%s/%s/checkout/confirm/' % (self.orga.slug, self.event.slug), follow=True) - doc = BeautifulSoup(response.rendered_content) + doc = BeautifulSoup(response.rendered_content, "lxml") self.assertEqual(len(doc.select(".thank-you")), 1) self.assertFalse(CartPosition.objects.filter(id=cr1.id).exists()) self.assertEqual(Order.objects.count(), 1) @@ -323,7 +323,7 @@ class CheckoutTestCase(TestCase): self._set_session('payment', 'banktransfer') response = self.client.post('/%s/%s/checkout/confirm/' % (self.orga.slug, self.event.slug), follow=True) - doc = BeautifulSoup(response.rendered_content) + doc = BeautifulSoup(response.rendered_content, "lxml") self.assertEqual(len(doc.select(".thank-you")), 1) self.assertTrue(Voucher.objects.get(pk=v.pk).redeemed) @@ -337,7 +337,7 @@ class CheckoutTestCase(TestCase): self._set_session('payment', 'banktransfer') response = self.client.post('/%s/%s/checkout/confirm/' % (self.orga.slug, self.event.slug), follow=True) - doc = BeautifulSoup(response.rendered_content) + doc = BeautifulSoup(response.rendered_content, "lxml") self.assertEqual(len(doc.select(".alert-danger")), 1) cr1 = CartPosition.objects.get(id=cr1.id) self.assertEqual(cr1.price, Decimal('12.00')) @@ -351,7 +351,7 @@ class CheckoutTestCase(TestCase): ) self._set_session('payment', 'banktransfer') response = self.client.post('/%s/%s/checkout/confirm/' % (self.orga.slug, self.event.slug), follow=True) - doc = BeautifulSoup(response.rendered_content) + doc = BeautifulSoup(response.rendered_content, "lxml") self.assertIn("expired", doc.select(".alert-danger")[0].text) def test_voucher_redeemed(self): @@ -363,7 +363,7 @@ class CheckoutTestCase(TestCase): ) self._set_session('payment', 'banktransfer') response = self.client.post('/%s/%s/checkout/confirm/' % (self.orga.slug, self.event.slug), follow=True) - doc = BeautifulSoup(response.rendered_content) + doc = BeautifulSoup(response.rendered_content, "lxml") self.assertIn("has already been", doc.select(".alert-danger")[0].text) def test_voucher_ignore_quota(self): @@ -378,7 +378,7 @@ class CheckoutTestCase(TestCase): self._set_session('payment', 'banktransfer') response = self.client.post('/%s/%s/checkout/confirm/' % (self.orga.slug, self.event.slug), follow=True) - doc = BeautifulSoup(response.rendered_content) + doc = BeautifulSoup(response.rendered_content, "lxml") self.assertEqual(len(doc.select(".thank-you")), 1) self.assertFalse(CartPosition.objects.filter(id=cr1.id).exists()) self.assertEqual(Order.objects.count(), 1) @@ -396,14 +396,14 @@ class CheckoutTestCase(TestCase): self._set_session('payment', 'banktransfer') response = self.client.post('/%s/%s/checkout/confirm/' % (self.orga.slug, self.event.slug), follow=True) - doc = BeautifulSoup(response.rendered_content) + doc = BeautifulSoup(response.rendered_content, "lxml") self.assertEqual(len(doc.select(".alert-danger")), 1) self.assertEqual(CartPosition.objects.filter(cart_id=self.session_key).count(), 1) cr1.voucher = v cr1.save() response = self.client.post('/%s/%s/checkout/confirm/' % (self.orga.slug, self.event.slug), follow=True) - doc = BeautifulSoup(response.rendered_content) + doc = BeautifulSoup(response.rendered_content, "lxml") self.assertEqual(len(doc.select(".thank-you")), 1) self.assertFalse(CartPosition.objects.filter(id=cr1.id).exists()) self.assertEqual(Order.objects.count(), 1) @@ -423,7 +423,7 @@ class CheckoutTestCase(TestCase): self._set_session('payment', 'banktransfer') response = self.client.post('/%s/%s/checkout/confirm/' % (self.orga.slug, self.event.slug), follow=True) - doc = BeautifulSoup(response.rendered_content) + doc = BeautifulSoup(response.rendered_content, "lxml") self.assertEqual(len(doc.select(".alert-danger")), 1) self.assertFalse(Order.objects.exists()) @@ -443,13 +443,13 @@ class CheckoutTestCase(TestCase): self._set_session('payment', 'banktransfer') response = self.client.post('/%s/%s/checkout/confirm/' % (self.orga.slug, self.event.slug), follow=True) - doc = BeautifulSoup(response.rendered_content) + doc = BeautifulSoup(response.rendered_content, "lxml") self.assertEqual(CartPosition.objects.filter(cart_id=self.session_key, voucher=v).count(), 1) self.assertEqual(len(doc.select(".alert-danger")), 1) self.assertFalse(Order.objects.exists()) response = self.client.post('/%s/%s/checkout/confirm/' % (self.orga.slug, self.event.slug), follow=True) - doc = BeautifulSoup(response.rendered_content) + doc = BeautifulSoup(response.rendered_content, "lxml") self.assertFalse(CartPosition.objects.filter(cart_id=self.session_key, voucher=v).exists()) self.assertEqual(len(doc.select(".thank-you")), 1) self.assertEqual(Order.objects.count(), 1) @@ -469,7 +469,7 @@ class CheckoutTestCase(TestCase): self._set_session('payment', 'banktransfer') response = self.client.post('/%s/%s/checkout/confirm/' % (self.orga.slug, self.event.slug), follow=True) - doc = BeautifulSoup(response.rendered_content) + doc = BeautifulSoup(response.rendered_content, "lxml") self.assertEqual(len(doc.select(".alert-danger")), 1) self.assertEqual(CartPosition.objects.filter(cart_id=self.session_key).count(), 1) @@ -483,7 +483,7 @@ class CheckoutTestCase(TestCase): self._set_session('payment', 'banktransfer') response = self.client.post('/%s/%s/checkout/confirm/' % (self.orga.slug, self.event.slug), follow=True) - doc = BeautifulSoup(response.rendered_content) + doc = BeautifulSoup(response.rendered_content, "lxml") self.assertGreaterEqual(len(doc.select(".alert-danger")), 1) def test_confirm_require_voucher(self): @@ -496,7 +496,7 @@ class CheckoutTestCase(TestCase): self._set_session('payment', 'banktransfer') response = self.client.post('/%s/%s/checkout/confirm/' % (self.orga.slug, self.event.slug), follow=True) - doc = BeautifulSoup(response.rendered_content) + doc = BeautifulSoup(response.rendered_content, "lxml") self.assertGreaterEqual(len(doc.select(".alert-danger")), 1) self.assertFalse(CartPosition.objects.filter(id=cr1.id).exists()) @@ -510,7 +510,7 @@ class CheckoutTestCase(TestCase): self._set_session('payment', 'banktransfer') response = self.client.post('/%s/%s/checkout/confirm/' % (self.orga.slug, self.event.slug), follow=True) - doc = BeautifulSoup(response.rendered_content) + doc = BeautifulSoup(response.rendered_content, "lxml") self.assertGreaterEqual(len(doc.select(".alert-danger")), 1) self.assertFalse(CartPosition.objects.filter(id=cr1.id).exists()) @@ -524,7 +524,7 @@ class CheckoutTestCase(TestCase): self._set_session('payment', 'banktransfer') response = self.client.post('/%s/%s/checkout/confirm/' % (self.orga.slug, self.event.slug), follow=True) - doc = BeautifulSoup(response.rendered_content) + doc = BeautifulSoup(response.rendered_content, "lxml") self.assertGreaterEqual(len(doc.select(".alert-danger")), 1) self.assertFalse(CartPosition.objects.filter(id=cr1.id).exists()) @@ -538,7 +538,7 @@ class CheckoutTestCase(TestCase): self._set_session('payment', 'banktransfer') response = self.client.post('/%s/%s/checkout/confirm/' % (self.orga.slug, self.event.slug), follow=True) - doc = BeautifulSoup(response.rendered_content) + doc = BeautifulSoup(response.rendered_content, "lxml") self.assertGreaterEqual(len(doc.select(".alert-danger")), 1) self.assertFalse(CartPosition.objects.filter(id=cr1.id).exists()) @@ -551,7 +551,7 @@ class CheckoutTestCase(TestCase): self._set_session('payment', 'banktransfer') response = self.client.post('/%s/%s/checkout/confirm/' % (self.orga.slug, self.event.slug), follow=True) - doc = BeautifulSoup(response.rendered_content) + doc = BeautifulSoup(response.rendered_content, "lxml") self.assertGreaterEqual(len(doc.select(".alert-danger")), 1) self.assertFalse(CartPosition.objects.filter(id=cr1.id).exists()) @@ -566,7 +566,7 @@ class CheckoutTestCase(TestCase): self._set_session('payment', 'banktransfer') response = self.client.post('/%s/%s/checkout/confirm/' % (self.orga.slug, self.event.slug), follow=True) - doc = BeautifulSoup(response.rendered_content) + doc = BeautifulSoup(response.rendered_content, "lxml") self.assertEqual(len(doc.select(".thank-you")), 1) def test_confirm_expired_with_non_blocking_voucher_unavailable(self): @@ -580,7 +580,7 @@ class CheckoutTestCase(TestCase): self._set_session('payment', 'banktransfer') response = self.client.post('/%s/%s/checkout/confirm/' % (self.orga.slug, self.event.slug), follow=True) - doc = BeautifulSoup(response.rendered_content) + doc = BeautifulSoup(response.rendered_content, "lxml") self.assertGreaterEqual(len(doc.select(".alert-danger")), 1) self.assertFalse(CartPosition.objects.filter(id=cr1.id).exists()) @@ -595,7 +595,7 @@ class CheckoutTestCase(TestCase): self._set_session('payment', 'banktransfer') response = self.client.post('/%s/%s/checkout/confirm/' % (self.orga.slug, self.event.slug), follow=True) - doc = BeautifulSoup(response.rendered_content) + doc = BeautifulSoup(response.rendered_content, "lxml") self.assertEqual(len(doc.select(".thank-you")), 1) def test_confirm_not_expired_with_non_blocking_voucher_unavailable(self): @@ -609,5 +609,5 @@ class CheckoutTestCase(TestCase): self._set_session('payment', 'banktransfer') response = self.client.post('/%s/%s/checkout/confirm/' % (self.orga.slug, self.event.slug), follow=True) - doc = BeautifulSoup(response.rendered_content) + doc = BeautifulSoup(response.rendered_content, "lxml") self.assertEqual(len(doc.select(".thank-you")), 1) diff --git a/src/tests/presale/test_orders.py b/src/tests/presale/test_orders.py index d96ebecf0b..205b08ddb4 100644 --- a/src/tests/presale/test_orders.py +++ b/src/tests/presale/test_orders.py @@ -124,7 +124,7 @@ class OrdersTest(TestCase): '/%s/%s/order/%s/%s/' % (self.orga.slug, self.event.slug, self.order.code, self.order.secret) ) assert response.status_code == 200 - doc = BeautifulSoup(response.rendered_content) + doc = BeautifulSoup(response.rendered_content, "lxml") assert len(doc.select(".cart-row")) > 0 assert "pending" in doc.select(".label-warning")[0].text.lower() @@ -143,7 +143,7 @@ class OrdersTest(TestCase): response = self.client.get( '/%s/%s/order/%s/%s/modify' % (self.orga.slug, self.event.slug, self.order.code, self.order.secret)) - doc = BeautifulSoup(response.rendered_content) + doc = BeautifulSoup(response.rendered_content, "lxml") self.assertEqual(len(doc.select('input[name=%s-attendee_name]' % self.ticket_pos.id)), 1) # Not all fields filled out, expect success @@ -164,7 +164,7 @@ class OrdersTest(TestCase): response = self.client.get( '/%s/%s/order/%s/%s/modify' % (self.orga.slug, self.event.slug, self.order.code, self.order.secret)) - doc = BeautifulSoup(response.rendered_content) + doc = BeautifulSoup(response.rendered_content, "lxml") self.assertEqual(len(doc.select('input[name=%s-attendee_name]' % self.ticket_pos.id)), 1) # Not all required fields filled out, expect failure @@ -172,7 +172,7 @@ class OrdersTest(TestCase): '/%s/%s/order/%s/%s/modify' % (self.orga.slug, self.event.slug, self.order.code, self.order.secret), { '%s-attendee_name' % self.ticket_pos.id: '', }, follow=True) - doc = BeautifulSoup(response.rendered_content) + doc = BeautifulSoup(response.rendered_content, "lxml") self.assertGreaterEqual(len(doc.select('.has-error')), 1) response = self.client.post( @@ -191,7 +191,7 @@ class OrdersTest(TestCase): response = self.client.get( '/%s/%s/order/%s/%s/modify' % (self.orga.slug, self.event.slug, self.order.code, self.order.secret)) - doc = BeautifulSoup(response.rendered_content) + doc = BeautifulSoup(response.rendered_content, "lxml") self.assertEqual(len(doc.select('input[name=%s-question_%s]' % ( self.ticket_pos.id, self.question.id))), 1) @@ -214,7 +214,7 @@ class OrdersTest(TestCase): response = self.client.get('/%s/%s/order/%s/%s/modify' % (self.orga.slug, self.event.slug, self.order.code, self.order.secret)) - doc = BeautifulSoup(response.rendered_content) + doc = BeautifulSoup(response.rendered_content, "lxml") self.assertEqual(len(doc.select('input[name=%s-question_%s]' % ( self.ticket_pos.id, self.question.id))), 1) @@ -223,7 +223,7 @@ class OrdersTest(TestCase): '/%s/%s/order/%s/%s/modify' % (self.orga.slug, self.event.slug, self.order.code, self.order.secret), { '%s-question_%s' % (self.ticket_pos.id, self.question.id): '', }, follow=True) - doc = BeautifulSoup(response.rendered_content) + doc = BeautifulSoup(response.rendered_content, "lxml") self.assertGreaterEqual(len(doc.select('.has-error')), 1) response = self.client.post(