Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
W
WillOWisp_Lab1
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
Margarita Perez
WillOWisp_Lab1
Commits
78b8cc53
Commit
78b8cc53
authored
Mar 09, 2020
by
Margarita Perez
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Made new changes to the detail html files etc
parent
bf86c8db
Changes
6
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
717 additions
and
33 deletions
+717
-33
geckodriver.log
geckodriver.log
+699
-0
detail_cloud.html
heroes/templates/detail_cloud.html
+4
-4
detail_jester.html
heroes/templates/detail_jester.html
+2
-2
detail_sunflowey.html
heroes/templates/detail_sunflowey.html
+2
-2
homepage.html
homepage.html
+0
-23
lab1_functional_test.py
lab1_functional_test.py
+10
-2
No files found.
geckodriver.log
View file @
78b8cc53
This diff is collapsed.
Click to expand it.
heroes/templates/detail_cloud.html
View file @
78b8cc53
<!DOCTYPE html>
<!DOCTYPE html>
<html>
<html>
<head>
<head>
<title
id =
"title"
>
Detail - Cloud
</title>
<title>
Detail - Cloud
</title>
</head>
</head>
<body>
<body>
<img
src=
"./cloud.png"
style=
"width: 10vw;"
/>
<img
src=
"./cloud.png"
style=
"width: 10vw;"
/>
<h1>
Detail - Cloud
</h1>
<h1
id=
"cloud"
>
Detail - Cloud
</h1>
<dl>
<dl>
<dt>
Health Points
</dt><dd>
600
</dd>
<dt>
Health Points
</dt><dd>
600
</dd>
<dt>
Base Attack Damage
</dt><dd>
57
</dd>
<dt>
Base Attack Damage
</dt><dd>
57
</dd>
<dt>
Skills
</dt><dd>
Nimbus, Rain Cloud, Thunderbolt
</dd>
<dt>
Skills
</dt><dd
id =
"cloudSkills"
>
Nimbus, Rain Cloud, Thunderbolt
</dd>
<dt>
Lore
</dt><dd
>
I am a cloud. When I pee you call it 'rain'
.
</dd>
<dt>
Lore
</dt><dd
id =
"cloudLore"
>
I am a cloud. When I pee you call it "rain"
.
</dd>
<dt><a
href=
"/heroes/"
>
Back to Heroes List
</a></dt>
<dt><a
href=
"/heroes/"
>
Back to Heroes List
</a></dt>
</dl>
</dl>
</body>
</body>
...
...
heroes/templates/detail_jester.html
View file @
78b8cc53
...
@@ -9,8 +9,8 @@
...
@@ -9,8 +9,8 @@
<dl>
<dl>
<dt>
Health Points
</dt><dd>
660
</dd>
<dt>
Health Points
</dt><dd>
660
</dd>
<dt>
Base Attack Damage
</dt><dd>
64
</dd>
<dt>
Base Attack Damage
</dt><dd>
64
</dd>
<dt>
Skills
</dt><dd>
Laugh, Dance, Smile
</dd>
<dt>
Skills
</dt><dd
id =
"jesterSkills"
>
Laugh, Dance, Smile
</dd>
<dt>
Lore
</dt><dd>
I do it for the LOLs.
</dd>
<dt>
Lore
</dt><dd
id =
"jesterLore"
>
I do it for the LOLs.
</dd>
<dt><a
href=
"/heroes/"
>
Back to Heroes List
</a></dt>
<dt><a
href=
"/heroes/"
>
Back to Heroes List
</a></dt>
</dl>
</dl>
</body>
</body>
...
...
heroes/templates/detail_sunflowey.html
View file @
78b8cc53
...
@@ -9,8 +9,8 @@
...
@@ -9,8 +9,8 @@
<dl>
<dl>
<dt>
Health Points
</dt><dd>
650
</dd>
<dt>
Health Points
</dt><dd>
650
</dd>
<dt>
Base Attack Damage
</dt><dd>
43
</dd>
<dt>
Base Attack Damage
</dt><dd>
43
</dd>
<dt>
Skills
</dt><dd>
Power Pellet, Sunshine, Pollen Punch
</dd>
<dt>
Skills
</dt><dd
id =
"sunfloweykills"
>
Power Pellet, Sunshine, Pollen Punch
</dd>
<dt>
Lore
</dt><dd>
I am Sunflowey. Sometimes a sun, sometimes a flower.
</dd>
<dt>
Lore
</dt><dd
id =
"sunfloweyLore"
>
I am Sunflowey. Sometimes a sun, sometimes a flower.
</dd>
<dt><a
href=
"/heroes/"
>
Back to Heroes List
</a></dt>
<dt><a
href=
"/heroes/"
>
Back to Heroes List
</a></dt>
</dl>
</dl>
</body>
</body>
...
...
homepage.html
deleted
100644 → 0
View file @
bf86c8db
<!DOCTYPE html>
<html>
<head>
<title>
The Will of the Wisps Wiki
</title>
</head>
<body>
<h1>
The Will of the Wisps Wiki
</h1>
<dl>
<dt><a
href=
"/hero/cloud"
>
Cloud
</a></dt>
<dt>
Health Points
</dt><dd>
600
</dd>
<dt>
Base Attack Damage
</dt><dd>
57
</dd>
<dt><a
href=
"/hero/jester"
>
Jester
</a></dt>
<dt>
Health Points
</dt><dd>
660
</dd>
<dt>
Base Attack Damage
</dt><dd>
64
</dd>
<dt><a
href=
"/hero/sunflowey"
>
Sunflowey
</a></dt>
<dt>
Health Points
</dt><dd>
650
</dd>
<dt>
Base Attack Damage
</dt><dd>
43
</dd>
</dl>
</body>
</html>
\ No newline at end of file
lab1_functional_test.py
View file @
78b8cc53
...
@@ -72,10 +72,18 @@ class NewVisitorTest(unittest.TestCase):
...
@@ -72,10 +72,18 @@ class NewVisitorTest(unittest.TestCase):
# 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.
#cloud
#cloud
self
.
browser
.
find_element_by_link_text
(
'cloud'
)
.
click
()
self
.
browser
.
find_element_by_link_text
(
'cloud'
)
.
click
()
self
.
assertIn
(
'/hero/cloud
/
'
,
self
.
browser
.
current_url
)
self
.
assertIn
(
'/hero/cloud'
,
self
.
browser
.
current_url
)
self
.
assertIn
(
'Cloud'
,
self
.
browser
.
title
)
self
.
assertIn
(
'Cloud'
,
self
.
browser
.
title
)
#jester
self
.
browser
.
find_element_by_link_text
(
'jester'
)
.
click
()
self
.
assertIn
(
'/hero/jester'
,
self
.
browser
.
current_url
)
self
.
assertIn
(
'Jester'
,
self
.
browser
.
title
)
#sunflowey
self
.
browser
.
find_element_by_link_text
(
'sunflowey'
)
.
click
()
self
.
assertIn
(
'/hero/sunflowey'
,
self
.
browser
.
current_url
)
self
.
assertIn
(
'Sunflowey'
,
self
.
browser
.
title
)
# While she is in a specific hero's page, she sees a button labeled "Back to Heroes List".
# 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.
# She clicks this and she is redirected back to the wiki's homepage.
...
...
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