Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
H
hypha
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package registry
Container Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
ots
hypha
Commits
f36509d7
Commit
f36509d7
authored
7 years ago
by
Todd Dembrey
Browse files
Options
Downloads
Patches
Plain Diff
Refactor the tests for reduced repetition
parent
2ec460f3
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
opentech/apply/funds/tests/test_models.py
+19
-19
19 additions, 19 deletions
opentech/apply/funds/tests/test_models.py
with
19 additions
and
19 deletions
opentech/apply/funds/tests/test_models.py
+
19
−
19
View file @
f36509d7
...
@@ -142,6 +142,9 @@ class TestFormSubmission(TestCase):
...
@@ -142,6 +142,9 @@ class TestFormSubmission(TestCase):
self
.
site
=
Site
.
objects
.
first
()
self
.
site
=
Site
.
objects
.
first
()
self
.
User
=
get_user_model
()
self
.
User
=
get_user_model
()
self
.
email
=
'
test@test.com
'
self
.
name
=
'
My Name
'
self
.
request_factory
=
RequestFactory
()
self
.
request_factory
=
RequestFactory
()
# set up application form with minimal requirement for creating user
# set up application form with minimal requirement for creating user
application_form
=
{
application_form
=
{
...
@@ -153,7 +156,13 @@ class TestFormSubmission(TestCase):
...
@@ -153,7 +156,13 @@ class TestFormSubmission(TestCase):
FundFormFactory
(
fund
=
fund
,
form
=
form
)
FundFormFactory
(
fund
=
fund
,
form
=
form
)
self
.
round_page
=
RoundFactory
(
parent
=
fund
)
self
.
round_page
=
RoundFactory
(
parent
=
fund
)
def
submit_form
(
self
,
email
=
''
,
name
=
''
,
user
=
AnonymousUser
()):
def
submit_form
(
self
,
email
=
None
,
name
=
None
,
user
=
AnonymousUser
()):
if
email
is
None
:
email
=
self
.
email
if
name
is
None
:
name
=
self
.
name
fields
=
self
.
round_page
.
get_form_fields
()
fields
=
self
.
round_page
.
get_form_fields
()
data
=
{
k
:
v
for
k
,
v
in
zip
(
fields
,
[
email
,
name
])}
data
=
{
k
:
v
for
k
,
v
in
zip
(
fields
,
[
email
,
name
])}
...
@@ -164,38 +173,31 @@ class TestFormSubmission(TestCase):
...
@@ -164,38 +173,31 @@ class TestFormSubmission(TestCase):
return
self
.
round_page
.
get_parent
().
serve
(
request
)
return
self
.
round_page
.
get_parent
().
serve
(
request
)
def
test_can_submit_if_new
(
self
):
def
test_can_submit_if_new
(
self
):
email
=
'
test@test.com
'
self
.
submit_form
()
full_name
=
'
My Name
'
self
.
submit_form
(
email
,
full_name
)
self
.
assertEqual
(
self
.
User
.
objects
.
count
(),
1
)
self
.
assertEqual
(
self
.
User
.
objects
.
count
(),
1
)
new_user
=
self
.
User
.
objects
.
get
(
email
=
email
)
new_user
=
self
.
User
.
objects
.
get
(
email
=
self
.
email
)
self
.
assertEqual
(
new_user
.
full_name
,
full_
name
)
self
.
assertEqual
(
new_user
.
full_name
,
self
.
name
)
self
.
assertEqual
(
ApplicationSubmission
.
objects
.
count
(),
1
)
self
.
assertEqual
(
ApplicationSubmission
.
objects
.
count
(),
1
)
self
.
assertEqual
(
ApplicationSubmission
.
objects
.
first
().
user
,
new_user
)
self
.
assertEqual
(
ApplicationSubmission
.
objects
.
first
().
user
,
new_user
)
def
test_associated_if_not_new
(
self
):
def
test_associated_if_not_new
(
self
):
email
=
'
test@test.com
'
self
.
submit_form
()
full_name
=
'
My Name
'
self
.
submit_form
()
self
.
submit_form
(
email
,
full_name
)
self
.
submit_form
(
email
,
full_name
)
self
.
assertEqual
(
self
.
User
.
objects
.
count
(),
1
)
self
.
assertEqual
(
self
.
User
.
objects
.
count
(),
1
)
user
=
self
.
User
.
objects
.
get
(
email
=
email
)
user
=
self
.
User
.
objects
.
get
(
email
=
self
.
email
)
self
.
assertEqual
(
ApplicationSubmission
.
objects
.
count
(),
2
)
self
.
assertEqual
(
ApplicationSubmission
.
objects
.
count
(),
2
)
self
.
assertEqual
(
ApplicationSubmission
.
objects
.
first
().
user
,
user
)
self
.
assertEqual
(
ApplicationSubmission
.
objects
.
first
().
user
,
user
)
def
test_associated_if_logged_in
(
self
):
def
test_associated_if_logged_in
(
self
):
email
=
'
test@test.com
'
user
=
self
.
User
.
objects
.
create
(
email
=
self
.
email
,
full_name
=
self
.
name
)
full_name
=
'
My Name
'
user
=
self
.
User
.
objects
.
create
(
email
=
email
,
full_name
=
full_name
)
self
.
assertEqual
(
self
.
User
.
objects
.
count
(),
1
)
self
.
assertEqual
(
self
.
User
.
objects
.
count
(),
1
)
self
.
submit_form
(
email
=
email
,
name
=
full_
name
,
user
=
user
)
self
.
submit_form
(
email
=
self
.
email
,
name
=
self
.
name
,
user
=
user
)
self
.
assertEqual
(
self
.
User
.
objects
.
count
(),
1
)
self
.
assertEqual
(
self
.
User
.
objects
.
count
(),
1
)
...
@@ -204,9 +206,7 @@ class TestFormSubmission(TestCase):
...
@@ -204,9 +206,7 @@ class TestFormSubmission(TestCase):
# This will need to be updated when we hide user information contextually
# This will need to be updated when we hide user information contextually
def
test_errors_if_blank_user_data_even_if_logged_in
(
self
):
def
test_errors_if_blank_user_data_even_if_logged_in
(
self
):
email
=
'
test@test.com
'
user
=
self
.
User
.
objects
.
create
(
email
=
self
.
email
,
full_name
=
self
.
name
)
full_name
=
'
My Name
'
user
=
self
.
User
.
objects
.
create
(
email
=
email
,
full_name
=
full_name
)
self
.
assertEqual
(
self
.
User
.
objects
.
count
(),
1
)
self
.
assertEqual
(
self
.
User
.
objects
.
count
(),
1
)
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment