Skip to content

Commit

Permalink
Fix running tests
Browse files Browse the repository at this point in the history
  • Loading branch information
juyrjola committed Nov 27, 2015
1 parent 9d2fc4f commit b19feaf
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 50 deletions.
38 changes: 0 additions & 38 deletions helevents/auth.py

This file was deleted.

23 changes: 12 additions & 11 deletions helevents/migrations/0001_initial.py
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
# -*- coding: utf-8 -*-
from __future__ import unicode_literals

from django.db import models, migrations
from django.db import migrations, models
import django.contrib.auth.models
import django.core.validators
import django.utils.timezone
import django.contrib.auth.models


class Migration(migrations.Migration):
Expand All @@ -17,20 +17,21 @@ class Migration(migrations.Migration):
migrations.CreateModel(
name='User',
fields=[
('id', models.AutoField(serialize=False, verbose_name='ID', auto_created=True, primary_key=True)),
('password', models.CharField(max_length=128, verbose_name='password')),
('last_login', models.DateTimeField(null=True, verbose_name='last login', blank=True)),
('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(validators=[django.core.validators.RegexValidator('^[\\w.@+-]+$', 'Enter a valid username. This value may contain only letters, numbers and @/./+/-/_ characters.', 'invalid')], unique=True, max_length=30, help_text='Required. 30 characters or fewer. Letters, digits and @/./+/-/_ only.', error_messages={'unique': 'A user with that username already exists.'}, verbose_name='username')),
('is_superuser', models.BooleanField(help_text='Designates that this user has all permissions without explicitly assigning them.', verbose_name='superuser status', default=False)),
('username', models.CharField(help_text='Required. 30 characters or fewer. Letters, digits and @/./+/-/_ only.', error_messages={'unique': 'A user with that username already exists.'}, unique=True, max_length=30, validators=[django.core.validators.RegexValidator('^[\\w.@+-]+$', 'Enter a valid username. This value may contain only letters, numbers and @/./+/-/_ characters.', 'invalid')], verbose_name='username')),
('first_name', models.CharField(max_length=30, verbose_name='first name', blank=True)),
('last_name', models.CharField(max_length=30, verbose_name='last name', blank=True)),
('email', models.EmailField(max_length=254, verbose_name='email address', blank=True)),
('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')),
('uuid', models.UUIDField(serialize=False, primary_key=True)),
('department_name', models.CharField(null=True, max_length=50, blank=True)),
('groups', models.ManyToManyField(related_query_name='user', to='auth.Group', blank=True, related_name='user_set', help_text='The groups this user belongs to. A user will get all permissions granted to each of their groups.', verbose_name='groups')),
('user_permissions', models.ManyToManyField(related_query_name='user', to='auth.Permission', blank=True, related_name='user_set', help_text='Specific permissions for this user.', verbose_name='user permissions')),
('is_staff', models.BooleanField(help_text='Designates whether the user can log into this admin site.', verbose_name='staff status', default=False)),
('is_active', models.BooleanField(help_text='Designates whether this user should be treated as active. Unselect this instead of deleting accounts.', verbose_name='active', default=True)),
('date_joined', models.DateTimeField(verbose_name='date joined', default=django.utils.timezone.now)),
('uuid', models.UUIDField(unique=True)),
('department_name', models.CharField(max_length=50, null=True, blank=True)),
('groups', models.ManyToManyField(help_text='The groups this user belongs to. A user will get all permissions granted to each of their groups.', blank=True, related_name='user_set', verbose_name='groups', related_query_name='user', to='auth.Group')),
('user_permissions', models.ManyToManyField(help_text='Specific permissions for this user.', blank=True, related_name='user_set', verbose_name='user permissions', related_query_name='user', to='auth.Permission')),
],
options={
'abstract': False,
Expand Down
2 changes: 1 addition & 1 deletion linkedevents/settings.py
Original file line number Diff line number Diff line change
Expand Up @@ -150,7 +150,7 @@
'rest_framework.permissions.IsAuthenticatedOrReadOnly',
),
'DEFAULT_AUTHENTICATION_CLASSES': (
'helevents.auth.JWTAuthentication',
'helusers.jwt.JWTAuthentication',
),

}
Expand Down

0 comments on commit b19feaf

Please sign in to comment.