-
Notifications
You must be signed in to change notification settings - Fork 84
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Use bootstrap_alert for bootstrap_messages (#8)
Also fixes capfirst omission in render_alert.
- Loading branch information
Showing
10 changed files
with
150 additions
and
146 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
7 changes: 2 additions & 5 deletions
7
src/django_bootstrap5/templates/django_bootstrap5/messages.html
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,7 +1,4 @@ | ||
{% load i18n %}{% load django_bootstrap5 %} | ||
{% load django_bootstrap5 %} | ||
{% for message in messages %} | ||
<div class="{{ message|bootstrap_message_classes }} alert-dismissible fade show" role="alert"> | ||
<button type="button" class="close" data-dismiss="alert" aria-label="{% trans 'close' %}">×</button> | ||
{{ message }} | ||
</div> | ||
{% bootstrap_alert message alert_type=message|bootstrap_message_alert_type extra_classes=message.extra_tags %} | ||
{% endfor %} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,80 @@ | ||
import re | ||
|
||
from django.contrib.messages import constants as DEFAULT_MESSAGE_LEVELS | ||
from django.test import TestCase | ||
|
||
from tests.test_templates import render_template_with_form | ||
|
||
|
||
class MessagesTest(TestCase): | ||
def test_bootstrap_messages(self): | ||
class FakeMessage(object): | ||
"""Follows the `django.contrib.messages.storage.base.Message` API.""" | ||
|
||
level = None | ||
message = None | ||
extra_tags = None | ||
|
||
def __init__(self, level, message, extra_tags=None): | ||
self.level = level | ||
self.extra_tags = extra_tags | ||
self.message = message | ||
|
||
def __str__(self): | ||
return self.message | ||
|
||
pattern = re.compile(r"\s+") | ||
messages = [FakeMessage(DEFAULT_MESSAGE_LEVELS.WARNING, "hello")] | ||
res = render_template_with_form("{% bootstrap_messages messages %}", {"messages": messages}) | ||
expected = ( | ||
'<div class="alert alert-warning alert-dismissible fade show" role="alert">' | ||
"hello" | ||
'<button type="button" class="btn-close" data-bs-dismiss="alert" aria-label="Close"></button>' | ||
"</div>" | ||
) | ||
self.maxDiff = None | ||
self.assertEqual(re.sub(pattern, "", res), re.sub(pattern, "", expected)) | ||
|
||
messages = [FakeMessage(DEFAULT_MESSAGE_LEVELS.ERROR, "hello")] | ||
res = render_template_with_form("{% bootstrap_messages messages %}", {"messages": messages}) | ||
expected = ( | ||
'<div class="alert alert-danger alert-dismissible fade show" role="alert">' | ||
"hello" | ||
'<button type="button" class="btn-close" data-bs-dismiss="alert" aria-label="Close"></button>' | ||
"</div>" | ||
) | ||
self.assertEqual(re.sub(pattern, "", res), re.sub(pattern, "", expected)) | ||
|
||
messages = [FakeMessage(None, "hello")] | ||
res = render_template_with_form("{% bootstrap_messages messages %}", {"messages": messages}) | ||
expected = ( | ||
'<div class="alert alert-info alert-dismissible fade show" role="alert">' | ||
"hello" | ||
'<button type="button" class="btn-close" data-bs-dismiss="alert" aria-label="Close"></button>' | ||
"</div>" | ||
) | ||
|
||
self.assertEqual(re.sub(pattern, "", res), re.sub(pattern, "", expected)) | ||
|
||
messages = [FakeMessage(DEFAULT_MESSAGE_LEVELS.ERROR, "hello http://example.com")] | ||
res = render_template_with_form("{% bootstrap_messages messages %}", {"messages": messages}) | ||
expected = ( | ||
'<div class="alert alert-danger alert-dismissible fade show" role="alert">' | ||
"hello http://example.com" | ||
'<button type="button" class="btn-close" data-bs-dismiss="alert" aria-label="Close"></button>' | ||
"</div>" | ||
) | ||
self.assertEqual( | ||
re.sub(pattern, "", res), | ||
re.sub(pattern, "", expected), | ||
) | ||
|
||
messages = [FakeMessage(DEFAULT_MESSAGE_LEVELS.ERROR, "hello\nthere")] | ||
res = render_template_with_form("{% bootstrap_messages messages %}", {"messages": messages}) | ||
expected = ( | ||
'<div class="alert alert-danger alert-dismissible fade show" role="alert">' | ||
"hello there" | ||
'<button type="button" class="btn-close" data-bs-dismiss="alert" aria-label="Close"></button>' | ||
"</div>" | ||
) | ||
self.assertEqual(re.sub(pattern, "", res), re.sub(pattern, "", expected)) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,14 @@ | ||
from django.test import TestCase | ||
|
||
from django_bootstrap5.css import merge_css_classes | ||
|
||
|
||
class CssTest(TestCase): | ||
def test_merge_css_classes(self): | ||
css_classes = "one two" | ||
css_class = "three four" | ||
classes = merge_css_classes(css_classes, css_class) | ||
self.assertEqual(classes, "one two three four") | ||
|
||
classes = merge_css_classes(css_class, css_classes) | ||
self.assertEqual(classes, "three four one two") |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,10 @@ | ||
from django.test import TestCase | ||
|
||
from django_bootstrap5.html import render_tag | ||
|
||
|
||
class HtmlTest(TestCase): | ||
def test_render_tag(self): | ||
self.assertEqual(render_tag("span"), "<span></span>") | ||
self.assertEqual(render_tag("span", content="foo"), "<span>foo</span>") | ||
self.assertEqual(render_tag("span", attrs={"bar": 123}, content="foo"), '<span bar="123">foo</span>') |
Oops, something went wrong.