Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
B
Backend
Manage
Activity
Members
Code
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Locked files
Deploy
Releases
Package Registry
Model registry
Operate
Terraform modules
Analyze
Contributor 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
swp-unisport
team-warumkeinrust
Backend
Commits
abccc381
Commit
abccc381
authored
3 years ago
by
borzechof99
Browse files
Options
Downloads
Patches
Plain Diff
Fix Tests and Linter
parent
fedca85f
No related branches found
Branches containing commit
No related tags found
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
.pylintrc
+1
-0
1 addition, 0 deletions
.pylintrc
unisportomat/quiz/models.py
+8
-1
8 additions, 1 deletion
unisportomat/quiz/models.py
unisportomat/quiz/tests.py
+16
-8
16 additions, 8 deletions
unisportomat/quiz/tests.py
with
25 additions
and
9 deletions
.pylintrc
+
1
−
0
View file @
abccc381
...
...
@@ -13,4 +13,5 @@ disable=line-too-long,
arguments-renamed,
too-many-lines,
too-many-locals,
attribute-defined-outside-init
This diff is collapsed.
Click to expand it.
unisportomat/quiz/models.py
+
8
−
1
View file @
abccc381
...
...
@@ -369,18 +369,25 @@ class QuestionOrderEntry(models.Model):
class
SingletonModel
(
models
.
Model
):
"""
Singleton Model used for Greeting and End Text, so that only one object exists per Model
"""
class
Meta
:
abstract
=
True
def
save
(
self
,
*
args
,
**
kwargs
):
self
.
pk
=
1
super
(
SingletonModel
,
self
).
save
(
*
args
,
**
kwargs
)
super
().
save
(
*
args
,
**
kwargs
)
def
delete
(
self
,
*
args
,
**
kwargs
):
pass
@classmethod
def
load
(
cls
):
"""
Function for returning the singleton Object
"""
obj
,
_created
=
cls
.
objects
.
get_or_create
(
pk
=
1
)
return
obj
...
...
This diff is collapsed.
Click to expand it.
unisportomat/quiz/tests.py
+
16
−
8
View file @
abccc381
...
...
@@ -727,7 +727,7 @@ class APITest(APITestCase):
Test whether the greeting behaves correctly
"""
response
=
self
.
client
.
get
(
reverse
(
"
greeting
"
))
response
=
self
.
client
.
get
(
reverse
(
"
greeting
-end-detail
"
,
kwargs
=
{
"
pk
"
:
1
}
))
self
.
assertEqual
(
response
.
data
[
"
text_de
"
],
"
Willkommen zum Uni-Sport-O-Mat!
"
)
self
.
assertEqual
(
response
.
data
[
"
text_de
"
],
response
.
data
[
"
text_en
"
])
...
...
@@ -736,15 +736,20 @@ class APITest(APITestCase):
data
=
{
"
text_de
"
:
"
Hallo
"
,
"
text_en
"
:
"
Hi
"
}
response
=
self
.
client
.
post
(
reverse
(
"
greeting
"
),
format
=
"
json
"
,
data
=
data
)
response
=
self
.
client
.
put
(
reverse
(
"
greeting-end-detail
"
,
kwargs
=
{
"
pk
"
:
1
}),
format
=
"
json
"
,
data
=
data
,
)
response
=
self
.
client
.
get
(
reverse
(
"
greeting
"
))
response
=
self
.
client
.
get
(
reverse
(
"
greeting
-end-detail
"
,
kwargs
=
{
"
pk
"
:
1
}
))
self
.
assertEqual
(
response
.
data
[
"
text_de
"
],
"
Hallo
"
)
self
.
assertEqual
(
response
.
data
[
"
text_en
"
],
"
Hi
"
)
# If the object is deleted, the default values are returned again
response
=
self
.
client
.
delete
(
reverse
(
"
greeting
"
))
response
=
self
.
client
.
delete
(
reverse
(
"
greeting-end-detail
"
,
kwargs
=
{
"
pk
"
:
1
}))
response
=
self
.
client
.
get
(
reverse
(
"
greeting-end-detail
"
,
kwargs
=
{
"
pk
"
:
1
}))
self
.
assertEqual
(
response
.
data
[
"
text_de
"
],
"
Willkommen zum Uni-Sport-O-Mat!
"
)
self
.
assertEqual
(
response
.
data
[
"
text_de
"
],
response
.
data
[
"
text_en
"
])
...
...
@@ -754,7 +759,7 @@ class APITest(APITestCase):
Test whether the end behaves correctly
"""
response
=
self
.
client
.
get
(
reverse
(
"
end
"
))
response
=
self
.
client
.
get
(
reverse
(
"
greeting-end-detail
"
,
kwargs
=
{
"
pk
"
:
2
}
))
self
.
assertEqual
(
response
.
data
[
"
text_de
"
],
"
Wähle deinen Sport!
"
)
self
.
assertEqual
(
response
.
data
[
"
text_de
"
],
response
.
data
[
"
text_en
"
])
...
...
@@ -763,15 +768,18 @@ class APITest(APITestCase):
data
=
{
"
text_de
"
:
"
Hallo
"
,
"
text_en
"
:
"
Hi
"
}
response
=
self
.
client
.
post
(
reverse
(
"
end
"
),
format
=
"
json
"
,
data
=
data
)
response
=
self
.
client
.
put
(
reverse
(
"
greeting-end-detail
"
,
kwargs
=
{
"
pk
"
:
2
}),
format
=
"
json
"
,
data
=
data
)
response
=
self
.
client
.
get
(
reverse
(
"
end
"
))
response
=
self
.
client
.
get
(
reverse
(
"
greeting-end-detail
"
,
kwargs
=
{
"
pk
"
:
2
}
))
self
.
assertEqual
(
response
.
data
[
"
text_de
"
],
"
Hallo
"
)
self
.
assertEqual
(
response
.
data
[
"
text_en
"
],
"
Hi
"
)
# If the object is deleted, the default values are returned again
response
=
self
.
client
.
delete
(
reverse
(
"
end
"
))
response
=
self
.
client
.
delete
(
reverse
(
"
greeting-end-detail
"
,
kwargs
=
{
"
pk
"
:
2
}))
response
=
self
.
client
.
get
(
reverse
(
"
greeting-end-detail
"
,
kwargs
=
{
"
pk
"
:
2
}))
self
.
assertEqual
(
response
.
data
[
"
text_de
"
],
"
Wähle deinen Sport!
"
)
self
.
assertEqual
(
response
.
data
[
"
text_de
"
],
response
.
data
[
"
text_en
"
])
...
...
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