Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

All tests passing #566

Open
wants to merge 2 commits into
base: develop
Choose a base branch
from
Open

All tests passing #566

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
11cd823
Modified the branch to make the following changes: 1) Reconciled lang…
kbhalerao Apr 6, 2020
bd0ef87
changed staticfiles in opensearch.xml
kbhalerao Jun 2, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions demo/settings.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,11 +47,11 @@
('tr', gettext('Turkish')),
('sv', gettext('Swedish')),
('is', gettext('Icelandic')),
('hr_HR', gettext('Croatian')),
('pt_BR', gettext('Brazilian Portuguese')),
('fa_IR', gettext('Persian')),
('fi_FI', gettext('Finnish')),
('uk_UA', gettext('Ukrainian')),
('hr', gettext('Croatian')),
('pt-br', gettext('Brazilian Portuguese')),
('fa', gettext('Persian')),
('fi', gettext('Finnish')),
('uk', gettext('Ukrainian')),
('zh-hans', gettext('Simplified Chinese')),
)

Expand Down
2 changes: 1 addition & 1 deletion zinnia/templates/zinnia/opensearch.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{% load i18n staticfiles zinnia %}{% get_tags as entry_tags %}<?xml version="1.0" encoding="UTF-8"?>
{% load i18n static zinnia %}{% get_tags as entry_tags %}<?xml version="1.0" encoding="UTF-8"?>
<OpenSearchDescription xmlns="http://a9.com/-/spec/opensearch/1.1/"
xmlns:moz="http://www.mozilla.org/2006/browser/search/">
<ShortName>{{ site.name }}</ShortName>
Expand Down
2 changes: 1 addition & 1 deletion zinnia/templates/zinnia/skeleton.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{% load i18n %}
{% load staticfiles %}
{% load static %}
<!doctype html>
<html lang="{{ LANGUAGE_CODE }}">
<head>
Expand Down
2 changes: 1 addition & 1 deletion zinnia/templates/zinnia/tags/entries_slider.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{% load i18n %}
{% load staticfiles %}
{% load static %}
{% if entries %}
<div class="slider-container">
<div class="slider">
Expand Down
2 changes: 1 addition & 1 deletion zinnia/templates/zinnia/tags/search_form.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{% load i18n %}
{% load staticfiles %}
{% load static %}
<form method="get" id="searchform" action="{% url 'zinnia:entry_search' %}">
<p>
<input type="text" name="pattern" id="searchbox" placeholder="{% trans "Keywords..." %}" {% if pattern %}value="{{ pattern }}"{% endif %} />
Expand Down
4 changes: 2 additions & 2 deletions zinnia/tests/test_entry.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -158,7 +158,7 @@ def test_trackbacks_are_open(self):

def test_is_actual(self):
self.assertTrue(self.entry.is_actual)
self.entry.start_publication = datetime(2020, 3, 15)
self.entry.start_publication = timezone.now() + timedelta(days=1)
self.assertFalse(self.entry.is_actual)
self.entry.start_publication = timezone.now()
self.assertTrue(self.entry.is_actual)
Expand All @@ -169,7 +169,7 @@ def test_is_visible(self):
self.assertFalse(self.entry.is_visible)
self.entry.status = PUBLISHED
self.assertTrue(self.entry.is_visible)
self.entry.start_publication = datetime(2020, 3, 15)
self.entry.start_publication = timezone.now() + timedelta(days=1)
self.assertFalse(self.entry.is_visible)

def test_short_url(self):
Expand Down
2 changes: 1 addition & 1 deletion zinnia/tests/test_views.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -720,7 +720,7 @@ def test_comment_success(self):
self.assertEqual(response.context['comment'], comment)
comment.is_public = True
comment.save()
with self.assertNumQueries(5):
with self.assertNumQueries(3):
response = self.client.get(success_url, follow=True)
self.assertEqual(
response.redirect_chain[1],
Expand Down