Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
M
Midterm-Project-186050-Columbres-v2
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Alysha Columbres
Midterm-Project-186050-Columbres-v2
Commits
29cd5045
Commit
29cd5045
authored
Mar 19, 2020
by
Alysha Columbres
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Created and tested the views for the orders model
parent
541d04aa
Changes
8
Hide whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
115 additions
and
2 deletions
+115
-2
orders_create_form.html
froyo/templates/orders_create_form.html
+6
-0
orders_detail.html
froyo/templates/orders_detail.html
+6
-0
orders_list.html
froyo/templates/orders_list.html
+6
-0
orders_update_form.html
froyo/templates/orders_update_form.html
+6
-0
tests.py
froyo/tests.py
+29
-1
urls.py
froyo/urls.py
+7
-1
views.py
froyo/views.py
+19
-0
functional_test.py
functional_test.py
+36
-0
No files found.
froyo/templates/orders_create_form.html
0 → 100644
View file @
29cd5045
<!DOCTYPE html>
<html>
<head>
<title>
Orders - Create
</title>
</head>
</html>
\ No newline at end of file
froyo/templates/orders_detail.html
0 → 100644
View file @
29cd5045
<!DOCTYPE html>
<html>
<head>
<title>
Orders - Detail
</title>
</head>
</html>
\ No newline at end of file
froyo/templates/orders_list.html
0 → 100644
View file @
29cd5045
<!DOCTYPE html>
<html>
<head>
<title>
Orders - List
</title>
</head>
</html>
\ No newline at end of file
froyo/templates/orders_update_form.html
0 → 100644
View file @
29cd5045
<!DOCTYPE html>
<html>
<head>
<title>
Orders - Update
</title>
</head>
</html>
\ No newline at end of file
froyo/tests.py
View file @
29cd5045
...
...
@@ -54,4 +54,32 @@ class RecipesCreateFormPageTest(TestCase):
def
test_recipes_create_form_page_returns_correct_html
(
self
):
response
=
self
.
client
.
get
(
'/recipes_create_form_page'
)
self
.
assertTemplateUsed
(
response
,
'recipes_create_form.html'
)
\ No newline at end of file
self
.
assertTemplateUsed
(
response
,
'recipes_create_form.html'
)
class
OrdersListPageTest
(
TestCase
):
def
test_orders_list_page_returns_correct_html
(
self
):
response
=
self
.
client
.
get
(
'/orders_list_page'
)
self
.
assertTemplateUsed
(
response
,
'orders_list.html'
)
class
OrdersDetailPageTest
(
TestCase
):
def
test_orders_detail_page_returns_correct_html
(
self
):
response
=
self
.
client
.
get
(
'/orders_detail_page'
)
self
.
assertTemplateUsed
(
response
,
'orders_detail.html'
)
class
OrdersUpdateFormPageTest
(
TestCase
):
def
test_orders_update_form_page_returns_correct_html
(
self
):
response
=
self
.
client
.
get
(
'/orders_update_form_page'
)
self
.
assertTemplateUsed
(
response
,
'orders_update_form.html'
)
class
OrdersCreateFormPageTest
(
TestCase
):
def
test_orders_create_form_page_returns_correct_html
(
self
):
response
=
self
.
client
.
get
(
'/orders_create_form_page'
)
self
.
assertTemplateUsed
(
response
,
'orders_create_form.html'
)
\ No newline at end of file
froyo/urls.py
View file @
29cd5045
from
django.conf.urls
import
url
from
.views
import
IngredientsListView
,
IngredientsDetailView
,
IngredientsUpdateFormView
,
IngredientsCreateFormView
,
RecipesListView
,
RecipesDetailView
,
RecipesUpdateFormView
,
RecipesCreateFormView
from
.views
import
IngredientsListView
,
IngredientsDetailView
,
IngredientsUpdateFormView
,
IngredientsCreateFormView
,
RecipesListView
,
RecipesDetailView
,
RecipesUpdateFormView
,
RecipesCreateFormView
,
OrdersListView
,
OrdersDetailView
,
OrdersUpdateFormView
,
OrdersCreateFormView
urlpatterns
=
[
url
(
r'^ingredients_list_page$'
,
IngredientsListView
.
as_view
(),
name
=
'Ingredients_List_View'
),
url
(
r'^ingredients_detail_page$'
,
IngredientsDetailView
.
as_view
(),
name
=
'Ingredients_Detail_View'
),
url
(
r'^ingredients_update_form_page$'
,
IngredientsUpdateFormView
.
as_view
(),
name
=
'Ingredients_Update_Form_View'
),
url
(
r'^ingredients_create_form_page$'
,
IngredientsCreateFormView
.
as_view
(),
name
=
'Ingredients_Create_Form_View'
),
url
(
r'^recipes_list_page$'
,
RecipesListView
.
as_view
(),
name
=
'Recipes_List_View'
),
url
(
r'^recipes_detail_page$'
,
RecipesDetailView
.
as_view
(),
name
=
'Recipes_Detail_View'
),
url
(
r'^recipes_update_form_page$'
,
RecipesUpdateFormView
.
as_view
(),
name
=
'Recipes_Update_Form_View'
),
url
(
r'^recipes_create_form_page$'
,
RecipesCreateFormView
.
as_view
(),
name
=
'Recipes_Create_Form_View'
),
url
(
r'^orders_list_page$'
,
OrdersListView
.
as_view
(),
name
=
'Orders_List_View'
),
url
(
r'^orders_detail_page$'
,
OrdersDetailView
.
as_view
(),
name
=
'Orders_Detail_View'
),
url
(
r'^orders_update_form_page$'
,
OrdersUpdateFormView
.
as_view
(),
name
=
'Orders_Update_Form_View'
),
url
(
r'^orders_create_form_page$'
,
OrdersCreateFormView
.
as_view
(),
name
=
'Orders_Create_Form_View'
)
]
\ No newline at end of file
froyo/views.py
View file @
29cd5045
...
...
@@ -4,6 +4,7 @@ from django.views.generic.list import ListView
from
django.views.generic.detail
import
DetailView
from
django.views.generic.edit
import
UpdateView
,
CreateView
class
IngredientsListView
(
ListView
):
model
=
None
...
...
@@ -36,5 +37,23 @@ class RecipesUpdateFormView(UpdateView):
class
RecipesCreateFormView
(
CreateView
):
model
=
None
template_name_suffix
=
'_create_form'
class
OrdersListView
(
ListView
):
model
=
None
class
OrdersDetailView
(
DetailView
):
model
=
None
class
OrdersUpdateFormView
(
UpdateView
):
model
=
None
template_name_suffix
=
'_update_form'
class
OrdersCreateFormView
(
CreateView
):
model
=
None
template_name_suffix
=
'_create_form'
\ No newline at end of file
functional_test.py
View file @
29cd5045
...
...
@@ -89,5 +89,41 @@ class NewVisitorTest(unittest.TestCase):
self
.
browser
.
getCurrentUrl
()
)
# employee opens orders list page and checks title
def
test_can_open_orders_list_page
(
self
):
self
.
browser
.
get
(
'http://localhost:8000/orders_list_page'
)
self
.
assertIn
(
'Orders - List'
,
self
.
browser
.
title
)
self
.
assertEqual
(
'http://localhost:8000/orders_list_page'
,
self
.
browser
.
getCurrentUrl
()
)
# employee opens orders detail page and checks title
def
test_can_open_orders_detail_page
(
self
):
self
.
browser
.
get
(
'http://localhost:8000/orders_detail_page'
)
self
.
assertIn
(
'Orders - Detail'
,
self
.
browser
.
title
)
self
.
assertEqual
(
'http://localhost:8000/orders_detail_page'
,
self
.
browser
.
getCurrentUrl
()
)
# employee opens orders update form page and checks title
def
test_can_open_orders_update_form_page
(
self
):
self
.
browser
.
get
(
'http://localhost:8000/orders_update_form_page'
)
self
.
assertIn
(
'Orders - Update'
,
self
.
browser
.
title
)
self
.
assertEqual
(
'http://localhost:8000/orders_update_form_page'
,
self
.
browser
.
getCurrentUrl
()
)
# employee opens orders create form page and checks title
def
test_can_open_orders_create_form_page
(
self
):
self
.
browser
.
get
(
'http://localhost:8000/orders_create_form_page'
)
self
.
assertIn
(
'Orders - Create'
,
self
.
browser
.
title
)
self
.
assertEqual
(
'http://localhost:8000/orders_create_form_page'
,
self
.
browser
.
getCurrentUrl
()
)
if
__name__
==
'__main__'
:
unittest
.
main
(
warnings
=
'ignore'
)
\ No newline at end of file
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment