diff --git a/db.sqlite3 b/db.sqlite3 index 6e762db3679db7e9b8e75fb2dd5b074bfbbb4f6b..f98c5b8340c7f956670a2b3817dc6eae6ebd5f07 100644 Binary files a/db.sqlite3 and b/db.sqlite3 differ diff --git a/lists/__pycache__/tests.cpython-34.pyc b/lists/__pycache__/tests.cpython-34.pyc index 096fd66aed422df861a3236d982198e2a8874cf5..d02f7ce156776e1112f72e6823650becfe1dc168 100644 Binary files a/lists/__pycache__/tests.cpython-34.pyc and b/lists/__pycache__/tests.cpython-34.pyc differ diff --git a/lists/templates/home.html b/lists/templates/home.html index 1e3da86c5f0bf32c3910cf70b39afe0823cce3fe..84775b7dae33afa5dcdcfc0d1353183814558e42 100644 --- a/lists/templates/home.html +++ b/lists/templates/home.html @@ -3,6 +3,9 @@ <title>To-Do Lists</title> </head> <body> + <h1>Hello World!</h1> + <p>Vitosavero Avila Wibisono</p> + <p>1506688872</p> <h1>Your To-Do list</h1> <form method="POST"> <input name="item_text" id="id_new_item" placeholder="Enter a to-do item"/> @@ -20,6 +23,8 @@ No items {% elif items|length < 5 %} Less than 5 items + {% else %} + More than 5 items {% endif %} </p> </table> diff --git a/lists/tests.py b/lists/tests.py index d387206913538cd97d7427849098dcf2e5a3230e..5c4da98b77003b89a2533ed168704d1535a255bd 100644 --- a/lists/tests.py +++ b/lists/tests.py @@ -16,13 +16,34 @@ class HomePageTest(TestCase): def test_home_page_returns_correct_html(self): request = HttpRequest() - response = home_page(request) + response = self.client.get('/') # expected_html = render_to_string('home.html') # self.assertEqual(response.content.decode(), expected_html) self.assertTrue(response.content.strip().startswith(b'<html>')) self.assertIn(b'<title>To-Do Lists</title>', response.content) self.assertTrue(response.content.strip().endswith(b'</html>')) + def test_home_page_returns_h1_hello_world(self): + request = HttpRequest() + response = home_page(request) + # self.assertTrue(response.content.startswith(b'<html>')) + self.assertIn(b'<h1>Hello World!</h1>', response.content) + # self.assertTrue(response.content.endswith(b'</html>')) + + def test_home_page_returns_name(self): + request = HttpRequest() + response = home_page(request) + # self.assertTrue(response.content.startswith(b'<html>')) + self.assertIn(b'<p>Vitosavero Avila Wibisono</p>', response.content) + # self.assertTrue(response.content.endswith(b'</html>')) + + def test_home_page_returns_npm(self): + request = HttpRequest() + response = home_page(request) + # self.assertTrue(response.content.startswith(b'<html>')) + self.assertIn(b'<p>1506688872</p>', response.content) + # self.assertTrue(response.content.endswith(b'</html>')) + def test_home_page_can_save_a_POST_request(self): request = HttpRequest() request.method = 'POST' @@ -100,24 +121,3 @@ class ItemModelTest(TestCase): second_saved_item = saved_items[1] self.assertEqual(first_saved_item.text, 'The first (ever) list item') self.assertEqual(second_saved_item.text, 'Item the second') - - # def test_home_page_returns_h1_hello_world(self): - # request = HttpRequest() - # response = home_page(request) - # self.assertTrue(response.content.startswith(b'<html>')) - # self.assertIn(b'<h1>Hello World!</h1>', response.content) - # self.assertTrue(response.content.endswith(b'</html>')) - - # def test_home_page_returns_name(self): - # request = HttpRequest() - # response = home_page(request) - # self.assertTrue(response.content.startswith(b'<html>')) - # self.assertIn(b'<p>Vitosavero Avila Wibisono</p>', response.content) - # self.assertTrue(response.content.endswith(b'</html>')) - - # def test_home_page_returns_npm(self): - # request = HttpRequest() - # response = home_page(request) - # self.assertTrue(response.content.startswith(b'<html>')) - # self.assertIn(b'<p>1506688872</p>', response.content) - # self.assertTrue(response.content.endswith(b'</html>'))