updated lab functional tests

heroes/views.py

 from django.shortcuts import render
-from django.views.generic.list import ListView
-from django.views.generic.detail import DetailView
+from django.views.generic import TemplateView
 
 
-class HeroesView(ListView):
-	pass
+class HeroesView(TemplateView):
+	template_name = 'list_heroes.html'
 
 
-class HeroView(DetailView):
+class HeroView(TemplateView):
 	template_name = "detail"
 
 	
\ No newline at end of file

lab1_functional_test.py

@@ -21,31 +21,21 @@ class NewVisitorTest(unittest.TestCase):
 		
 		# She sees a list containing three heroes with their corresponding 
 		# names, health points, and damage 
-		heroesURL = self.browser.get('http://localhost:8000/heroes')
-		self.assertIn('<dl>', heroesURL)
-		self.assertIn('<dt></dt><dd></dd>', heroesURL)
-		self.assertIn('<dt></dt><dd></dd>', heroesURL)
-		self.assertIn('<dt></dt><dd></dd>', heroesURL)
-		self.assertIn('</dl>', heroesURL)
-
-		self.assertIn('<dl>', heroesURL)
-		self.assertIn('<dt></dt><dd></dd>', heroesURL)
-		self.assertIn('<dt></dt><dd></dd>', heroesURL)
-		self.assertIn('<dt></dt><dd></dd>', heroesURL)
-		self.assertIn('</dl>', heroesURL)
-
-		self.assertIn('<dl>', heroesURL)
-		self.assertIn('<dt></dt><dd></dd>', heroesURL)
-		self.assertIn('<dt></dt><dd></dd>', heroesURL)
-		self.assertIn('<dt></dt><dd></dd>', heroesURL)
-		self.assertIn('</dl>', heroesURL)
+		response = self.browser.get('http://localhost:8000/heroes')
+		self.assertEqual(response.resolver_match.func.__name__, HeroesView.as_view().__name__)
+
 		# When she selects one of the heroes, she is sent to another page
 		# containing more information about the hero (additional stats, lore, image).
-		 
+		response = self.browser.get('http://localhost:8000/heroes/cloud')
+		self.assertEqual(response.resolver_match.func.__name__, HeroView.as_view().__name__)
+
 		# She spots the page title and header mentions the name of the hero she selected.
-		
+		self.assertEqual(self.browser.title, 'Detail - Cloud')
+
 		# While she is in a specific hero's page, she sees a button labeled "Back to Heroes List".
 		# She clicks this and she is redirected back to the wiki's homepage.	
+		response = self.browser.get('http://localhost:8000/heroes')
+		self.assertEqual(response.resolver_match.func.__name__, HeroesView.as_view().__name__)
 		
 		self.fail('Finish the test!')