From cb21e59587ab328e9a3e06c9d57c2bafce281715 Mon Sep 17 00:00:00 2001 From: luxagraf Date: Thu, 6 Dec 2018 06:59:25 -0600 Subject: restructed notes urls, added more tests --- apps/notes/notebook_urls.py | 13 ++++ apps/notes/notes_urls.py | 17 +++++ apps/notes/tests/test_forms.py | 17 +++++ apps/notes/tests/test_urls.py | 75 +++++++++++++++++++++++ apps/pages/tests/test_models.py | 36 ++++++++--- apps/pages/tests/test_views.py | 8 +-- design/templates/notes/partials/note_list.html | 16 +++++ design/templates/notes/partials/note_sidebar.html | 13 ++++ design/templates/pages/page.html | 5 +- 9 files changed, 181 insertions(+), 19 deletions(-) create mode 100644 apps/notes/notebook_urls.py create mode 100644 apps/notes/notes_urls.py create mode 100644 apps/notes/tests/test_forms.py create mode 100644 apps/notes/tests/test_urls.py create mode 100644 design/templates/notes/partials/note_list.html create mode 100644 design/templates/notes/partials/note_sidebar.html diff --git a/apps/notes/notebook_urls.py b/apps/notes/notebook_urls.py new file mode 100644 index 0000000..b433d15 --- /dev/null +++ b/apps/notes/notebook_urls.py @@ -0,0 +1,13 @@ +from django.urls import path + +from .views import ( + NotebookListView, + NotebookDetailView, +) + +app_name = "notebooks" + +urlpatterns = [ + path(r'', NotebookDetailView.as_view(), name='detail',), + path(r'', NotebookListView.as_view(), name='list',), +] diff --git a/apps/notes/notes_urls.py b/apps/notes/notes_urls.py new file mode 100644 index 0000000..f2573ce --- /dev/null +++ b/apps/notes/notes_urls.py @@ -0,0 +1,17 @@ +from django.urls import path + +from .views import ( + NoteDetailView, + NoteCreateView, + NoteListView, + NoteTagView, +) + +app_name = "notes" + +urlpatterns = [ + path(r'create/', NoteCreateView.as_view(), name='create',), + path(r'/', NoteDetailView.as_view(), name='detail',), + path(r't/', NoteTagView.as_view(), name='tags',), + path(r'', NoteListView.as_view(), name='list',), +] diff --git a/apps/notes/tests/test_forms.py b/apps/notes/tests/test_forms.py new file mode 100644 index 0000000..a9b2a7d --- /dev/null +++ b/apps/notes/tests/test_forms.py @@ -0,0 +1,17 @@ +from django.test import TestCase +from notes.forms import NoteForm + + +class NoteFormTests(TestCase): + def test_forms(self): + form_data = { + 'title': 'My Note', + 'body_text': 'Body of the note', + 'body_html': '

Body of the note

', + 'body_qjson': '', + 'notebook': '', + 'url': '', + 'tags': 'three word tag, tag' + } + form = NoteForm(data=form_data) + self.assertTrue(form.is_valid()) diff --git a/apps/notes/tests/test_urls.py b/apps/notes/tests/test_urls.py new file mode 100644 index 0000000..e4fee57 --- /dev/null +++ b/apps/notes/tests/test_urls.py @@ -0,0 +1,75 @@ +from django.urls import reverse, resolve +from django.test import TestCase +from django.contrib import auth + +from mixer.backend.django import mixer + +from notes.models import Note + +User = auth.get_user_model() + + +class TestNotesURLs(TestCase): + """Test URL patterns for notes.""" + + def setUp(self): + self.user = mixer.blend(User, username='tpynchon') + self.note = Note.objects.create( + owner=self.user, + title="test note", + body_text="the body of the note", + url="https://luxagraf.net/", + tags="mine,cool site" + ) + self.note.save() + + def test_list_reverse(self): + """notes:list should reverse to /n/.""" + self.assertEqual(reverse('notes:list'), '/n/') + + def test_list_resolve(self): + """/n/ should resolve to notes:list.""" + self.assertEqual(resolve('/n/').view_name, 'notes:list') + + def test_detail_reverse(self): + """notes:detail should reverse to /n/slug/id""" + path = '/n/%s/%s' % (self.note.slug, self.note.pk) + self.assertEqual( + reverse('notes:detail', kwargs={'slug': self.note.slug, 'pk': self.note.pk}), path + ) + + def test_detail_resolve(self): + """/n/test-note/1 should resolve to notes:detail.""" + self.assertEqual(resolve('/n/test-note/1').view_name, 'notes:detail') + + def test_create_reverse(self): + """notes:create should reverse to /n/create/.""" + self.assertEqual(reverse('notes:create'), '/n/create/') + + def test_create_resolve(self): + """/n/create/ should resolve to notes:create""" + self.assertEqual( + resolve('/n/create/').view_name, + 'notes:create' + ) + + +class TestNotebooksURLs(TestCase): + """Test URL patterns for notebooks.""" + + def test_list_reverse(self): + """notebooks:list should reverse to /nb/.""" + self.assertEqual(reverse('notebooks:list'), '/nb/') + + def test_list_resolve(self): + """/n/ should resolve to notes:list.""" + self.assertEqual(resolve('/nb/').view_name, 'notebooks:list') + + def test_detail_reverse(self): + """notes:detail should reverse to /nb/slug""" + self.assertEqual(reverse('notebooks:detail', kwargs={'slug': 'test-notebook'}), '/nb/test-notebook') + + def test_detail_resolve(self): + """/n/test-note/1 should resolve to notes:detail.""" + self.assertEqual(resolve('/nb/test-notebook').view_name, 'notebooks:detail') + diff --git a/apps/pages/tests/test_models.py b/apps/pages/tests/test_models.py index f8de5c7..2722430 100644 --- a/apps/pages/tests/test_models.py +++ b/apps/pages/tests/test_models.py @@ -4,17 +4,33 @@ from pages.models import Page class PageModelTest(TestCase): - - def test_string_representation(self): - page = Page( + def setUp(self): + self.page = Page( title="Test Page", meta_description="The meta desc", body_markdown="the body of the page", ) - page.save() - self.assertEqual(str(page), "Test Page") - self.assertEqual(str(page.slug), "test-page") - self.assertEqual(str(page.body_markdown), "the body of the page") - self.assertEqual(str(page.body_html), "

the body of the page

") - self.assertEqual(str(page.meta_description), "The meta desc") - self.assertEqual(page.path, None) + self.page.save() + self.pathpage = Page( + title="Test Page", + meta_description="The meta desc", + body_markdown="the body of the page", + path="test-path", + ) + self.pathpage.save() + + def test_string_representation(self): + self.assertEqual(str(self.page), "Test Page") + self.assertEqual(str(self.page.slug), "test-page") + self.assertEqual(str(self.page.body_markdown), "the body of the page") + self.assertEqual(str(self.page.body_html), "

the body of the page

") + self.assertEqual(str(self.page.meta_description), "The meta desc") + self.assertEqual(self.page.path, None) + + def test_get_absolute_url(self): + """Absolute URL should return /page """ + self.assertEqual(str(self.page.get_absolute_url()), "/test-page") + + def test_path_get_absolute_url(self): + """Absolute URL with a path should return /path/page """ + self.assertEqual(str(self.pathpage.get_absolute_url()), "/test-path/test-page") diff --git a/apps/pages/tests/test_views.py b/apps/pages/tests/test_views.py index 42a91e4..c771a29 100644 --- a/apps/pages/tests/test_views.py +++ b/apps/pages/tests/test_views.py @@ -1,9 +1,9 @@ from django.test import RequestFactory, TestCase -from mixer.backend.django import mixer +from django.contrib import auth -from accounts.models import User from pages.models import Page -from pages.views import PageDetailView + +User = auth.get_user_model() class PageViewTest(TestCase): @@ -25,5 +25,3 @@ class PageViewTest(TestCase): def test_detail_view(self): response = self.client.get(self.page.get_absolute_url()) self.assertEqual(response.status_code, 200) - self.assertEqual(response.status_code, 200) - print(response.content) diff --git a/design/templates/notes/partials/note_list.html b/design/templates/notes/partials/note_list.html new file mode 100644 index 0000000..0c91b34 --- /dev/null +++ b/design/templates/notes/partials/note_list.html @@ -0,0 +1,16 @@ +
  • + +

    {{object.title}}

    +
    {{object.body_text|truncatewords:36}}
    +     +
    {% if object.notebook and not hidenotebook %} +
    + {{object.notebook}} +
    {% endif %} +
    tags: {% for tag in object.tags.all %} + + {{tag}} + + {%endfor%}
    +
    +
    • diff --git a/design/templates/notes/partials/note_sidebar.html b/design/templates/notes/partials/note_sidebar.html new file mode 100644 index 0000000..1209fee --- /dev/null +++ b/design/templates/notes/partials/note_sidebar.html @@ -0,0 +1,13 @@ +
    + +
    +
    + +
    diff --git a/design/templates/pages/page.html b/design/templates/pages/page.html index 3feff75..9eccaff 100644 --- a/design/templates/pages/page.html +++ b/design/templates/pages/page.html @@ -1,6 +1,6 @@ {% extends 'base.html' %} {% block content %} -
    +

    {{page.title}}

    {{page.body_html|safe}}
    @@ -22,9 +22,6 @@ novicell.overlay.create({ 'selector': trigger.getAttribute('data-element'), 'class': 'selector-overlay', - "onCreate": function() { console.log('created'); }, - "onLoaded": function() { console.log('loaded'); }, - "onDestroy": function() { console.log('Destroyed'); } }); }); {% endif %} -- cgit v1.2.3-70-g09d2