Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

REST API tests for GET jobs + GET jobs/ID/annotations #4295

Merged
merged 10 commits into from
Feb 11, 2022
Merged

REST API tests for GET jobs + GET jobs/ID/annotations #4295

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
1ea6f14
Initial implementation of GET jobs + improves conftest
Feb 6, 2022
aff614f
Refactored tests jobs
Feb 7, 2022
7632e0c
Improved tests for jobs REST API
Feb 7, 2022
e521ee4
Added test_admin_get_job_annotations
Feb 7, 2022
9893264
Merge remote-tracking branch 'origin/develop' into nm/rest_api_tests
Feb 8, 2022
b940428
Added tests for creating invitations
Feb 8, 2022
e888091
Small changes in vs code files
Feb 9, 2022
7196c73
Merge remote-tracking branch 'origin/develop' into nm/rest_api_tests
Feb 9, 2022
8f2aec7
Implemented tests for GET jobs/<id>/annotations
Feb 9, 2022
3f8c9d9
Fixed linter warnings
Feb 9, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion .vscode/settings.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,5 +32,10 @@
"name": "cvat",
"database": "${workspaceFolder:cvat}/db.sqlite3"
}
]
],
"python.testing.pytestArgs": [
"tests"
],
"python.testing.unittestEnabled": false,
"python.testing.pytestEnabled": true
}
3 changes: 2 additions & 1 deletion cvat/apps/organizations/serializers.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,8 @@ def create(self, validated_data):
f'with {membership_data["user"]["email"]} email. It is not '
f'a valid email in the system.')

membership, created = Membership.objects.get_or_create(**membership_data,
membership, created = Membership.objects.get_or_create(
defaults=membership_data,
user=user, organization=organization)
if not created:
raise serializers.ValidationError('The user is a member of '
Expand Down
Loading