Finished heroes unit test.

.gitignore

-testenv/
+env/
 __pycache__
 *.pyc
+geckodriver.exe

functional_tests.py

@@ -11,7 +11,7 @@ class NewVisitorTest(unittest.TestCase):
 	def test_can_display_a_heroes_list_and_more_information_per_hero(self):
 		# Widget has heard about a new wiki app for the game called The Will of the Wisps.
 		# She goes to check out its homepage
-		self.browser.get('http://localhost:8000')
+		self.browser.get('http://localhost:8000/heroes')
 
 		# She notices the page title and header mention
 		# 'The Will of the Wisps Wiki'
@@ -19,7 +19,6 @@ class NewVisitorTest(unittest.TestCase):
 
 		# She sees a list containing three heroes with their corresponding
 		# names, health points, and damage
-		self.browser.get('http:://localhost:8000/heroes')
 
 		# When she selects one of the heroes, she is sent to another page
 		# containing more information about the hero (additional stats, lore, image).

heroes/tests.py

@@ -3,8 +3,5 @@ from django.test import TestCase
 
 class HomePageTest(TestCase):
 	def test_heroes_page_returns_correct_html(self):
-		response = self.client.get('/')
-
-		html = response.content.decode('utf8')
-
+		response = self.client.get('/heroes/')
 		self.assertTemplateUsed(response, 'heroes.html')

heroes/urls.py

 from django.conf.urls import url
 
-from .views import heroes_page
+from .views import heroes_page, cloud_page, sunflowey_page, jester_page
 
 urlpatterns = [
 	url(r'^heroes/$', heroes_page, name='heroes_page'),
 	url(r'^hero/cloud$', cloud_page, name='cloud_page'),
-	url(r'^hero/sunflowey$', sunflowey_page, name='sunflowey_page'),
-	url(r'^hero/jester$', jester_page, name='jester_page'),
+	url(r'^hero/sunflowey$', sunflowey_page, name='cloud_page'),
+	url(r'^hero/jester$', jester_page, name='cloud_page'),
 ]

heroes/views.py

@@ -2,3 +2,12 @@ from django.shortcuts import render
 
 def heroes_page(request):
 	return render(request, 'heroes.html')
+
+def cloud_page(request):
+	pass
+
+def sunflowey_page(request):
+	pass
+
+def jester_page(request):
+	pass

lab1_functional_test.py

-from selenium import webdriver
-import unittest
-
-class NewVisitorTest(unittest.TestCase):
-	def setUp(self):
-		self.browser = webdriver.Firefox()
-		
-	def tearDown(self):
-		self.browser.quit()
-
-	def test_can_display_a_heroes_list_and_more_information_per_hero(self):
-		# Widget has heard about a new wiki app for the game called The Will of the Wisps. 
-		# She goes to check out its homepage
-		browser.get('http://localhost:8000')
-
-		# She notices the page title and header mention 
-		# 'The Will of the Wisps Wiki'
-		self.assertIn('The Will of the Wisps Wiki', self.browser.title)
-		
-		# She sees a list containing three heroes with their corresponding 
-		# names, health points, and damage 
-		
-		# When she selects one of the heroes, she is sent to another page
-		# containing more information about the hero (additional stats, lore, image).
-		
-		# She spots the page title and header mentions the name of the hero she selected.
-		
-		# 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.	
-		
-		self.fail('Finish the test!')
\ No newline at end of file

willowisp/settings.py

@@ -37,6 +37,7 @@ INSTALLED_APPS = [
     'django.contrib.sessions',
     'django.contrib.messages',
     'django.contrib.staticfiles',
+    'heroes',
 ]
 
 MIDDLEWARE = [
@@ -75,8 +76,12 @@ WSGI_APPLICATION = 'willowisp.wsgi.application'
 
 DATABASES = {
     'default': {
-        'ENGINE': 'django.db.backends.sqlite3',
-        'NAME': os.path.join(BASE_DIR, 'db.sqlite3'),
+        'ENGINE': 'django.db.backends.postgresql_psycopg2',
+        'NAME': 'willowisp',
+        'USER': 'postgres',
+        'PASSWORD': 'tabatsoy11',
+        'HOST': 'localhost',
+        'PORT': '5432',
     }
 }
 

willowisp/urls.py

-"""willowisp URL Configuration
-
-The `urlpatterns` list routes URLs to views. For more information please see:
-    https://docs.djangoproject.com/en/1.11/topics/http/urls/
-Examples:
-Function views
-    1. Add an import:  from my_app import views
-    2. Add a URL to urlpatterns:  url(r'^$', views.home, name='home')
-Class-based views
-    1. Add an import:  from other_app.views import Home
-    2. Add a URL to urlpatterns:  url(r'^$', Home.as_view(), name='home')
-Including another URLconf
-    1. Import the include() function: from django.conf.urls import url, include
-    2. Add a URL to urlpatterns:  url(r'^blog/', include('blog.urls'))
-"""
-from django.conf.urls import url
+from django.conf.urls import include, url
 from django.contrib import admin
 
 urlpatterns = [
     url(r'^admin/', admin.site.urls),
+    url(r'', include('heroes.urls')),
 ]