Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
grady
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container Registry
Model registry
Operate
Environments
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
Jan Maximilian Michal
grady
Commits
e4be7981
There was a problem fetching the pipeline summary.
Commit
e4be7981
authored
7 years ago
by
robinwilliam.hundt
Browse files
Options
Downloads
Patches
Plain Diff
Fixed broken tests for /student-page/ endpoint
parent
f57d011c
No related branches found
No related tags found
2 merge requests
!23
Resolve "Logout of tutors after inactivity"
,
!22
WIP: Started work on navigation and layout
Pipeline
#
Changes
3
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
core/tests/test_access_rights.py
+3
-3
3 additions, 3 deletions
core/tests/test_access_rights.py
core/tests/test_student_page.py
+3
-3
3 additions, 3 deletions
core/tests/test_student_page.py
core/urls.py
+1
-1
1 addition, 1 deletion
core/urls.py
with
7 additions
and
7 deletions
core/tests/test_access_rights.py
+
3
−
3
View file @
e4be7981
...
@@ -4,7 +4,7 @@ from rest_framework.test import (APIRequestFactory, APITestCase,
...
@@ -4,7 +4,7 @@ from rest_framework.test import (APIRequestFactory, APITestCase,
force_authenticate
)
force_authenticate
)
from
core.views
import
(
ExamApiViewSet
,
StudentReviewerApiViewSet
,
from
core.views
import
(
ExamApiViewSet
,
StudentReviewerApiViewSet
,
StudentSelfApiView
Set
,
TutorApiViewSet
)
StudentSelfApiView
,
TutorApiViewSet
)
from
util.factories
import
GradyUserFactory
from
util.factories
import
GradyUserFactory
...
@@ -21,8 +21,8 @@ class AccessRightsOfStudentAPIViewTests(APITestCase):
...
@@ -21,8 +21,8 @@ class AccessRightsOfStudentAPIViewTests(APITestCase):
self
.
student
=
self
.
user_factory
.
make_student
()
self
.
student
=
self
.
user_factory
.
make_student
()
self
.
tutor
=
self
.
user_factory
.
make_tutor
()
self
.
tutor
=
self
.
user_factory
.
make_tutor
()
self
.
reviewer
=
self
.
user_factory
.
make_reviewer
()
self
.
reviewer
=
self
.
user_factory
.
make_reviewer
()
self
.
request
=
self
.
factory
.
get
(
reverse
(
'
student
_
page
-list
'
))
self
.
request
=
self
.
factory
.
get
(
reverse
(
'
student
-
page
'
))
self
.
view
=
StudentSelfApiView
Set
.
as_view
(
{
'
get
'
:
'
retrieve
'
}
)
self
.
view
=
StudentSelfApiView
.
as_view
()
def
test_unauthenticated_access_denied
(
self
):
def
test_unauthenticated_access_denied
(
self
):
response
=
self
.
view
(
self
.
request
)
response
=
self
.
view
(
self
.
request
)
...
...
This diff is collapsed.
Click to expand it.
core/tests/test_student_page.py
+
3
−
3
View file @
e4be7981
...
@@ -4,7 +4,7 @@ from rest_framework.test import (APIRequestFactory, APITestCase,
...
@@ -4,7 +4,7 @@ from rest_framework.test import (APIRequestFactory, APITestCase,
from
core.models
import
Reviewer
,
SubmissionType
from
core.models
import
Reviewer
,
SubmissionType
from
core.tests
import
data_factories
from
core.tests
import
data_factories
from
core.views
import
StudentSelfApiView
Set
from
core.views
import
StudentSelfApiView
class
StudentPageTests
(
APITestCase
):
class
StudentPageTests
(
APITestCase
):
...
@@ -19,8 +19,8 @@ class StudentPageTests(APITestCase):
...
@@ -19,8 +19,8 @@ class StudentPageTests(APITestCase):
self
.
student
=
self
.
submission
.
student
self
.
student
=
self
.
submission
.
student
self
.
reviewer
=
Reviewer
.
objects
.
create
(
self
.
reviewer
=
Reviewer
.
objects
.
create
(
user
=
data_factories
.
make_user
(
username
=
'
reviewer
'
))
user
=
data_factories
.
make_user
(
username
=
'
reviewer
'
))
self
.
request
=
self
.
factory
.
get
(
reverse
(
'
student
_
page
-list
'
))
self
.
request
=
self
.
factory
.
get
(
reverse
(
'
student
-
page
'
))
self
.
view
=
StudentSelfApiView
Set
.
as_view
(
{
'
get
'
:
'
retrieve
'
}
)
self
.
view
=
StudentSelfApiView
.
as_view
()
force_authenticate
(
self
.
request
,
user
=
self
.
student
.
user
)
force_authenticate
(
self
.
request
,
user
=
self
.
student
.
user
)
self
.
response
=
self
.
view
(
self
.
request
)
self
.
response
=
self
.
view
(
self
.
request
)
...
...
This diff is collapsed.
Click to expand it.
core/urls.py
+
1
−
1
View file @
e4be7981
...
@@ -15,7 +15,7 @@ router.register(r'tutor', views.TutorApiViewSet)
...
@@ -15,7 +15,7 @@ router.register(r'tutor', views.TutorApiViewSet)
# regular views that are not viewsets
# regular views that are not viewsets
regular_views_urlpatterns
=
[
regular_views_urlpatterns
=
[
url
(
r
'
student-page
'
,
views
.
StudentSelfApiView
.
as_view
())
url
(
r
'
student-page
'
,
views
.
StudentSelfApiView
.
as_view
()
,
name
=
'
student-page
'
)
]
]
urlpatterns
=
[
urlpatterns
=
[
...
...
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