Created tests and urls. Updated views.

6defcce2 · littleredpanda14 · 0b2f51e9 · 6defcce2 · 6defcce2 · 6defcce2
Commit 6defcce2 authored Mar 18, 2020 by littleredpanda14
Hide whitespace changes
Inline Side-by-side

Showing with 49 additions and 5 deletions

janet.html froyo/templates/janet.html +10 -0

tests.py froyo/tests.py +16 -0

urls.py froyo/urls.py +8 -2

views.py froyo/views.py +15 -3

No files found.
--- a/froyo/templates/janet.html
+++ b/froyo/templates/janet.html
+<!DOCTYPE html>
+<html>
+<head>
+	<title>Hi. My name is Janet.</title>
+</head>
+<body>
+<h1>Hi. My name is Janet.</h1>
+Welcome. Everything is fine.
+</body>
+</html>
\ No newline at end of file
--- a/froyo/tests.py
+++ b/froyo/tests.py
 from django.test import TestCase

 # Create your tests here.
+class JanetPageTest(TestCase):
+	def test_janet_page_returns_correct_html(self):
+		response = self.client.get('/froyo')
+		self.assertTemplateUsed(response, 'janet.html')
+
+
+class IngredientsListPageTest(TestCase):
+	def test_ingredients_list_page_returns_correct_html(self):
+		response = self.client.get('/froyo/ingredients')
+		self.assertTemplateUsed(response, 'ingredients_list.html')
+
+
+class IngredientsListPageTest(TestCase):
+	def test_ingredients_list_page_returns_correct_html(self):
+		response = self.client.get('/froyo/ingredients')
+		self.assertTemplateUsed(response, 'ingredients_list.html')
--- a/froyo/urls.py
+++ b/froyo/urls.py
 from django.conf.urls import url, include


+from .views import JanetView
+
+
 from .views import IngredientsListView, IngredientsDetailView, IngredientsUpdateView, IngredientsCreateView


@@ -13,6 +16,9 @@ from .views import OrdersListView, OrdersDetailView, OrdersUpdateView, OrdersCre


 urlpatterns = [
-    url(r'^froyo$', HeroesView.as_view(), name='hero_list'),
-    url(r'^ingredients/almonds$', JesterView.as_view(), name='jester_detail')
+    url(r'^froyo$', JanetView.as_view(), name='janet'),
+    url(r'^froyo/ingredients$', IngredientsListView.as_view(), name='ingredients_list'),
+	url(r'^froyo/ingredients/almonds$', IngredientsDetailView.as_view(), name='almonds'),
+	url(r'^froyo/ingredients/update$', IngredientsUpdateView.as_view(), name='ingredients_update'),
+	url(r'^froyo/ingredients/create$', IngredientsCreateView.as_view(), name='ingredients_create'),
 ]
\ No newline at end of file
--- a/froyo/views.py
+++ b/froyo/views.py
 from django.shortcuts import render
-from django.views.generic.base import ListView, DetailView, UpdateView, CreateView
+
+
+from django.views.generic.base import TemplateView
+
+
+from django.views.generic import ListView, DetailView, UpdateView, CreateView
+
+
+class JanetView(TemplateView):
+	template_name = 'janet.html'
+
+
+

 class IngredientsListView(ListView):
 	template_name = 'ingredients_list.html'
@@ -45,10 +57,10 @@ class OrdersDetailView(DetailView):
 	template_name = 'orders_detail.html'


-class IngredientUpdateView(UpdateView):
+class OrdersUpdateView(UpdateView):
 	template_name = 'orders_update_form.html'


-class IngredientCreateView(CreateView):
+class OrdersCreateView(CreateView):
 	template_name = 'orders_create_form.html'