diff --git a/tests/test_cells.py b/tests/test_cells.py
index dd46fa8c..89ddb096 100644
--- a/tests/test_cells.py
+++ b/tests/test_cells.py
@@ -667,7 +667,7 @@ def test_page_cell_placeholder_restricted_visibility(app, admin_user):
page = Page(title='Test', slug='test', template_name='standard')
page.save()
json_cell = JsonCell(page=page, placeholder='content', order=0, url='http://example.com')
- json_cell.template_string = '{% load combo %}{% placeholder "foobar" name="Foobar" %}'
+ json_cell.template_string = '{% placeholder "foobar" name="Foobar" %}'
json_cell.save()
TextCell(page=page, placeholder='foobar', text='
{% endfor %}') + t = Template('{% for x in plop|split %}{{x}}
{% endfor %}') assert t.render(Context({'plop': 'ab cd ef'})) == 'ab
cd
ef
' - t = Template('{% load combo %}{% for x in plop|split:"|" %}{{x}} {% endfor %}') + t = Template('{% for x in plop|split:"|" %}{{x}} {% endfor %}') assert t.render(Context({'plop': 'ab|cd|ef'})) == 'ab cd ef ' def test_get_group(): @@ -136,7 +136,7 @@ def test_get_group(): {'name': 'Chicago', 'population': '7,000,000', 'country': 'USA'}, {'name': 'Tokyo', 'population': '33,000,000', 'country': 'Japan'}, ]}) - t = Template('{% load combo %}{% regroup cities by country as country_list %}' + t = Template('{% regroup cities by country as country_list %}' '{% for c in country_list|get_group:"USA" %}{{c.name}},{% endfor %}') assert t.render(context) == 'New York,Chicago,'
Public text
', order=0, diff --git a/tests/test_manager.py b/tests/test_manager.py index 4c990127..5cdeac90 100644 --- a/tests/test_manager.py +++ b/tests/test_manager.py @@ -1166,7 +1166,7 @@ def test_page_cell_placeholder(app, admin_user): assert re.findall('data-placeholder-key="(.*)">', resp.text) == ['content', 'footer'] # check a placeholder within a cell is included - cell.template_string = '{% load combo %}{% placeholder "foobar" name="Foobar" %}' + cell.template_string = '{% placeholder "foobar" name="Foobar" %}' cell.save() resp = app.get('/manage/pages/%s/' % page.id) assert re.findall('data-placeholder-key="(.*)">', resp.text) == ['content', 'foobar', 'footer'] diff --git a/tests/test_public_templatetags.py b/tests/test_public_templatetags.py index 2ede1452..ead51e40 100644 --- a/tests/test_public_templatetags.py +++ b/tests/test_public_templatetags.py @@ -19,7 +19,7 @@ pytestmark = pytest.mark.django_db def test_strptime(): - t = Template('{% load combo %}{{ someday|strptime:"%Y-%m-%d"|date:"Y" }}') + t = Template('{{ someday|strptime:"%Y-%m-%d"|date:"Y" }}') assert t.render(Context({'someday': '2015-04-15'})) == '2015' assert t.render(Context({'someday': 'foobar'})) == '' assert t.render(Context({'someday': None})) == '' @@ -27,7 +27,7 @@ def test_strptime(): assert t.render(Context({'someday': ['foo', 'bar']})) == '' def test_parse_datetime(): - t = Template('{% load combo %}{{ someday|parse_datetime|date:"Y m d H i s T" }}') + t = Template('{{ someday|parse_datetime|date:"Y m d H i s T" }}') expected = '2015 04 15 13 11 12 UTC' assert t.render(Context({'someday': '2015-04-15T13:11:12'})) == expected assert t.render(Context({'someday': '2015-04-15 13:11:12'})) == expected @@ -45,7 +45,7 @@ def test_parse_datetime(): assert t.render(Context({'someday': {'foo': 'bar'}})) == '' assert t.render(Context({'someday': ['foo', 'bar']})) == '' - t = Template('{% load combo %}{{ someday|parse_date|date:"Y m d" }}') + t = Template('{{ someday|parse_date|date:"Y m d" }}') expected = '2015 04 15' assert t.render(Context({'someday': '2015-04-15'})) == expected assert t.render(Context({'someday': '2015-04-15T13:11:12Z'})) == '' @@ -55,7 +55,7 @@ def test_parse_datetime(): assert t.render(Context({'someday': {'foo': 'bar'}})) == '' assert t.render(Context({'someday': ['foo', 'bar']})) == '' - t = Template('{% load combo %}{{ someday|parse_time|date:"H i s" }}') + t = Template('{{ someday|parse_time|date:"H i s" }}') expected = '13 11 12' assert t.render(Context({'someday': '13:11:12'})) == expected assert t.render(Context({'someday': '13:11:12Z'})) == expected @@ -73,7 +73,7 @@ def test_parse_datetime(): assert t.render(Context({'someday': ['foo', 'bar']})) == '' def test_has_role(): - t = Template('{% load combo %}{{ request.user|has_role:"Role1" }}') + t = Template('{{ request.user|has_role:"Role1" }}') request = RequestFactory().get('/') user = User(username='foo', email='foo@example.net') @@ -88,7 +88,7 @@ def test_has_role(): user.save() assert t.render(context) == 'True' - t = Template('{% load combo %}{{ request.user|has_role:"Role2" }}') + t = Template('{{ request.user|has_role:"Role2" }}') assert t.render(context) == 'False' group = Group(name='Role2') group.save() @@ -106,7 +106,7 @@ def test_has_role(): assert t.render(context) == 'False' def test_get(): - t = Template('{% load combo %}{{ foo|get:"foo-bar" }}') + t = Template('{{ foo|get:"foo-bar" }}') context = Context({'foo': {'foo-bar': 'hello'}}) assert t.render(context) == 'hello' context = Context({'foo': {'bar-foo': 'hello'}}) @@ -114,18 +114,18 @@ def test_get(): context = Context({'foo': None}) assert t.render(context) == 'None' - t = Template('{% load combo %}{{ foo|get:"foo-bar"|default:"" }}') + t = Template('{{ foo|get:"foo-bar"|default:"" }}') context = Context({'foo': {'rab': 'hello'}}) assert t.render(context) == '' - t = Template('{% load combo %}{{ foo|get:key }}') + t = Template('{{ foo|get:key }}') context = Context({'foo': {'foo-bar': 'hello'}, 'key': 'foo-bar'}) assert t.render(context) == 'hello' def test_split(): - t = Template('{% load combo %}{% for x in plop|split %}{{x}}{% endfor %}') + t = Template('{% for x in plop|split %}{{x}}
{% endfor %}') assert t.render(Context({'plop': 'ab cd ef'})) == 'ab
cd
ef
' - t = Template('{% load combo %}{% for x in plop|split:"|" %}{{x}} {% endfor %}') + t = Template('{% for x in plop|split:"|" %}{{x}} {% endfor %}') assert t.render(Context({'plop': 'ab|cd|ef'})) == 'ab cd ef ' def test_get_group(): @@ -136,7 +136,7 @@ def test_get_group(): {'name': 'Chicago', 'population': '7,000,000', 'country': 'USA'}, {'name': 'Tokyo', 'population': '33,000,000', 'country': 'Japan'}, ]}) - t = Template('{% load combo %}{% regroup cities by country as country_list %}' + t = Template('{% regroup cities by country as country_list %}' '{% for c in country_list|get_group:"USA" %}{{c.name}},{% endfor %}') assert t.render(context) == 'New York,Chicago,'