Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

A

API
- Activity
- Members
- Labels
- Terraform modules
- Service Desk
- Contributor analytics
- Model experiments

Snippets Groups Projects

6e959063

Commit 6e959063 authored 1 year ago by s2536528

Downloads
- Plain Diff

Merge branch '3-expand-tests' into develop

# Conflicts:
#	apps/MySU/models/association_specific_data.py
#	apps/calendar/viewsets/event.py
#	tests/MySU/association_specific_data.py

parents 1fcc4d36 be989dc3

Branches

No related tags found

No related merge requests found

Changes 10

Hide whitespace changes

Inline Side-by-side

Showing

MySU/settings/test.py 1 addition, 0 deletions

MySU/settings/test.py
apps/MySU/models/association_specific_data.py 5 additions, 3 deletions

apps/MySU/models/association_specific_data.py
apps/MySU/viewsets/association_specific_data.py 18 additions, 7 deletions

apps/MySU/viewsets/association_specific_data.py
apps/MySU/viewsets/association_specific_data_fields.py 2 additions, 0 deletions

apps/MySU/viewsets/association_specific_data_fields.py
apps/calendar/viewsets/event.py 0 additions, 7 deletions

apps/calendar/viewsets/event.py
tests/MySU/association_specific_data.py 64 additions, 17 deletions

tests/MySU/association_specific_data.py
tests/MySU/association_specific_data_fields.py 88 additions, 6 deletions

tests/MySU/association_specific_data_fields.py
tests/MySU/group.py 144 additions, 2 deletions

tests/MySU/group.py
tests/MySU/group_membership.py 45 additions, 11 deletions

tests/MySU/group_membership.py
tests/MySU/profile.py 60 additions, 5 deletions

tests/MySU/profile.py

with 427 additions and 58 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment