Merge pull request 'review/core-app' (#14) from review/core-app into master
continuous-integration/drone/push Build is passing
Details
continuous-integration/drone/push Build is passing
Details
Reviewed-on: #14
This commit is contained in:
commit
f97a8f6898
|
@ -43,6 +43,7 @@ INSTALLED_APPS = [
|
||||||
'django.contrib.messages',
|
'django.contrib.messages',
|
||||||
'django.contrib.staticfiles',
|
'django.contrib.staticfiles',
|
||||||
'django_extensions',
|
'django_extensions',
|
||||||
|
"ultron.core",
|
||||||
'ultron.location',
|
'ultron.location',
|
||||||
'ultron.people',
|
'ultron.people',
|
||||||
'ultron.followup',
|
'ultron.followup',
|
||||||
|
|
|
@ -16,7 +16,6 @@ Including another URLconf
|
||||||
from django.contrib import admin
|
from django.contrib import admin
|
||||||
from django.urls import include, path
|
from django.urls import include, path
|
||||||
|
|
||||||
import config.views
|
|
||||||
import ultron.followup.urls
|
import ultron.followup.urls
|
||||||
import ultron.location.urls
|
import ultron.location.urls
|
||||||
import ultron.people.urls
|
import ultron.people.urls
|
||||||
|
@ -25,9 +24,6 @@ import ultron.planning.urls
|
||||||
import ultron.objective.urls
|
import ultron.objective.urls
|
||||||
|
|
||||||
urlpatterns = [
|
urlpatterns = [
|
||||||
# Global search
|
|
||||||
path(r"search/", config.views.search, name="global_search"),
|
|
||||||
|
|
||||||
# Profile list
|
# Profile list
|
||||||
path(r"profile/", include(ultron.profiles.urls.profile_urlpatterns)),
|
path(r"profile/", include(ultron.profiles.urls.profile_urlpatterns)),
|
||||||
|
|
||||||
|
@ -56,10 +52,7 @@ urlpatterns = [
|
||||||
# Planning management
|
# Planning management
|
||||||
path(r"event/", include(ultron.planning.urls.event_urlpatterns)),
|
path(r"event/", include(ultron.planning.urls.event_urlpatterns)),
|
||||||
|
|
||||||
# Login & logout
|
path("", include("ultron.core.urls")),
|
||||||
path(r"login/", config.views.login, name="login"),
|
|
||||||
path(r"logout/", config.views.logout, name="logout"),
|
|
||||||
path(r"", config.views.home, name="home"),
|
|
||||||
|
|
||||||
# Administration
|
# Administration
|
||||||
path('admin/', admin.site.urls),
|
path('admin/', admin.site.urls),
|
||||||
|
|
|
@ -0,0 +1,3 @@
|
||||||
|
from django.contrib import admin
|
||||||
|
|
||||||
|
# Register your models here.
|
|
@ -0,0 +1,6 @@
|
||||||
|
from django.apps import AppConfig
|
||||||
|
|
||||||
|
|
||||||
|
class CoreConfig(AppConfig):
|
||||||
|
default_auto_field = 'django.db.models.BigAutoField'
|
||||||
|
name = 'ultron.core'
|
|
@ -0,0 +1,29 @@
|
||||||
|
from django.contrib.auth import get_user_model
|
||||||
|
from django.test import TestCase
|
||||||
|
from django.urls import reverse
|
||||||
|
|
||||||
|
|
||||||
|
USER = get_user_model()
|
||||||
|
|
||||||
|
|
||||||
|
class HomeTests(TestCase):
|
||||||
|
def setUp(self):
|
||||||
|
self.user = USER.objects.create(
|
||||||
|
username="jbond", email="james@hms.co.uk", password="007"
|
||||||
|
)
|
||||||
|
|
||||||
|
def test_home_view_anonymous_redirected_statuts_code(self):
|
||||||
|
url = reverse("home")
|
||||||
|
response = self.client.get(url)
|
||||||
|
self.assertEquals(response.status_code, 302)
|
||||||
|
|
||||||
|
def test_home_view_status_code_with_user_connected(self):
|
||||||
|
"""Note: This test will switch to green once we will get rid of whitenoise
|
||||||
|
|
||||||
|
See https://stackoverflow.com/questions/50658241/django-doesnt-load-static-files-valueerrormissing-staticfiles-manifest-entry
|
||||||
|
"""
|
||||||
|
login_result = self.client.login(username="jbond", password="007")
|
||||||
|
|
||||||
|
url = reverse("home")
|
||||||
|
response = self.client.get(url, follow=True)
|
||||||
|
self.assertEquals(response.status_code, 200)
|
|
@ -0,0 +1,11 @@
|
||||||
|
from django.urls import path
|
||||||
|
|
||||||
|
from .views import login, logout, home, search
|
||||||
|
|
||||||
|
|
||||||
|
urlpatterns = [
|
||||||
|
path(r"search/", search, name="global_search"),
|
||||||
|
path(r"login/", login, name="login"),
|
||||||
|
path(r"logout/", logout, name="logout"),
|
||||||
|
path(r"", home, name="home"),
|
||||||
|
]
|
|
@ -1,6 +1,4 @@
|
||||||
from datetime import datetime, timedelta, date
|
from datetime import datetime, timedelta, date
|
||||||
from functools import reduce
|
|
||||||
import operator
|
|
||||||
|
|
||||||
from django.db.models import Q
|
from django.db.models import Q
|
||||||
from django.shortcuts import render
|
from django.shortcuts import render
|
|
@ -1,7 +1,6 @@
|
||||||
from django.contrib import admin
|
from django.contrib import admin
|
||||||
from django.db.models import fields
|
from django.db.models import fields
|
||||||
|
|
||||||
from config.views import search
|
|
||||||
from .models import (
|
from .models import (
|
||||||
Chrono,
|
Chrono,
|
||||||
LearnedSkill,
|
LearnedSkill,
|
||||||
|
|
|
@ -1,7 +1,10 @@
|
||||||
from django.test import TestCase
|
|
||||||
from ultron.people.models import Gymnast
|
|
||||||
from datetime import datetime
|
from datetime import datetime
|
||||||
# import pytest
|
|
||||||
|
from django.test import TestCase
|
||||||
|
from django.urls import reverse
|
||||||
|
|
||||||
|
from ultron.people.models import Gymnast
|
||||||
|
|
||||||
|
|
||||||
class GymnastTestCase(TestCase):
|
class GymnastTestCase(TestCase):
|
||||||
def test_gymnast_tostring(self):
|
def test_gymnast_tostring(self):
|
||||||
|
|
Loading…
Reference in New Issue