Skip to content
Snippets Groups Projects
Commit ed2f0d2a authored by Håvard Farestveit's avatar Håvard Farestveit
Browse files

Refactored users/tests after merge

parent 34cfb08f
Branches
No related tags found
No related merge requests found
Pipeline #114790 failed
Stage: test
Stage: deploy
Show whitespace changes
Inline Side-by-side
Showing
with 5 additions and 646 deletions
README.md
+ 2
− 2
View file @ ed2f0d2a
......@@ -15,7 +15,7 @@ In task 2 we used Django Testcase to create unit test for `./workouts/permission
The test files can be found at:
- Permissions: `backend/secfit/workouts/tests`
- Serializer: `backend/secfit/users/tests/`
- Serializer: `backend/secfit/users/tests/UserSerializer.py`
### Task 3
In task 3 we practised created black-boxed tests. The tests where created using either DjangoTestCase or Cypress.io.
......@@ -24,7 +24,7 @@ The tests can be found at:
- Boundary Value Tests:
- Registration page: `frontend/cypress/integration/boundary_test_user_registration.js`
- New Workout page : `frontend/cypress/integration/boundar_test_workouts.js`
- 2-way Domain Test: `backend/secfit/users/tests/`
- 2-way Domain Test: `backend/secfit/users/tests/UserRegistration.py`
- Integration Test: `frontend/cypress/integration/`
- Black box tests for FR5:
......
backend/secfit/users/tests.py → backend/secfit/users/tests/UserSerializer.py
+ 1
− 2
View file @ ed2f0d2a
from django.test import TestCase
from .serializers import UserSerializer
from backend.secfit.users.serializers import UserSerializer
from django.contrib.auth import get_user_model
from rest_framework import serializers
......@@ -47,4 +47,3 @@ class UserSerializerTestCase(TestCase):
pw="password"
response = UserSerializer(data=self.data1).validate_password(value=pw)
self.assertEqual(response,pw)
#self.assertRaises(serializers.ValidationError, UserSerializer.validate_password, UserSerializer(data=self.data1), response)
backend/secfit/users/tests/__init__.py
+ 2
− 1
View file @ ed2f0d2a
from users.tests.user_registration import *
\ No newline at end of file
from users.tests.UserRegistration import *
from users.tests.UserSerializer import *
\ No newline at end of file
backend/secfit/users/¨´+p09a/0001_initial.py deleted 100644 → 0
+ 0
− 211
View file @ 34cfb08f
# Generated by Django 3.1 on 2020-08-21 03:42
from django.conf import settings
import django.contrib.auth.models
import django.contrib.auth.validators
from django.db import migrations, models
import django.db.models.deletion
import django.utils.timezone
class Migration(migrations.Migration):
initial = True
dependencies = [
("auth", "0012_alter_user_first_name_max_length"),
]
operations = [
migrations.CreateModel(
name="User",
fields=[
(
"id",
models.AutoField(
auto_created=True,
primary_key=True,
serialize=False,
verbose_name="ID",
),
),
("password", models.CharField(max_length=128, verbose_name="password")),
(
"last_login",
models.DateTimeField(
blank=True, null=True, verbose_name="last login"
),
),
(
"is_superuser",
models.BooleanField(
default=False,
help_text="Designates that this user has all permissions without explicitly assigning them.",
verbose_name="superuser status",
),
),
(
"username",
models.CharField(
error_messages={
"unique": "A user with that username already exists."
},
help_text="Required. 150 characters or fewer. Letters, digits and @/./+/-/_ only.",
max_length=150,
unique=True,
validators=[
django.contrib.auth.validators.UnicodeUsernameValidator()
],
verbose_name="username",
),
),
(
"first_name",
models.CharField(
blank=True, max_length=150, verbose_name="first name"
),
),
(
"last_name",
models.CharField(
blank=True, max_length=150, verbose_name="last name"
),
),
(
"email",
models.EmailField(
blank=True, max_length=254, verbose_name="email address"
),
),
(
"is_staff",
models.BooleanField(
default=False,
help_text="Designates whether the user can log into this admin site.",
verbose_name="staff status",
),
),
(
"is_active",
models.BooleanField(
default=True,
help_text="Designates whether this user should be treated as active. Unselect this instead of deleting accounts.",
verbose_name="active",
),
),
(
"date_joined",
models.DateTimeField(
default=django.utils.timezone.now, verbose_name="date joined"
),
),
(
"coach",
models.ForeignKey(
null=True,
on_delete=django.db.models.deletion.CASCADE,
related_name="athletes",
to=settings.AUTH_USER_MODEL,
),
),
(
"groups",
models.ManyToManyField(
blank=True,
help_text="The groups this user belongs to. A user will get all permissions granted to each of their groups.",
related_name="user_set",
related_query_name="user",
to="auth.Group",
verbose_name="groups",
),
),
(
"user_permissions",
models.ManyToManyField(
blank=True,
help_text="Specific permissions for this user.",
related_name="user_set",
related_query_name="user",
to="auth.Permission",
verbose_name="user permissions",
),
),
],
options={
"verbose_name": "user",
"verbose_name_plural": "users",
"abstract": False,
},
managers=[
("objects", django.contrib.auth.models.UserManager()),
],
),
migrations.CreateModel(
name="Offer",
fields=[
(
"id",
models.AutoField(
auto_created=True,
primary_key=True,
serialize=False,
verbose_name="ID",
),
),
(
"offer_type",
models.CharField(
choices=[("co", "Coach"), ("at", "Athlete")],
default="at",
max_length=8,
),
),
(
"owner",
models.ForeignKey(
on_delete=django.db.models.deletion.CASCADE,
related_name="sent_offers",
to=settings.AUTH_USER_MODEL,
),
),
(
"recipient",
models.OneToOneField(
on_delete=django.db.models.deletion.CASCADE,
related_name="received_offers",
to=settings.AUTH_USER_MODEL,
),
),
],
),
migrations.CreateModel(
name="OfferResponse",
fields=[
(
"id",
models.AutoField(
auto_created=True,
primary_key=True,
serialize=False,
verbose_name="ID",
),
),
(
"response",
models.CharField(
blank=True,
choices=[("a", "Accept"), ("d", "Decline")],
max_length=8,
),
),
(
"offer",
models.OneToOneField(
on_delete=django.db.models.deletion.CASCADE,
related_name="response",
to="users.offer",
),
),
],
),
]
backend/secfit/users/¨´+p09a/0002_auto_20200907_1200.py deleted 100644 → 0
+ 0
− 30
View file @ 34cfb08f
# Generated by Django 3.1 on 2020-09-07 10:00
from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
("users", "0001_initial"),
]
operations = [
migrations.AddField(
model_name="offer",
name="stale",
field=models.BooleanField(default=False),
),
migrations.AddField(
model_name="offer",
name="status",
field=models.CharField(
choices=[("a", "Accepted"), ("p", "Pending"), ("d", "Declined")],
default="p",
max_length=8,
),
),
migrations.DeleteModel(
name="OfferResponse",
),
]
backend/secfit/users/¨´+p09a/0003_auto_20200907_1954.py deleted 100644 → 0
+ 0
− 24
View file @ 34cfb08f
# Generated by Django 3.1 on 2020-09-07 17:54
from django.conf import settings
from django.db import migrations, models
import django.db.models.deletion
class Migration(migrations.Migration):
dependencies = [
("users", "0002_auto_20200907_1200"),
]
operations = [
migrations.AlterField(
model_name="offer",
name="recipient",
field=models.ForeignKey(
on_delete=django.db.models.deletion.CASCADE,
related_name="received_offers",
to=settings.AUTH_USER_MODEL,
),
),
]
backend/secfit/users/¨´+p09a/0004_auto_20200907_2021.py deleted 100644 → 0
+ 0
− 110
View file @ 34cfb08f
# Generated by Django 3.1 on 2020-09-07 18:21
from django.conf import settings
from django.db import migrations, models
import django.db.models.deletion
class Migration(migrations.Migration):
dependencies = [
("users", "0003_auto_20200907_1954"),
]
operations = [
migrations.CreateModel(
name="AthleteRequest",
fields=[
(
"id",
models.AutoField(
auto_created=True,
primary_key=True,
serialize=False,
verbose_name="ID",
),
),
(
"status",
models.CharField(
choices=[
("a", "Accepted"),
("p", "Pending"),
("d", "Declined"),
],
default="p",
max_length=8,
),
),
("stale", models.BooleanField(default=False)),
(
"owner",
models.ForeignKey(
on_delete=django.db.models.deletion.CASCADE,
related_name="sent_athlete_requests",
to=settings.AUTH_USER_MODEL,
),
),
(
"recipient",
models.ForeignKey(
on_delete=django.db.models.deletion.CASCADE,
related_name="received_athlete_requests",
to=settings.AUTH_USER_MODEL,
),
),
],
options={
"abstract": False,
},
),
migrations.CreateModel(
name="CoachRequest",
fields=[
(
"id",
models.AutoField(
auto_created=True,
primary_key=True,
serialize=False,
verbose_name="ID",
),
),
(
"status",
models.CharField(
choices=[
("a", "Accepted"),
("p", "Pending"),
("d", "Declined"),
],
default="p",
max_length=8,
),
),
("stale", models.BooleanField(default=False)),
(
"owner",
models.OneToOneField(
on_delete=django.db.models.deletion.CASCADE,
related_name="sent_coach_request",
to=settings.AUTH_USER_MODEL,
),
),
(
"recipient",
models.ForeignKey(
on_delete=django.db.models.deletion.CASCADE,
related_name="received_coach_requests",
to=settings.AUTH_USER_MODEL,
),
),
],
options={
"abstract": False,
},
),
migrations.DeleteModel(
name="Offer",
),
]
backend/secfit/users/¨´+p09a/0005_auto_20200907_2039.py deleted 100644 → 0
+ 0
− 51
View file @ 34cfb08f
# Generated by Django 3.1 on 2020-09-07 18:39
from django.conf import settings
from django.db import migrations, models
import django.db.models.deletion
class Migration(migrations.Migration):
dependencies = [
("users", "0004_auto_20200907_2021"),
]
operations = [
migrations.AlterField(
model_name="athleterequest",
name="owner",
field=models.ForeignKey(
on_delete=django.db.models.deletion.CASCADE,
related_name="sent_athleterequests",
to=settings.AUTH_USER_MODEL,
),
),
migrations.AlterField(
model_name="athleterequest",
name="recipient",
field=models.ForeignKey(
on_delete=django.db.models.deletion.CASCADE,
related_name="received_athleterequests",
to=settings.AUTH_USER_MODEL,
),
),
migrations.AlterField(
model_name="coachrequest",
name="owner",
field=models.ForeignKey(
on_delete=django.db.models.deletion.CASCADE,
related_name="sent_coachrequests",
to=settings.AUTH_USER_MODEL,
),
),
migrations.AlterField(
model_name="coachrequest",
name="recipient",
field=models.ForeignKey(
on_delete=django.db.models.deletion.CASCADE,
related_name="received_coachrequests",
to=settings.AUTH_USER_MODEL,
),
),
]
backend/secfit/users/¨´+p09a/0006_auto_20200907_2054.py deleted 100644 → 0
+ 0
− 30
View file @ 34cfb08f
# Generated by Django 3.1 on 2020-09-07 18:54
from django.db import migrations, models
import django.utils.timezone
class Migration(migrations.Migration):
dependencies = [
("users", "0005_auto_20200907_2039"),
]
operations = [
migrations.AddField(
model_name="athleterequest",
name="timestamp",
field=models.DateTimeField(
auto_now_add=True, default=django.utils.timezone.now
),
preserve_default=False,
),
migrations.AddField(
model_name="coachrequest",
name="timestamp",
field=models.DateTimeField(
auto_now_add=True, default=django.utils.timezone.now
),
preserve_default=False,
),
]
backend/secfit/users/¨´+p09a/0007_auto_20200910_0222.py deleted 100644 → 0
+ 0
− 131
View file @ 34cfb08f
# Generated by Django 3.1 on 2020-09-10 00:22
from django.conf import settings
from django.db import migrations, models
import django.db.models.deletion
import users.models
class Migration(migrations.Migration):
dependencies = [
("users", "0006_auto_20200907_2054"),
]
operations = [
migrations.CreateModel(
name="AthleteFile",
fields=[
(
"id",
models.AutoField(
auto_created=True,
primary_key=True,
serialize=False,
verbose_name="ID",
),
),
(
"file",
models.FileField(upload_to=users.models.athlete_directory_path),
),
],
),
migrations.CreateModel(
name="Offer",
fields=[
(
"id",
models.AutoField(
auto_created=True,
primary_key=True,
serialize=False,
verbose_name="ID",
),
),
(
"status",
models.CharField(
choices=[
("a", "Accepted"),
("p", "Pending"),
("d", "Declined"),
],
default="p",
max_length=8,
),
),
(
"offer_type",
models.CharField(
choices=[("a", "Athlete"), ("c", "Coach")],
default="a",
max_length=8,
),
),
("stale", models.BooleanField(default=False)),
("timestamp", models.DateTimeField(auto_now_add=True)),
],
),
migrations.RemoveField(
model_name="coachrequest",
name="owner",
),
migrations.RemoveField(
model_name="coachrequest",
name="recipient",
),
migrations.AlterField(
model_name="user",
name="coach",
field=models.ForeignKey(
blank=True,
null=True,
on_delete=django.db.models.deletion.CASCADE,
related_name="athletes",
to=settings.AUTH_USER_MODEL,
),
),
migrations.DeleteModel(
name="AthleteRequest",
),
migrations.DeleteModel(
name="CoachRequest",
),
migrations.AddField(
model_name="offer",
name="owner",
field=models.ForeignKey(
on_delete=django.db.models.deletion.CASCADE,
related_name="sent_offers",
to=settings.AUTH_USER_MODEL,
),
),
migrations.AddField(
model_name="offer",
name="recipient",
field=models.ForeignKey(
on_delete=django.db.models.deletion.CASCADE,
related_name="received_offers",
to=settings.AUTH_USER_MODEL,
),
),
migrations.AddField(
model_name="athletefile",
name="athlete",
field=models.ForeignKey(
on_delete=django.db.models.deletion.CASCADE,
related_name="coach_files",
to=settings.AUTH_USER_MODEL,
),
),
migrations.AddField(
model_name="athletefile",
name="owner",
field=models.ForeignKey(
on_delete=django.db.models.deletion.CASCADE,
related_name="athlete_files",
to=settings.AUTH_USER_MODEL,
),
),
]
backend/secfit/users/¨´+p09a/0008_auto_20201213_2228.py deleted 100644 → 0
+ 0
− 21
View file @ 34cfb08f
# Generated by Django 3.1 on 2020-12-13 21:28
from django.db import migrations
class Migration(migrations.Migration):
dependencies = [
('users', '0007_auto_20200910_0222'),
]
operations = [
migrations.RemoveField(
model_name='offer',
name='offer_type',
),
migrations.RemoveField(
model_name='offer',
name='stale',
),
]
backend/secfit/users/¨´+p09a/0009_auto_20210204_1055.py deleted 100644 → 0
+ 0
− 33
View file @ 34cfb08f
# Generated by Django 3.1 on 2021-02-04 10:55
from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
('users', '0008_auto_20201213_2228'),
]
operations = [
migrations.AddField(
model_name='user',
name='city',
field=models.TextField(blank=True, max_length=50),
),
migrations.AddField(
model_name='user',
name='country',
field=models.TextField(blank=True, max_length=50),
),
migrations.AddField(
model_name='user',
name='phone_number',
field=models.TextField(blank=True, max_length=50),
),
migrations.AddField(
model_name='user',
name='street_address',
field=models.TextField(blank=True, max_length=50),
),
]
backend/secfit/users/¨´+p09a/__init__.py deleted 100644 → 0
+ 0
− 0
View file @ 34cfb08f
backend/secfit/users/¨´+p09a/__pycache__/0001_initial.cpython-38.pyc deleted 100644 → 0
+ 0
− 0
View file @ 34cfb08f
File deleted
backend/secfit/users/¨´+p09a/__pycache__/0002_auto_20200907_1200.cpython-38.pyc deleted 100644 → 0
+ 0
− 0
View file @ 34cfb08f
File deleted
backend/secfit/users/¨´+p09a/__pycache__/0003_auto_20200907_1954.cpython-38.pyc deleted 100644 → 0
+ 0
− 0
View file @ 34cfb08f
File deleted
backend/secfit/users/¨´+p09a/__pycache__/0004_auto_20200907_2021.cpython-38.pyc deleted 100644 → 0
+ 0
− 0
View file @ 34cfb08f
File deleted
backend/secfit/users/¨´+p09a/__pycache__/0005_auto_20200907_2039.cpython-38.pyc deleted 100644 → 0
+ 0
− 0
View file @ 34cfb08f
File deleted
backend/secfit/users/¨´+p09a/__pycache__/0006_auto_20200907_2054.cpython-38.pyc deleted 100644 → 0
+ 0
− 0
View file @ 34cfb08f
File deleted
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment