Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
L
Lab-1-Columbres
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
Lab-1-Columbres
Commits
5b519bdb
Commit
5b519bdb
authored
Mar 07, 2020
by
Alysha Columbres
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
added id tags for all heroes and edited names
parent
08848fc5
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
22 additions
and
22 deletions
+22
-22
detail_cloud.html
heroes/templates/detail_cloud.html
+5
-5
detail_jester.html
heroes/templates/detail_jester.html
+5
-5
detail_sunflowey.html
heroes/templates/detail_sunflowey.html
+5
-5
lab1_functional_test.py
lab1_functional_test.py
+7
-7
No files found.
heroes/templates/detail_cloud.html
View file @
5b519bdb
...
@@ -4,13 +4,13 @@
...
@@ -4,13 +4,13 @@
<title>
Detail - Cloud
</title>
<title>
Detail - Cloud
</title>
</head>
</head>
<body>
<body>
<img
src=
"./cloud.png"
style=
"width: 10vw;"
/>
<img
id=
'image'
src=
"./cloud.png"
style=
"width: 10vw;"
/>
<h1>
Detail - Cloud
</h1>
<h1>
Detail - Cloud
</h1>
<dl>
<dl>
<dt>
Health Points
</dt><dd>
600
</dd>
<dt
id=
'health'
>
Health Points
</dt><dd>
600
</dd>
<dt>
Base Attack Damage
</dt><dd>
57
</dd>
<dt
id=
'attack'
>
Base Attack Damage
</dt><dd>
57
</dd>
<dt>
Skills
</dt><dd>
Nimbus, Rain Cloud, Thunderbolt
</dd>
<dt
id=
'skills'
>
Skills
</dt><dd>
Nimbus, Rain Cloud, Thunderbolt
</dd>
<dt>
Lore
</dt><dd>
I am a cloud. When I pee you call it 'rain'.
</dd>
<dt
id=
'lore'
>
Lore
</dt><dd>
I am a cloud. When I pee you call it 'rain'.
</dd>
</dl>
</dl>
</body>
</body>
</html>
</html>
\ No newline at end of file
heroes/templates/detail_jester.html
View file @
5b519bdb
...
@@ -4,13 +4,13 @@
...
@@ -4,13 +4,13 @@
<title>
Detail - Jester
</title>
<title>
Detail - Jester
</title>
</head>
</head>
<body>
<body>
<img
src=
"./jester.png"
style=
"width: 10vw;"
/>
<img
id=
'image'
src=
"./jester.png"
style=
"width: 10vw;"
/>
<h1>
Detail - Jester
</h1>
<h1>
Detail - Jester
</h1>
<dl>
<dl>
<dt>
Health Points
</dt><dd>
660
</dd>
<dt
id=
'health'
>
Health Points
</dt><dd>
660
</dd>
<dt>
Base Attack Damage
</dt><dd>
64
</dd>
<dt
id=
'attack'
>
Base Attack Damage
</dt><dd>
64
</dd>
<dt>
Skills
</dt><dd>
Laugh, Dance, Smile
</dd>
<dt
id=
'skills'
>
Skills
</dt><dd>
Laugh, Dance, Smile
</dd>
<dt>
Lore
</dt><dd>
I do it for the LOLs.
</dd>
<dt
id=
'lore'
>
Lore
</dt><dd>
I do it for the LOLs.
</dd>
</dl>
</dl>
</body>
</body>
</html>
</html>
\ No newline at end of file
heroes/templates/detail_sunflowey.html
View file @
5b519bdb
...
@@ -4,13 +4,13 @@
...
@@ -4,13 +4,13 @@
<title>
Detail - Sunflowey
</title>
<title>
Detail - Sunflowey
</title>
</head>
</head>
<body>
<body>
<img
src=
"./sunflowey.png"
style=
"width: 10vw;"
/>
<img
id=
'image'
src=
"./sunflowey.png"
style=
"width: 10vw;"
/>
<h1>
Detail - Sunflowey
</h1>
<h1>
Detail - Sunflowey
</h1>
<dl>
<dl>
<dt>
Health Points
</dt><dd>
650
</dd>
<dt
id=
'health'
>
Health Points
</dt><dd>
650
</dd>
<dt>
Base Attack Damage
</dt><dd>
43
</dd>
<dt
id=
'attack'
>
Base Attack Damage
</dt><dd>
43
</dd>
<dt>
Skills
</dt><dd>
Power Pellet, Sunshine, Pollen Punch
</dd>
<dt
id=
'skills'
>
Skills
</dt><dd>
Power Pellet, Sunshine, Pollen Punch
</dd>
<dt>
Lore
</dt><dd>
I am Sunflowey. Sometimes a sun, sometimes a flower.
</dd>
<dt
id=
'lore'
>
Lore
</dt><dd>
I am Sunflowey. Sometimes a sun, sometimes a flower.
</dd>
</dl>
</dl>
</body>
</body>
</html>
</html>
\ No newline at end of file
lab1_functional_test.py
View file @
5b519bdb
...
@@ -12,7 +12,7 @@ class NewVisitorTest(unittest.TestCase):
...
@@ -12,7 +12,7 @@ class NewVisitorTest(unittest.TestCase):
def
test_can_display_a_heroes_list_and_more_information_per_hero
(
self
):
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.
# Widget has heard about a new wiki app for the game called The Will of the Wisps.
# She goes to check out its homepage
# 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
# She notices the page title and header mention
# 'The Will of the Wisps Wiki'
# 'The Will of the Wisps Wiki'
...
@@ -20,22 +20,22 @@ class NewVisitorTest(unittest.TestCase):
...
@@ -20,22 +20,22 @@ class NewVisitorTest(unittest.TestCase):
# She sees a list containing three heroes with their corresponding
# She sees a list containing three heroes with their corresponding
# names, health points, and damage
# names, health points, and damage
sel
d
.
assertIn
(
self
.
browser
.
current_url
,
sel
f
.
assertIn
(
self
.
browser
.
current_url
,
'http://localhost:8000/heroes'
)
'http://localhost:8000/heroes'
)
# When she selects one of the heroes, she is sent to another page
# When she selects one of the heroes, she is sent to another page
# containing more information about the hero (additional stats, lore, image).
# containing more information about the hero (additional stats, lore, image).
self
.
browser
.
get
(
'http://localhost:8000/hero/cloud'
)
self
.
browser
.
get
(
'http://localhost:8000/hero/cloud'
)
self
.
assertIn
(
'Health Points'
,
self
.
browser
.
find_element_by_id
(
'he
ro_he
alth'
)
.
text
)
self
.
assertIn
(
'Health Points'
,
self
.
browser
.
find_element_by_id
(
'health'
)
.
text
)
self
.
assertIn
(
'Base Attack Damage'
,
self
.
browser
.
find_element_by_id
(
'
hero_
attack'
)
.
text
)
self
.
assertIn
(
'Base Attack Damage'
,
self
.
browser
.
find_element_by_id
(
'attack'
)
.
text
)
self
.
assertIn
(
'Skills'
,
self
.
browser
.
find_element_by_id
(
'
hero_
skills'
)
.
text
)
self
.
assertIn
(
'Skills'
,
self
.
browser
.
find_element_by_id
(
'skills'
)
.
text
)
self
.
assertIn
(
'Lore'
,
self
.
browser
.
find_element_by_id
(
'
hero_
lore'
)
.
text
)
self
.
assertIn
(
'Lore'
,
self
.
browser
.
find_element_by_id
(
'lore'
)
.
text
)
self
.
assertIn
(
'.png'
,
self
.
browser
.
find_element_by_id
(
'
hero_
image'
)
.
get_attribute
(
'src'
))
self
.
assertIn
(
'.png'
,
self
.
browser
.
find_element_by_id
(
'image'
)
.
get_attribute
(
'src'
))
# She spots the page title and header mentions the name of the hero she selected.
# She spots the page title and header mentions the name of the hero she selected.
self
.
assertIn
(
'Detail - '
,
self
.
browser
.
title
)
self
.
assertIn
(
'Detail - '
,
self
.
browser
.
title
)
...
...
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