Skip to content

F
Francia - Midterm Project
Commit 5ccf59b2 authored by Alex Bernard Francia's avatar Alex Bernard Francia
Browse files
Options

Added remaining templates. Added id tags for buttons for possible future tests.

parent 15db51b0
Show whitespace changes
Inline Side-by-side
Showing with 743 additions and 13 deletions
bash.exe.stackdump 0 → 100644
View file @ 5ccf59b2
Stack trace:
Frame Function Args
000FFFF6250 00180061819 (000FFFF6468, 00000000002, 0018012C425, 000FFFFDE50)
00000000000 00180063747 (00000000064, 00000000000, 00000000080, 00000000000)
000FFFF6540 00180134ACB (00000000000, 00000000068, 00000000000, 006FFFFFFB7)
000FFFF69C0 001801353E9 (000FFFF6710, 001FFFFFFFF, 00000000000, 00000000000)
000FFFF69C0 001800B761B (FEFEFEFEFEFEFEFF, 0018033B0A8, 001004C47B4, 000FFFF6CA0)
000FFFF69C0 001800B77E7 (000FFFF6A78, 000FFFF6CA0, 000FFFF69F8, 00000000000)
000FFFF69C0 0018012C3DB (000FFFF6A78, 000FFFF6CA0, 000FFFF69F8, 00000000000)
000FFFF69C0 00100426944 (000000007F0, 00000000000, 001005D6318, 00000000000)
00000000001 0010042F93A (001800C949C, 00000000000, 001005D6318, 00000000000)
006001D5080 0010043484E (00100414CF3, 006001D3970, 006001D4540, 000FFFF6CAC)
00000000000 00100435B40 (00000000001, 00100000000, 000FFFF6DCC, 00000000000)
00000000000 00100436C9F (00100000000, 00000000000, 00000000000, 00000000000)
5000001000000002 00100437626 (00000000009, 00000000000, 00000000001, 006001D46F0)
5000001000000002 0010043777F (0010041A639, 00000000000, 006001D3970, 00000000083)
5000001000000002 00100430B31 (00000000000, 00100437720, 006001C5CC0, 006001C5CC0)
00000000009 00100430FC1 (00000000000, 00000000000, 00000000000, 00000000000)
End of stack trace (more stack frames may be present)
froyo/templates/home_page.html
View file @ 5ccf59b2
...@@ -62,27 +62,27 @@ ...@@ -62,27 +62,27 @@
</tr> </tr>
<tr class = "r2"> <tr class = "r2">
<td class="link"><a href = ingredients/list>List</a></td> <td class="link" ><a id="ingredients_list" href = ingredients/list>List</a></td>
<td class="link"><a href = recipes/list>List</a></td> <td class="link" id="recipes_list"><a href = recipes/list>List</a></td>
<td class="link"><a href = orders/list>List</a></td> <td class="link" id="orders_list"><a href = orders/list>List</a></td>
</tr> </tr>
<tr class = "r2"> <tr class = "r2">
<td class="link"><a href = ingredients/detail>Detail</a></td> <td class="link" id="ingredients_detail"><a href = ingredients/detail>Detail</a></td>
<td class="link"><a href = recipes/detail>Detail</a></td> <td class="link" id="recipes_detail"><a href = recipes/detail>Detail</a></td>
<td class="link"><a href = orders/detail>Detail</a></td> <td class="link" id="orders_detail"><a href = orders/detail>Detail</a></td>
</tr> </tr>
<tr class = "r2"> <tr class = "r2">
<td class="link"><a href = ingredients/update>Update</a></td> <td class="link" id="ingredients_update"><a href = ingredients/update>Update</a></td>
<td class="link"><a href = recipes/update>Update</a></td> <td class="link" id="recipes_update"><a href = recipes/update>Update</a></td>
<td class="link"><a href = orders/update>Update</a></td> <td class="link" id="orders_update"><a href = orders/update>Update</a></td>
</tr> </tr>
<tr class = "r2"> <tr class = "r2">
<td class="link"><a href = ingredients/create>Create</a></td> <td class="link" id="ingredients_create"><a href = ingredients/create>Create</a></td>
<td class="link"><a href = recipes/create>Create</a></td> <td class="link" id="recipes_create"><a href = recipes/create>Create</a></td>
<td class="link"><a href = orders/create>Create</a></td> <td class="link" id="orders_create"><a href = orders/create>Create</a></td>
</tr> </tr>
</table> </table>
......
froyo/templates/orders_create_form.html 0 → 100644
View file @ 5ccf59b2
<!DOCTYPE html>
<html>
<head>
<title>Orders - Create</title>
<style>
h1#title{
font-family: Arial;
text-align: center;
font-size: 60px;
}
table{
width:45%;
margin-left:auto;
margin-right:auto;
margin-bottom:30px;
}
table, th, td{
border: 2px solid black;
border-collapse: collapse;
font-family: Arial;
font-size: 24px;
}
th, td{
padding: 5px;
}
tr.r1{
text-align:center;
border: 3px solid black;
}
tr.r2{
border: 3px solid black;
}
</style>
</head>
<body>
<h1 id='title'>Orders - Create<h1>
<table>
<tr class = "r1">
<th colspan ="3">ORDER SLIP</th>
</tr>
<tr class = "r2">
<td>Customer</td>
<td>---</td>
<td class="add"><a href = froyo/add>Add Data</a></td>
</tr>
<tr class = "r2">
<td>Size</td>
<td>---</td>
<td class="add"><a href = froyo/add>Add Data</a></td>
</tr>
<tr class = "r2">
<td>Base Recipe</td>
<td>---</td>
<td class="add"><a href = froyo/add>Add Data</a></td>
</tr>
<tr class = "r2">
<td>Customization</td>
<td>---</td>
<td class="add"><a href = froyo/add>Add Data</a></td>
</tr>
</table>
</body>
</html>
\ No newline at end of file
froyo/templates/orders_detail.html 0 → 100644
View file @ 5ccf59b2
<!DOCTYPE html>
<html>
<head>
<title>Orders - Detail</title>
<style>
h1#title{
font-family: Arial;
text-align: center;
font-size: 60px;
}
h2{
font-family:Arial;
text-align:center;
font-size:34px;
margin-top:-20px;
}
table{
width:45%;
margin-left:auto;
margin-right:auto;
margin-bottom:30px;
}
table, th, td{
border: 2px solid black;
border-collapse: collapse;
font-family: Arial;
font-size: 24px;
}
th, td{
padding: 5px;
}
tr.r1{
text-align:center;
border: 3px solid black;
}
tr.r2{
border: 3px solid black;
}
</style>
</head>
<body>
<h1 id='title'>Orders - Detail<h1>
<h2>(GEM)</h2>
<table>
<tr class = "r1">
<th colspan ="2">ORDER SLIP</th>
</tr>
<tr class = "r2">
<td>Customer</td>
<td>Gem</td>
</tr>
<tr class = "r2">
<td>Size</td>
<td>Large (8oz)</td>
</tr>
<tr class = "r2">
<td>Base Recipe</td>
<td>Coffee Crumble</td>
</tr>
<tr class = "r2">
<td>Customization</td>
<td>1 corn flakes<br/>no whipped cream</td>
</tr>
</table>
</body>
</html>
\ No newline at end of file
froyo/templates/orders_list.html 0 → 100644
View file @ 5ccf59b2
<!DOCTYPE html>
<html>
<head>
<title>Orders - List</title>
<style>
h1#title{
font-family: Arial;
text-align: center;
font-size: 60px;
}
table{
width:45%;
margin-left:auto;
margin-right:auto;
margin-bottom:30px;
}
table, th, td{
border: 2px solid black;
border-collapse: collapse;
font-family: Arial;
font-size: 24px;
}
th, td{
padding: 5px;
}
tr.r1{
text-align:center;
border: 3px solid black;
}
tr.r2{
border: 3px solid black;
}
</style>
</head>
<body>
<h1 id='title'>Orders - List<h1>
<table>
<tr class = "r1">
<th colspan ="2">ORDER SLIP</th>
</tr>
<tr class = "r2">
<td>Customer</td>
<td>Crystal</td>
</tr>
<tr class = "r2">
<td>Size</td>
<td>Small (4oz)</td>
</tr>
<tr class = "r2">
<td>Base Recipe</td>
<td>Cookies and Cream</td>
</tr>
<tr class = "r2">
<td>Customization</td>
<td>1 mini mallows<br/>2 chocolate sprinkles</td>
</tr>
</table>
<table>
<tr class = "r1">
<th colspan ="2">ORDER SLIP</th>
</tr>
<tr class = "r2">
<td>Customer</td>
<td>Jewel</td>
</tr>
<tr class = "r2">
<td>Size</td>
<td>Medium (6oz)</td>
</tr>
<tr class = "r2">
<td>Base Recipe</td>
<td>Banoffee</td>
</tr>
<tr class = "r2">
<td>Customization</td>
<td>1 cashews<br/>1 whipped cream</td>
</tr>
</table>
<table>
<tr class = "r1">
<th colspan ="2">ORDER SLIP</th>
</tr>
<tr class = "r2">
<td>Customer</td>
<td>Gem</td>
</tr>
<tr class = "r2">
<td>Size</td>
<td>Large (8oz)</td>
</tr>
<tr class = "r2">
<td>Base Recipe</td>
<td>Coffee Crumble</td>
</tr>
<tr class = "r2">
<td>Customization</td>
<td>1 corn flakes<br/>no whipped cream</td>
</tr>
</table>
</body>
</html>
\ No newline at end of file
froyo/templates/orders_update_form.html 0 → 100644
View file @ 5ccf59b2
<!DOCTYPE html>
<html>
<head>
<title>Orders - Update</title>
<style>
h1#title{
font-family: Arial;
text-align: center;
font-size: 60px;
}
h2{
font-family:Arial;
text-align:center;
font-size:34px;
margin-top:-20px;
}
table{
width:45%;
margin-left:auto;
margin-right:auto;
margin-bottom:30px;
}
table, th, td{
border: 2px solid black;
border-collapse: collapse;
font-family: Arial;
font-size: 24px;
}
th, td{
padding: 5px;
}
tr.r1{
text-align:center;
border: 3px solid black;
}
tr.r2{
border: 3px solid black;
}
</style>
</head>
<body>
<h1 id='title'>Orders - Update<h1>
<h2>(GEM)</h2>
<table>
<tr class = "r1">
<th colspan ="3">ORDER SLIP</th>
</tr>
<tr class = "r2">
<td>Customer</td>
<td>Gem</td>
<td class="update"><a href = froyo/update>Update</a></td>
</tr>
<tr class = "r2">
<td>Size</td>
<td>Large (8oz)</td>
<td class="update"><a href = froyo/update>Update</a></td>
</tr>
<tr class = "r2">
<td>Base Recipe</td>
<td>Coffee Crumble</td>
<td class="update"><a href = froyo/update>Update</a></td>
</tr>
<tr class = "r2">
<td>Customization</td>
<td>1 corn flakes<br/>no whipped cream</td>
<td class="update"><a href = froyo/update>Update</a></td>
</tr>
</table>
</body>
</html>
\ No newline at end of file
froyo/templates/recipes_create_form.html 0 → 100644
View file @ 5ccf59b2
<!DOCTYPE html>
<html>
<head>
<title>Recipes - Create</title>
<style>
h1#title{
font-family: Arial;
text-align: center;
font-size: 60px;
}
table{
width:45%;
margin-left:auto;
margin-right:auto;
}
table, th, td{
border: 2px solid black;
border-collapse: collapse;
font-family: Arial;
font-size: 24px;
}
th, td{
padding: 5px;
}
tr.r1{
text-align:center;
border: 3px solid black;
}
tr.r2{
border: 3px solid black;
}
td.add{
font-size:18px;
text-align:center;
}
</style>
</head>
<body>
<h1 id='title'>Recipes - Create<h1>
<table>
<tr class = "r1">
<th colspan ="2">RECIPE:</th>
<td class="add"><a href = froyo/add>Change Recipe Title</a></td>
</tr>
<tr class = "r2">
<td>---</td>
<td>---</td>
<td class="add"><a href = froyo/add>Add Data</a></td>
</tr>
</table>
</body>
</html>
\ No newline at end of file
froyo/templates/recipes_detail.html 0 → 100644
View file @ 5ccf59b2
<!DOCTYPE html>
<html>
<head>
<title>Recipes - Detail</title>
<style>
h1#title{
font-family: Arial;
text-align: center;
font-size: 60px;
}
h2{
font-family:Arial;
text-align:center;
font-size:34px;
margin-top:-20px;
}
table{
width:45%;
margin-left:auto;
margin-right:auto;
margin-bottom:30px;
}
table, th, td{
border: 2px solid black;
border-collapse: collapse;
font-family: Arial;
font-size: 24px;
}
th, td{
padding: 5px;
}
tr.r1{
text-align:center;
border: 3px solid black;
}
tr.r2{
border: 3px solid black;
}
</style>
</head>
<body>
<h1 id='title'>Recipes - Detail <h1>
<h2>(COFFEE CRUMBLE)</h2>
<table>
<tr class = "r1">
<th colspan ="2">RECIPE: COFFEE CRUMBLE</th>
</tr>
<tr class = "r2">
<td>plain frozen yogurt</td>
<td>1</td>
</tr>
<tr class = "r2">
<td>coffee powder</td>
<td>2</td>
</tr>
<tr class = "r2">
<td>cashews</td>
<td>2</td>
</tr>
<tr class = "r2">
<td>chocolate chips</td>
<td>2</td>
</tr>
<tr class = "r2">
<td>whipped cream</td>
<td>1</td>
</tr>
</table>
</body>
</html>
\ No newline at end of file
froyo/templates/recipes_list.html 0 → 100644
View file @ 5ccf59b2
<!DOCTYPE html>
<html>
<head>
<title>Recipes - List</title>
<style>
h1#title{
font-family: Arial;
text-align: center;
font-size: 60px;
}
table{
width:45%;
margin-left:auto;
margin-right:auto;
margin-bottom:30px;
}
table, th, td{
border: 2px solid black;
border-collapse: collapse;
font-family: Arial;
font-size: 24px;
}
th, td{
padding: 5px;
}
tr.r1{
text-align:center;
border: 3px solid black;
}
tr.r2{
border: 3px solid black;
}
</style>
</head>
<body>
<h1 id='title'>Recipes - List<h1>
<table>
<tr class = "r1">
<th colspan ="2">RECIPE: COOKIES AND CREAM</th>
</tr>
<tr class = "r2">
<td>plain frozen yogurt</td>
<td>1</td>
</tr>
<tr class = "r2">
<td>full cream milk</td>
<td>1</td>
</tr>
<tr class = "r2">
<td>Oreo cookies</td>
<td>2</td>
</tr>
<tr class = "r2">
<td>whipped cream</td>
<td>1</td>
</tr>
</table>
<table>
<tr class = "r1">
<th colspan ="2">RECIPE: COFFEE CRUMBLE</th>
</tr>
<tr class = "r2">
<td>plain frozen yogurt</td>
<td>1</td>
</tr>
<tr class = "r2">
<td>coffee powder</td>
<td>2</td>
</tr>
<tr class = "r2">
<td>cashews</td>
<td>2</td>
</tr>
<tr class = "r2">
<td>chocolate chips</td>
<td>2</td>
</tr>
<tr class = "r2">
<td>whipped cream</td>
<td>1</td>
</tr>
</table>
</body>
</html>
\ No newline at end of file
froyo/templates/recipes_update_form.html 0 → 100644
View file @ 5ccf59b2
<!DOCTYPE html>
<html>
<head>
<title>Recipes - Update</title>
<style>
h1#title{
font-family: Arial;
text-align: center;
font-size: 60px;
}
h2{
font-family:Arial;
text-align:center;
font-size:34px;
margin-top:-20px;
}
table{
width:45%;
margin-left:auto;
margin-right:auto;
}
table, th, td{
border: 2px solid black;
border-collapse: collapse;
font-family: Arial;
font-size: 24px;
}
th, td{
padding: 5px;
}
tr.r1{
text-align:center;
border: 3px solid black;
}
tr.r2{
border: 3px solid black;
}
td.add{
font-size:18px;
text-align:center;
}
</style>
</head>
<body>
<h1 id='title'>Recipes - Update<h1>
<h2>(COFFEE CRUMBLE)</h2>
<table>
<tr class = "r1">
<th colspan ="2">RECIPE: COFFEE CRUMBLE</th>
<td class="update"><a href = froyo/update>Change Recipe Title</a></td>
</tr>
<tr class = "r2">
<td>plain frozen yogurt</td>
<td>1</td>
<td class="update"><a href = froyo/update>Update</a></td>
</tr>
<tr class = "r2">
<td>coffee powder</td>
<td>2</td>
<td class="update"><a href = froyo/update>Update</a></td>
</tr>
<tr class = "r2">
<td>cashews</td>
<td>2</td>
<td class="update"><a href = froyo/update>Update</a></td>
</tr>
<tr class = "r2">
<td>chocolate chips</td>
<td>2</td>
<td class="update"><a href = froyo/update>Update</a></td>
</tr>
<tr class = "r2">
<td>whipped cream</td>
<td>1</td>
<td class="update"><a href = froyo/update>Update</a></td>
</tr>
</table>
</body>
</html>
\ No newline at end of file
froyo/tests.py
View file @ 5ccf59b2
# from django.urls import resolve # from django.urls import resolve
from selenium import webdriver
from django.test import TestCase from django.test import TestCase
# from django.template.loader import render_to_string # from django.template.loader import render_to_string
...@@ -23,6 +25,8 @@ class HomePageTest(TestCase): ...@@ -23,6 +25,8 @@ class HomePageTest(TestCase):
self.assertTemplateUsed(response, 'home_page.html') self.assertTemplateUsed(response, 'home_page.html')
class IngredientsListTest(TestCase): class IngredientsListTest(TestCase):
def test_ingredients_list_page_returns_correct_html(self): def test_ingredients_list_page_returns_correct_html(self):
...@@ -48,6 +52,8 @@ class IngredientsCreateTest(TestCase): ...@@ -48,6 +52,8 @@ class IngredientsCreateTest(TestCase):
self.assertTemplateUsed(response, 'ingredients_create_form.html') self.assertTemplateUsed(response, 'ingredients_create_form.html')
class RecipesListTest(TestCase): class RecipesListTest(TestCase):
def test_recipes_list_page_returns_correct_html(self): def test_recipes_list_page_returns_correct_html(self):
...@@ -73,6 +79,8 @@ class RecipesCreateTest(TestCase): ...@@ -73,6 +79,8 @@ class RecipesCreateTest(TestCase):
self.assertTemplateUsed(response, 'recipes_create_form.html') self.assertTemplateUsed(response, 'recipes_create_form.html')
class OrdersListTest(TestCase): class OrdersListTest(TestCase):
def test_orders_list_page_returns_correct_html(self): def test_orders_list_page_returns_correct_html(self):
...@@ -96,3 +104,26 @@ class OrdersCreateTest(TestCase): ...@@ -96,3 +104,26 @@ class OrdersCreateTest(TestCase):
def test_orders_create_page_returns_correct_html(self): def test_orders_create_page_returns_correct_html(self):
response = self.client.get('/orders/create') response = self.client.get('/orders/create')
self.assertTemplateUsed(response, 'orders_create_form.html') self.assertTemplateUsed(response, 'orders_create_form.html')
# class IngredientsListButtonTest(TestCase):
# def setUp(self):
# self.browser = webdriver.Firefox()
# def tearDown(self):
# self.browser.quit()
# def test_ingredients_list_button_click_redirects_to_correct_html(self):
# self.browser.get('http://localhost:8000/')
# response = self.client.get('/')
# # self.assertTrue(self.browser.find_element_by_id("ingredients_list"))
# # elem = self.browser.find_element_by_id("ingredients_list")
# self.assertTrue(self.browser.find_element_by_id("ingredients_list"))
# elem = self.browser.find_element_by_id("ingredients_list")
# elem.click()
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment