VelogaWhite commited on
Commit
3ac22ae
·
1 Parent(s): 23bd0ad

Refactor: Convert To-Do App to Calculator using TDD (Client-side JS)

Browse files
Files changed (2) hide show
  1. src/lists/templates/base.html +1 -1
  2. src/lists/tests.py +10 -118
src/lists/templates/base.html CHANGED
@@ -1,6 +1,6 @@
1
  <!doctype html>
2
  <html lang="en" data-bs-theme="dark">
3
-
4
  <head>
5
  <title>Calculator</title>
6
  <meta charset="utf-8">
 
1
  <!doctype html>
2
  <html lang="en" data-bs-theme="dark">
3
+ <link rel="icon" href="data:,">
4
  <head>
5
  <title>Calculator</title>
6
  <meta charset="utf-8">
src/lists/tests.py CHANGED
@@ -1,126 +1,18 @@
1
  from django.test import TestCase
2
- from lists.models import Item, List
3
- import lxml.html
4
 
5
  class HomePageTest(TestCase):
6
  def test_uses_home_template(self):
7
  response = self.client.get("/")
8
  self.assertTemplateUsed(response, "home.html")
9
 
10
- def test_renders_input_form(self):
11
  response = self.client.get("/")
12
- parsed = lxml.html.fromstring(response.content)
13
- [form] = parsed.cssselect("form[method=POST]")
14
- self.assertEqual(form.get("action"), "/lists/new")
15
- inputs = form.cssselect("input")
16
- self.assertIn("item_text", [input.get("name") for input in inputs])
17
- self.assertIn("priority_text", [input.get("name") for input in inputs])
18
-
19
-
20
- class NewItemTest(TestCase):
21
- def test_can_save_a_POST_request_to_an_existing_list(self):
22
- correct_list = List.objects.create()
23
-
24
- self.client.post(
25
- f"/lists/{correct_list.id}/add_item",
26
- data={"item_text": "A new item for an existing list",
27
- "priority_text": "High"
28
- },
29
- )
30
-
31
- self.assertEqual(Item.objects.count(), 1)
32
- new_item = Item.objects.get()
33
- self.assertEqual(new_item.text, "A new item for an existing list")
34
- self.assertEqual(new_item.priority, "High")
35
- self.assertEqual(new_item.list, correct_list)
36
-
37
- def test_redirects_to_list_view(self):
38
- correct_list = List.objects.create()
39
-
40
- response = self.client.post(
41
- f"/lists/{correct_list.id}/add_item",
42
- data={"item_text": "A new item for an existing list",
43
- "priority_text": "Low"},
44
- )
45
-
46
- self.assertRedirects(response, f"/lists/{correct_list.id}/")
47
-
48
- class NewListTest(TestCase):
49
- def test_can_save_a_POST_request(self):
50
- self.client.post('/lists/new', data={'item_text': 'A new list item'
51
- ,'priority_text': 'Medium'})
52
- self.assertEqual(Item.objects.count(), 1)
53
- new_item = Item.objects.first()
54
- self.assertEqual(new_item.text, 'A new list item')
55
- self.assertEqual(new_item.priority, 'Medium')
56
-
57
- def test_redirects_after_POST(self):
58
- response = self.client.post('/lists/new', data={'item_text': 'A new list item'
59
- ,'priority_text': 'Medium'})
60
- new_list = List.objects.first()
61
- self.assertRedirects(response, f'/lists/{new_list.id}/')
62
-
63
- class ListViewTest(TestCase):
64
- def test_uses_list_template(self):
65
- mylist = List.objects.create()
66
- response = self.client.get(f"/lists/{mylist.id}/")
67
- self.assertTemplateUsed(response, "list.html")
68
-
69
- def test_renders_input_form(self):
70
- mylist = List.objects.create()
71
- response = self.client.get(f"/lists/{mylist.id}/")
72
- parsed = lxml.html.fromstring(response.content)
73
- [form] = parsed.cssselect("form[method=POST]")
74
- self.assertEqual(form.get("action"), f"/lists/{mylist.id}/add_item")
75
- inputs = form.cssselect("input")
76
- self.assertIn("item_text", [input.get("name") for input in inputs])
77
- self.assertIn("priority_text", [input.get("name") for input in inputs])
78
-
79
- def test_displays_only_items_for_that_list(self):
80
- correct_list = List.objects.create()
81
- Item.objects.create(text="itemey 1", priority="P1", list=correct_list)
82
- Item.objects.create(text="itemey 2", priority="P2", list=correct_list)
83
-
84
- other_list = List.objects.create()
85
- Item.objects.create(text="other list item", priority="otherP", list=other_list)
86
-
87
- response = self.client.get(f"/lists/{correct_list.id}/")
88
-
89
- self.assertContains(response, "itemey 1")
90
- self.assertContains(response, "(P1)")
91
- self.assertContains(response, "itemey 2")
92
- self.assertContains(response, "(P2)")
93
- self.assertNotContains(response, "other list item")
94
-
95
- class ListAndItemModelsTest(TestCase):
96
- def test_saving_and_retrieving_items(self):
97
- mylist = List()
98
- mylist.save()
99
-
100
- first_item = Item()
101
- first_item.text = "The first (ever) list item"
102
- first_item.priority = "High"
103
- first_item.list = mylist
104
- first_item.save()
105
-
106
- second_item = Item()
107
- second_item.text = "Item the second"
108
- second_item.priority = "Low"
109
- second_item.list = mylist
110
- second_item.save()
111
-
112
- saved_list = List.objects.get()
113
- self.assertEqual(saved_list, mylist)
114
-
115
- saved_items = Item.objects.all()
116
- self.assertEqual(saved_items.count(), 2)
117
-
118
- first_saved_item = saved_items[0]
119
- second_saved_item = saved_items[1]
120
- self.assertEqual(first_saved_item.text, "The first (ever) list item")
121
- self.assertEqual(first_saved_item.priority, "High")
122
- self.assertEqual(first_saved_item.list, mylist)
123
- self.assertEqual(second_saved_item.text, "Item the second")
124
- self.assertEqual(second_saved_item.priority, "Low")
125
- self.assertEqual(second_saved_item.list, mylist)
126
-
 
1
  from django.test import TestCase
 
 
2
 
3
  class HomePageTest(TestCase):
4
  def test_uses_home_template(self):
5
  response = self.client.get("/")
6
  self.assertTemplateUsed(response, "home.html")
7
 
8
+ def test_displays_calculator_widget(self):
9
  response = self.client.get("/")
10
+ html = response.content.decode('utf8')
11
+
12
+ # Check for the two input boxes
13
+ self.assertIn('id="id_number_1"', html)
14
+ self.assertIn('id="id_number_2"', html)
15
+
16
+ # Check for the two buttons
17
+ self.assertIn('id="id_btn_sum"', html)
18
+ self.assertIn('id="id_btn_subtract"', html)