Merge pull request #76 from jedie/bugfix-tests

Bugfix tests by mock {% now "Z" %}
pull/77/head
Jens Diemer 2021-11-20 14:10:04 +01:00 zatwierdzone przez GitHub
commit 010737d917
Nie znaleziono w bazie danych klucza dla tego podpisu
ID klucza GPG: 4AEE18F83AFDEB23
6 zmienionych plików z 14 dodań i 10 usunięć

Wyświetl plik

@ -5,7 +5,7 @@ from unittest import mock
from bx_django_utils.test_utils.datetime import MockDatetimeGenerator
from bx_django_utils.test_utils.html_assertion import HtmlAssertionMixin
from django.contrib.auth.models import User
from django.template.defaulttags import CsrfTokenNode
from django.template.defaulttags import CsrfTokenNode, NowNode
from django.test import TestCase
from django.utils import timezone
from django_tools.unittest_utils.mockup import ImageDummy
@ -40,7 +40,8 @@ class AdminTestCase(HtmlAssertionMixin, TestCase):
def test_normal_user_create_minimal_item(self):
self.client.force_login(self.normaluser)
with mock.patch.object(CsrfTokenNode, 'render', return_value='MockedCsrfTokenNode'):
with mock.patch.object(NowNode, 'render', return_value='MockedNowNode'), \
mock.patch.object(CsrfTokenNode, 'render', return_value='MockedCsrfTokenNode'):
response = self.client.get('/admin/inventory/itemmodel/add/')
assert response.status_code == 200
self.assert_html_parts(response, parts=(
@ -177,7 +178,8 @@ class AdminTestCase(HtmlAssertionMixin, TestCase):
# Default mode, without any GET parameter -> group "automatic":
with mock.patch.object(CsrfTokenNode, 'render', return_value='MockedCsrfTokenNode'), \
with mock.patch.object(NowNode, 'render', return_value='MockedNowNode'), \
mock.patch.object(CsrfTokenNode, 'render', return_value='MockedCsrfTokenNode'), \
self.assertLogs(logger='inventory', level=logging.DEBUG) as logs:
response = self.client.get(
path='/admin/inventory/itemmodel/',
@ -201,7 +203,8 @@ class AdminTestCase(HtmlAssertionMixin, TestCase):
# Search should disable grouping:
with mock.patch.object(CsrfTokenNode, 'render', return_value='MockedCsrfTokenNode'), \
with mock.patch.object(NowNode, 'render', return_value='MockedNowNode'), \
mock.patch.object(CsrfTokenNode, 'render', return_value='MockedCsrfTokenNode'), \
self.assertLogs(logger='inventory', level=logging.DEBUG) as logs:
response = self.client.get(
path='/admin/inventory/itemmodel/?q=sub+item+2.',

Wyświetl plik

@ -35,7 +35,7 @@
<meta content="NONE,NOARCHIVE" name="robots"/>
</meta>
</head>
<body class="app-inventory model-itemmodel change-list" data-admin-utc-offset="7200">
<body class="app-inventory model-itemmodel change-list" data-admin-utc-offset="MockedNowNode">
<!-- Container -->
<div id="container">
<!-- Header -->

Wyświetl plik

@ -35,7 +35,7 @@
<meta content="NONE,NOARCHIVE" name="robots"/>
</meta>
</head>
<body class="app-inventory model-itemmodel change-list" data-admin-utc-offset="7200">
<body class="app-inventory model-itemmodel change-list" data-admin-utc-offset="MockedNowNode">
<!-- Container -->
<div id="container">
<!-- Header -->

Wyświetl plik

@ -76,7 +76,7 @@
<meta content="NONE,NOARCHIVE" name="robots"/>
</meta>
</head>
<body class="app-inventory model-itemmodel change-form" data-admin-utc-offset="7200">
<body class="app-inventory model-itemmodel change-form" data-admin-utc-offset="MockedNowNode">
<!-- Container -->
<div id="container">
<!-- Header -->

Wyświetl plik

@ -2,7 +2,7 @@ from unittest import mock
from bx_django_utils.test_utils.html_assertion import HtmlAssertionMixin
from django.contrib.auth.models import User
from django.template.defaulttags import CsrfTokenNode
from django.template.defaulttags import CsrfTokenNode, NowNode
from django.test import TestCase
from django_tools.unittest_utils.mockup import ImageDummy
from model_bakery import baker
@ -36,7 +36,8 @@ class AdminTestCase(HtmlAssertionMixin, TestCase):
def test_normal_user_create_minimal_item(self):
self.client.force_login(self.normaluser)
with mock.patch.object(CsrfTokenNode, 'render', return_value='MockedCsrfTokenNode'):
with mock.patch.object(NowNode, 'render', return_value='MockedNowNode'), \
mock.patch.object(CsrfTokenNode, 'render', return_value='MockedCsrfTokenNode'):
response = self.client.get('/admin/inventory/memomodel/add/')
assert response.status_code == 200
self.assert_html_parts(response, parts=(

Wyświetl plik

@ -72,7 +72,7 @@
<meta content="NONE,NOARCHIVE" name="robots"/>
</meta>
</head>
<body class="app-inventory model-memomodel change-form" data-admin-utc-offset="7200">
<body class="app-inventory model-memomodel change-form" data-admin-utc-offset="MockedNowNode">
<!-- Container -->
<div id="container">
<!-- Header -->