phzhik/gault-millau
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix some test && routes && add migration

Browse Source
This commit is contained in:
Kuroshini 2019-09-27 19:03:30 +03:00
parent 2af401daa5
commit ac8356c7d1
5 changed files with 22 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
apps/favorites/tests.py
View File

@ -27,7 +27,7 @@ class BaseTestCase(APITestCase):
news_type=self.test_news_type, news_type=self.test_news_type,
description={"en-GB": "Description test news"}, description={"en-GB": "Description test news"},
playlist=1, start="2020-12-03 12:00:00", end="2020-12-13 12:00:00", playlist=1, start="2020-12-03 12:00:00", end="2020-12-13 12:00:00",
is_publish=True) state=News.PUBLISHED, slug='test-news')
self.test_content_type = ContentType.objects.get(app_label="news", model="news") self.test_content_type = ContentType.objects.get(app_label="news", model="news")

18
apps/news/migrations/0019_news_author.py Normal file
View File

@ -0,0 +1,18 @@
# Generated by Django 2.2.4 on 2019-09-27 15:32
from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
('news', '0018_merge_20190927_1432'),
]
operations = [
migrations.AddField(
model_name='news',
name='author',
field=models.CharField(blank=True, default=None, max_length=255, null=True, verbose_name='Author'),
),
]

2
apps/news/models.py
View File

@ -39,7 +39,7 @@ class NewsQuerySet(models.QuerySet):
now = timezone.now() now = timezone.now()
return self.filter(models.Q(models.Q(end__gte=now) | return self.filter(models.Q(models.Q(end__gte=now) |
models.Q(end__isnull=True)), models.Q(end__isnull=True)),
state__in=[self.model.PUBLISHED_STATES], start__lte=now) state__in=self.model.PUBLISHED_STATES, start__lte=now)
def with_related(self): def with_related(self):
"""Return qs with related objects.""" """Return qs with related objects."""

2
apps/news/tests.py
View File

@ -26,7 +26,7 @@ class BaseTestCase(APITestCase):
news_type=self.test_news_type, description={"en-GB": "Description test news"}, news_type=self.test_news_type, description={"en-GB": "Description test news"},
playlist=1, start=datetime.now() + timedelta(hours=-2), playlist=1, start=datetime.now() + timedelta(hours=-2),
end=datetime.now() + timedelta(hours=2), end=datetime.now() + timedelta(hours=2),
is_publish=True, slug='test-news-slug',) state=News.PUBLISHED, slug='test-news-slug',)
class NewsTestCase(BaseTestCase): class NewsTestCase(BaseTestCase):

2
apps/utils/tests.py
View File

@ -54,9 +54,9 @@ class TranslateFieldTests(BaseTestCase):
playlist=1, playlist=1,
start=datetime.now(pytz.utc) + timedelta(hours=-13), start=datetime.now(pytz.utc) + timedelta(hours=-13),
end=datetime.now(pytz.utc) + timedelta(hours=13), end=datetime.now(pytz.utc) + timedelta(hours=13),
is_publish=True,
news_type=self.news_type, news_type=self.news_type,
slug='test', slug='test',
state=News.PUBLISHED,
) )
def test_model_field(self): def test_model_field(self):