Commit 31540fbb authored by John Carlos Sanil's avatar John Carlos Sanil

Merge branch 'develop' into 'master'

Develop to Master

See merge request !5
parents ad63f340 8683da87
virtualenv/
db.sqlite3
geckodriver.log
geckodriver.exe
myenv/
__pycache__
*.pyc
from django.contrib import admin
# Register your models here.
from django.apps import AppConfig
class HeroesConfig(AppConfig):
name = 'heroes'
from django.db import models
# Create your models here.
<!DOCTYPE html>
<html>
<head>
<title>Detail - Cloud</title>
</head>
<body>
<img src="./cloud.png" style="width: 10vw;" />
<h1 id="header_cloud"><a href="/hero/cloud">Detail - Cloud</a></h1>
<dl>
<dt>Health Points</dt>
<dd>600</dd>
<dt>Base Attack Damage</dt>
<dd>57</dd>
<dt>Skills</dt>
<dd>Nimbus, Rain Cloud, Thunderbolt</dd>
<dt>Lore</dt>
<dd>I am a cloud. When I pee you call it 'rain'.</dd>
</dl>
<button><a href="/heroes">Back to Home</a></button>
</body>
</html>
<!DOCTYPE html>
<html>
<head>
<title>Detail - Jester</title>
</head>
<body>
<img src="./jester.png" style="width: 10vw;" />
<h1 id="header_jester"><a href="/hero/jester">Detail - Jester</a></h1>
<dl>
<dt>Health Points</dt>
<dd>660</dd>
<dt>Base Attack Damage</dt>
<dd>64</dd>
<dt>Skills</dt>
<dd>Laugh, Dance, Smile</dd>
<dt>Lore</dt>
<dd>I do it for the LOLs.</dd>
</dl>
<button><a href="/heroes">Back to Home</a></button>
</body>
</html>
<!DOCTYPE html>
<html>
<head>
<title>Detail - Sunflowey</title>
</head>
<body>
<img src="./sunflowey.png" style="width: 10vw;" />
<h1 id="header_sunflowey">
<a href="/hero/sunflowey">Detail - Sunflowey</a>
</h1>
<dl>
<dt>Health Points</dt>
<dd>650</dd>
<dt>Base Attack Damage</dt>
<dd>43</dd>
<dt>Skills</dt>
<dd>Power Pellet, Sunshine, Pollen Punch</dd>
<dt>Lore</dt>
<dd>I am Sunflowey. Sometimes a sun, sometimes a flower.</dd>
</dl>
<button href="/heroes" id="back_to_home">Back to Home</button>
</body>
</html>
<html>
<head>
<title>The Will of the Wisps Wiki</title>
</head>
<body>
<h1 id="wiki">The Will of the Wisps Wiki</h1>
<h1 id="cloud"><a href="/hero/cloud">Cloud</a></h1>
<dl>
<dt>Health Points</dt>
<dd id="cloud_health">600</dd>
<dt>Base Attack Damage</dt>
<dd id="cloud_damage">57</dd>
</dl>
<h1 id="sunflowey"><a href="/hero/sunflowey">Sunflowey</a></h1>
<dl>
<dt>Health Points</dt>
<dd id="sunflowey_health">650</dd>
<dt>Base Attack Damage</dt>
<dd id="sunflowey_damage">43</dd>
</dl>
<h1 id="jester"><a href="/hero/jester">Jester</a></h1>
<dl>
<dt>Health Points</dt>
<dd id="jester_health">660</dd>
<dt>Base Attack Damage</dt>
<dd id="jester_damage">64</dd>
</dl>
</body>
</html>
from django.test import TestCase
# Create your tests here.
from django.conf.urls import url
from .views import heroes_home, cloud_hero, jester_hero, sunflowey_hero
urlpatterns = [
url(r'^heroes$', heroes_home, name='hero_home'),
url(r'^hero/cloud$', cloud_hero, name='cloud_hero'),
url(r'^hero/sunflowey$', sunflowey_hero, name='sunflowey_hero'),
url(r'^hero/jester$', jester_hero, name='jester_hero'),
]
\ No newline at end of file
from django.shortcuts import render
def heroes_home(request):
return render(request, 'heroes.html')
def cloud_hero(request):
return render(request, 'detail_cloud.html')
def jester_hero(request):
return render(request, 'detail_jester.html')
def sunflowey_hero(request):
return render(request, 'detail_sunflowey.html')
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
self.browser.get('http://localhost:8000/heroes')
# 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)
self.assertTrue(self.browser.find_element_by_id("wiki"))
# She sees a list containing three heroes with their corresponding
# names, health points, and damage
self.assertTrue(self.browser.find_element_by_id("cloud"))
self.assertTrue(self.browser.find_element_by_id("cloud_health"))
self.assertTrue(self.browser.find_element_by_id("cloud_damage"))
self.assertTrue(self.browser.find_element_by_id("sunflowey"))
self.assertTrue(self.browser.find_element_by_id("sunflowey_health"))
self.assertTrue(self.browser.find_element_by_id("sunflowey_damage"))
self.assertTrue(self.browser.find_element_by_id("jester"))
self.assertTrue(self.browser.find_element_by_id("jester_health"))
self.assertTrue(self.browser.find_element_by_id("jester_damage"))
# When she selects one of the heroes, she is sent to another page
# containing more information about the hero (additional stats, lore, image).
self.browser.get('http://localhost:8000/hero/cloud')
# She spots the page title and header mentions the name of the hero she selected.
self.assertIn('Detail - Cloud', self.browser.title)
self.assertTrue(self.browser.find_element_by_id("header_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.
self.assertTrue(self.browser.find_elements_by_tag_name("button"))
self.browser.get('http://localhost:8000/heroes')
# She then checks the rest of the heroes and goes back to the wiki's homepage.
self.browser.get('http://localhost:8000/hero/sunflowey')
self.assertIn('Detail - Sunflowey', self.browser.title)
self.assertTrue(self.browser.find_element_by_id("header_sunflowey"))
self.assertTrue(self.browser.find_elements_by_tag_name("button"))
self.browser.get('http://localhost:8000/heroes')
self.browser.get('http://localhost:8000/hero/jester')
self.assertIn('Detail - Jester', self.browser.title)
self.assertTrue(self.browser.find_element_by_id("header_jester"))
self.assertTrue(self.browser.find_elements_by_tag_name("button"))
self.browser.get('http://localhost:8000/heroes')
self.fail('Finish the test!')
if __name__=='__main__':
unittest.main(warnings='ignore')
\ No newline at end of file
#!/usr/bin/env python
"""Django's command-line utility for administrative tasks."""
import os
import sys
def main():
os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'willowisp.settings')
try:
from django.core.management import execute_from_command_line
except ImportError as exc:
raise ImportError(
"Couldn't import Django. Are you sure it's installed and "
"available on your PYTHONPATH environment variable? Did you "
"forget to activate a virtual environment?"
) from exc
execute_from_command_line(sys.argv)
if __name__ == '__main__':
main()
"""
ASGI config for willowisp project.
It exposes the ASGI callable as a module-level variable named ``application``.
For more information on this file, see
https://docs.djangoproject.com/en/3.0/howto/deployment/asgi/
"""
import os
from django.core.asgi import get_asgi_application
os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'willowisp.settings')
application = get_asgi_application()
"""
Django settings for willowisp project.
Generated by 'django-admin startproject' using Django 3.0.2.
For more information on this file, see
https://docs.djangoproject.com/en/3.0/topics/settings/
For the full list of settings and their values, see
https://docs.djangoproject.com/en/3.0/ref/settings/
"""
import os
# Build paths inside the project like this: os.path.join(BASE_DIR, ...)
BASE_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
# Quick-start development settings - unsuitable for production
# See https://docs.djangoproject.com/en/3.0/howto/deployment/checklist/
# SECURITY WARNING: keep the secret key used in production secret!
SECRET_KEY = 'l_gq9a)ilb-ba4q-duhcjl%g8793&uh%45z=o_$-&6=7d#z1gc'
# SECURITY WARNING: don't run with debug turned on in production!
DEBUG = True
ALLOWED_HOSTS = []
# Application definition
INSTALLED_APPS = [
'django.contrib.admin',
'django.contrib.auth',
'django.contrib.contenttypes',
'django.contrib.sessions',
'django.contrib.messages',
'django.contrib.staticfiles',
'heroes',
]
MIDDLEWARE = [
'django.middleware.security.SecurityMiddleware',
'django.contrib.sessions.middleware.SessionMiddleware',
'django.middleware.common.CommonMiddleware',
'django.middleware.csrf.CsrfViewMiddleware',
'django.contrib.auth.middleware.AuthenticationMiddleware',
'django.contrib.messages.middleware.MessageMiddleware',
'django.middleware.clickjacking.XFrameOptionsMiddleware',
]
ROOT_URLCONF = 'willowisp.urls'
TEMPLATES = [
{
'BACKEND': 'django.template.backends.django.DjangoTemplates',
'DIRS': [],
'APP_DIRS': True,
'OPTIONS': {
'context_processors': [
'django.template.context_processors.debug',
'django.template.context_processors.request',
'django.contrib.auth.context_processors.auth',
'django.contrib.messages.context_processors.messages',
],
},
},
]
WSGI_APPLICATION = 'willowisp.wsgi.application'
# Database
# https://docs.djangoproject.com/en/3.0/ref/settings/#databases
DATABASES = {
'default': {
'ENGINE': 'django.db.backends.sqlite3',
'NAME': os.path.join(BASE_DIR, 'db.sqlite3'),
}
}
# Password validation
# https://docs.djangoproject.com/en/3.0/ref/settings/#auth-password-validators
AUTH_PASSWORD_VALIDATORS = [
{
'NAME': 'django.contrib.auth.password_validation.UserAttributeSimilarityValidator',
},
{
'NAME': 'django.contrib.auth.password_validation.MinimumLengthValidator',
},
{
'NAME': 'django.contrib.auth.password_validation.CommonPasswordValidator',
},
{
'NAME': 'django.contrib.auth.password_validation.NumericPasswordValidator',
},
]
# Internationalization
# https://docs.djangoproject.com/en/3.0/topics/i18n/
LANGUAGE_CODE = 'en-us'
TIME_ZONE = 'UTC'
USE_I18N = True
USE_L10N = True
USE_TZ = True
# Static files (CSS, JavaScript, Images)
# https://docs.djangoproject.com/en/3.0/howto/static-files/
STATIC_URL = '/static/'
"""willowisp URL Configuration
The `urlpatterns` list routes URLs to views. For more information please see:
https://docs.djangoproject.com/en/3.0/topics/http/urls/
Examples:
Function views
1. Add an import: from my_app import views
2. Add a URL to urlpatterns: path('', views.home, name='home')
Class-based views
1. Add an import: from other_app.views import Home
2. Add a URL to urlpatterns: path('', Home.as_view(), name='home')
Including another URLconf
1. Import the include() function: from django.urls import include, path
2. Add a URL to urlpatterns: path('blog/', include('blog.urls'))
"""
from django.conf.urls import include, url
from django.contrib import admin
urlpatterns = [
url(r'^admin/', admin.site.urls),
url(r'', include('heroes.urls')),
]
"""
WSGI config for willowisp project.
It exposes the WSGI callable as a module-level variable named ``application``.
For more information on this file, see
https://docs.djangoproject.com/en/3.0/howto/deployment/wsgi/
"""
import os
from django.core.wsgi import get_wsgi_application
os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'willowisp.settings')
application = get_wsgi_application()
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