Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
3 changes: 0 additions & 3 deletions budgetproject/budget/tests.py

This file was deleted.

Empty file.
Binary file not shown.
Binary file not shown.
Binary file not shown.
22 changes: 22 additions & 0 deletions budgetproject/budget/tests/test_urls.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
from django.test import SimpleTestCase
from django.urls import reverse, resolve
from budget.views import project_list, project_detail, ProjectCreateView


class TestUrls(SimpleTestCase):

def test_list_url_resolved(self):
url = reverse('list')

self.assertEqual(resolve(url).func, project_list)

def test_add_url_resolved(self):
url = reverse('add')

self.assertEqual(resolve(url).func.view_class, ProjectCreateView)

def test_detail_url_resolved(self):
url = reverse('detail', args=['some-slug'])

self.assertEqual(resolve(url).func, project_detail)

117 changes: 117 additions & 0 deletions budgetproject/budget/tests/test_views.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,117 @@
from django.test import TestCase, Client
from django.urls import reverse
from budget.models import Project, Category, Expense
import json

class TestViews(TestCase):

def setUp(self):
self.client = Client()
self.list_url = reverse('list')
self.detail_url = reverse('detail', args=['project1'])
self.project1 = Project.objects.create(
name='project1',
budget=10000
)

def test_project_list_GET(self):
# client = Client()
response = self.client.get(self.list_url)


self.assertEqual(response.status_code, 200)
self.assertTemplateUsed(response, 'budget/project-list.html')

def test_project_detail_GET(self):

response = self.client.get(self.detail_url)


self.assertEqual(response.status_code, 200)
self.assertTemplateUsed(response, 'budget/project-detail.html')

def test_project_detail_POST_adds_new_expense(self):
Category.objects.create(
project = self.project1,
name = "development",

)

response = self.client.post(self.detail_url,
{'title' : 'expense1',
'amount' : 1000,
'category': 'development'}

)

self.assertEqual(response.status_code, 302)
self.assertEqual(self.project1.expenses.first().title, 'expense1')

def test_project_detail_POST_no_data(self):
response = self.client.post(self.detail_url,
)

self.assertEqual(self.project1.expenses.count(), 0)

def test_project_detail_DELETE_deletes_expense(self):
category1 = Category.objects.create(
project = self.project1,
name = "development",

)

Expense.objects.create(
project=self.project1,
title='expense1',
amount=1000,
category = category1
)

response = self.client.delete(self.detail_url, json.dumps({
'id': 1,
}))

self.assertEqual(response.status_code, 204)
self.assertEqual(self.project1.expenses.count(), 0)

def test_project_detail_DELETE_no_id(self):
category1 = Category.objects.create(
project = self.project1,
name = "development",

)

Expense.objects.create(
project=self.project1,
title='expense1',
amount=1000,
category = category1
)

response = self.client.delete(self.detail_url)

self.assertEqual(response.status_code, 404)
self.assertEqual(self.project1.expenses.count(), 1)


def test_project_create_POST(self):
url = reverse('add')
response = self.client.post(url, {
'name': 'project2',
'budget': 10000,
'categoriesString': 'design,development'
})

project2 = Project.objects.get(id=2)
self.assertEqual(project2.name, 'project2')
first_category = Category.objects.get(id=1)
self.assertEqual(first_category.project, project2)
self.assertEquals(first_category.name, 'design')

second_category = Category.objects.get(id=2)
self.assertEqual(second_category.project, project2)
self.assertEquals(second_category.name, 'development')




1 change: 1 addition & 0 deletions budgetproject/budget/urls.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
from django.urls import path
from . import views


urlpatterns = [
path('', views.project_list, name='list'),
path('add/', views.ProjectCreateView.as_view(), name='add'),
Expand Down
10 changes: 7 additions & 3 deletions budgetproject/budget/views.py
Original file line number Diff line number Diff line change
Expand Up @@ -35,9 +35,13 @@ def project_detail(request, project_slug):
)

elif request.method == 'DELETE':
id = json.loads(request.body)['id']
expense = Expense.objects.get(id=id)
expense.delete()
try:
id = json.loads(request.body)['id']
expense = Expense.objects.get(id=id)
expense.delete()

except:
return HttpResponse(status = 404)

return HttpResponse(status=204)

Expand Down
Binary file not shown.
Binary file not shown.
Binary file not shown.