Compare commits

..

5 Commits

Author SHA1 Message Date
Sulley f97a8f6898 Merge pull request 'review/core-app' (#14) from review/core-app into master
continuous-integration/drone/push Build is passing Details
Reviewed-on: #14
2022-01-06 17:28:21 +01:00
Fred Pauchet 62fed584b4 There is still a bug with whitenoise and static files storage
continuous-integration/drone/pr Build is failing Details
continuous-integration/drone/push Build is passing Details
2022-01-06 16:52:40 +01:00
Fred Pauchet 292c97c64f Make tests pass on home page
continuous-integration/drone/push Build is passing Details
continuous-integration/drone/pr Build is failing Details
2022-01-06 16:47:19 +01:00
Fred Pauchet 3fad961353 Get rid of 'config.views'... 2022-01-06 16:20:37 +01:00
Fred Pauchet 3fac4319a7 Create 'core' app
Move 'config.views' inside this new application.
The objective will be to decouple the configuration from core files.
2022-01-06 10:48:03 +01:00
11 changed files with 57 additions and 14 deletions

View File

@ -43,6 +43,7 @@ INSTALLED_APPS = [
'django.contrib.messages',
'django.contrib.staticfiles',
'django_extensions',
"ultron.core",
'ultron.location',
'ultron.people',
'ultron.followup',

View File

@ -16,7 +16,6 @@ Including another URLconf
from django.contrib import admin
from django.urls import include, path
import config.views
import ultron.followup.urls
import ultron.location.urls
import ultron.people.urls
@ -25,9 +24,6 @@ import ultron.planning.urls
import ultron.objective.urls
urlpatterns = [
# Global search
path(r"search/", config.views.search, name="global_search"),
# Profile list
path(r"profile/", include(ultron.profiles.urls.profile_urlpatterns)),
@ -56,10 +52,7 @@ urlpatterns = [
# Planning management
path(r"event/", include(ultron.planning.urls.event_urlpatterns)),
# Login & logout
path(r"login/", config.views.login, name="login"),
path(r"logout/", config.views.logout, name="logout"),
path(r"", config.views.home, name="home"),
path("", include("ultron.core.urls")),
# Administration
path('admin/', admin.site.urls),

0
ultron/core/__init__.py Normal file
View File

3
ultron/core/admin.py Normal file
View File

@ -0,0 +1,3 @@
from django.contrib import admin
# Register your models here.

6
ultron/core/apps.py Normal file
View File

@ -0,0 +1,6 @@
from django.apps import AppConfig
class CoreConfig(AppConfig):
default_auto_field = 'django.db.models.BigAutoField'
name = 'ultron.core'

View File

29
ultron/core/tests.py Normal file
View File

@ -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)

11
ultron/core/urls.py Normal file
View File

@ -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"),
]

View File

@ -1,6 +1,4 @@
from datetime import datetime, timedelta, date
from functools import reduce
import operator
from django.db.models import Q
from django.shortcuts import render

View File

@ -1,7 +1,6 @@
from django.contrib import admin
from django.db.models import fields
from config.views import search
from .models import (
Chrono,
LearnedSkill,

View File

@ -1,7 +1,10 @@
from django.test import TestCase
from ultron.people.models import Gymnast
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):
def test_gymnast_tostring(self):