Skip to content

Commit

Permalink
Check_2
Browse files Browse the repository at this point in the history
  • Loading branch information
smaspb17 committed Mar 18, 2023
1 parent 5ecedf4 commit 052feb9
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 30 deletions.
27 changes: 0 additions & 27 deletions yatube/posts/models.py
Original file line number Diff line number Diff line change
Expand Up @@ -100,30 +100,3 @@ class Follow(models.Model):

def __str__(self):
return f'{self.user} подписан на {self.author}'


'''
class News(models.Model):
title = models.CharField(max_length=150, verbose_name='Наименование')
content = models.TextField(blank=True, verbose_name='Контент')
created_at = models.DateTimeField(auto_now_add=True,
verbose_name='Дата публикации')
updated_at = models.DateTimeField(auto_now=True, verbose_name='Обновлено')
photo = models.ImageField(upload_to='photos/%Y/%m/%d/',
verbose_name='Фото', blank=True)
is_published = models.BooleanField(default=True,
verbose_name='Опубликовано')
category = models.ForeignKey('Category', on_delete=models.PROTECT,
verbose_name='Категория')
def get_absolute_url(self):
return reverse("view_news", kwargs={"news_id": self.pk})
def __str__(self):
return self.title
class Meta:
verbose_name = 'Новость'
verbose_name_plural = 'Новости'
ordering = ['-created_at']
'''
15 changes: 12 additions & 3 deletions yatube/posts/tests/test_views.py
Original file line number Diff line number Diff line change
@@ -1,14 +1,19 @@
import shutil
import tempfile

from django.conf import settings
from django import forms
from django.contrib.auth import get_user_model
from django.test import Client, TestCase
from django.test import Client, TestCase, override_settings
from django.urls import reverse
from django.core.cache import cache

from posts.models import Group, Post, Follow

TEMP_MEDIA_ROOT = tempfile.mkdtemp(dir=settings.BASE_DIR)
User = get_user_model()


@override_settings(MEDIA_ROOT=TEMP_MEDIA_ROOT)
class PostsViewsTests(TestCase):
@classmethod
def setUpClass(cls):
Expand All @@ -26,6 +31,11 @@ def setUpClass(cls):
)
}

@classmethod
def tearDownClass(cls):
super().tearDownClass()
shutil.rmtree(TEMP_MEDIA_ROOT, ignore_errors=True)

def setUp(self):
self.authorized_client = Client()
self.authorized_client.force_login(self.user)
Expand All @@ -35,7 +45,6 @@ def setUp(self):
self.user2 = User.objects.create_user(username='notfollower')
self.authorized_client2 = Client()
self.authorized_client2.force_login(self.user2)
cache.clear()

def posts_check_all_fields(self, post):
"""Корректность полей поста."""
Expand Down

0 comments on commit 052feb9

Please sign in to comment.