diff options
Diffstat (limited to 'core/TESTS')
-rw-r--r-- | core/TESTS/test_caves.py | 7 | ||||
-rw-r--r-- | core/TESTS/test_imports.py | 5 | ||||
-rw-r--r-- | core/TESTS/test_logins.py | 6 | ||||
-rw-r--r-- | core/TESTS/test_parsers.py | 8 | ||||
-rw-r--r-- | core/TESTS/test_urls.py | 3 | ||||
-rw-r--r-- | core/TESTS/tests-cuyc-ignored.py | 5 | ||||
-rw-r--r-- | core/TESTS/tests_copilot.py | 2 |
7 files changed, 18 insertions, 18 deletions
diff --git a/core/TESTS/test_caves.py b/core/TESTS/test_caves.py index 10dd9db..ae79a6f 100644 --- a/core/TESTS/test_caves.py +++ b/core/TESTS/test_caves.py @@ -5,15 +5,14 @@ Modified for Expo April 2021. import re from http import HTTPStatus -from django.test import Client, TestCase from django.contrib.auth.models import User +from django.test import Client, TestCase import settings - from troggle.core.models.caves import Cave -from troggle.core.models.troggle import Person, PersonExpedition, Expedition +from troggle.core.models.troggle import Expedition, Person, PersonExpedition from troggle.core.utils import current_expo - + current_year = current_expo() diff --git a/core/TESTS/test_imports.py b/core/TESTS/test_imports.py index 92bacc3..e81054b 100644 --- a/core/TESTS/test_imports.py +++ b/core/TESTS/test_imports.py @@ -83,7 +83,7 @@ class SimpleTest(SimpleTestCase): import troggle.core.views.expo from troggle.core.forms import CaveForm, EntranceForm, EntranceLetterForm - from troggle.core.models.caves import Cave, CaveAndEntrance, Entrance, SurvexStation #EntranceSlug, + from troggle.core.models.caves import Cave, CaveAndEntrance, Entrance, SurvexStation #EntranceSlug, from troggle.core.models.troggle import Expedition from troggle.core.views.auth import login_required_if_public @@ -107,6 +107,7 @@ class SimpleTest(SimpleTestCase): def test_import_urls(self): from django.conf import settings + #from django.conf.urls import include, url from django.contrib import admin, auth from django.urls import resolve, reverse @@ -146,7 +147,7 @@ class ImportTest(TestCase): @classmethod def setUpTestData(cls): import troggle.settings as settings - from troggle.parsers.logbooks import LOGBOOKS_DIR, DEFAULT_LOGBOOK_FILE + from troggle.parsers.logbooks import DEFAULT_LOGBOOK_FILE, LOGBOOKS_DIR LOGBOOKS_PATH = settings.EXPOWEB / LOGBOOKS_DIR test_year = "1986" diff --git a/core/TESTS/test_logins.py b/core/TESTS/test_logins.py index 83a92ec..80802ca 100644 --- a/core/TESTS/test_logins.py +++ b/core/TESTS/test_logins.py @@ -9,14 +9,14 @@ import pathlib import re from http import HTTPStatus +from django.contrib.auth.models import User from django.test import Client, TestCase import troggle.settings as settings -from troggle.core.models.wallets import Wallet from troggle.core.models.troggle import Expedition -from django.contrib.auth.models import User +from troggle.core.models.wallets import Wallet from troggle.core.utils import current_expo - + current_year = current_expo() diff --git a/core/TESTS/test_parsers.py b/core/TESTS/test_parsers.py index 2d4435d..66e058d 100644 --- a/core/TESTS/test_parsers.py +++ b/core/TESTS/test_parsers.py @@ -22,14 +22,14 @@ import subprocess import unittest from http import HTTPStatus -from django.test import Client, SimpleTestCase, TestCase from django.contrib.auth.models import User +from django.test import Client, SimpleTestCase, TestCase +import troggle.parsers.logbooks as lbp from troggle.core.models.logbooks import LogbookEntry -from troggle.core.models.troggle import Expedition, DataIssue, Person, PersonExpedition +from troggle.core.models.troggle import DataIssue, Expedition, Person, PersonExpedition from troggle.core.utils import current_expo -import troggle.parsers.logbooks as lbp - + current_year = current_expo() diff --git a/core/TESTS/test_urls.py b/core/TESTS/test_urls.py index 6cee23e..e7a30cf 100644 --- a/core/TESTS/test_urls.py +++ b/core/TESTS/test_urls.py @@ -91,7 +91,8 @@ import re from http import HTTPStatus from django.test import Client, TestCase -from django.urls import reverse, path +from django.urls import path, reverse + # class SimplePageTest(unittest.TestCase): class URLTests(TestCase): diff --git a/core/TESTS/tests-cuyc-ignored.py b/core/TESTS/tests-cuyc-ignored.py index 976c97f..eedddf3 100644 --- a/core/TESTS/tests-cuyc-ignored.py +++ b/core/TESTS/tests-cuyc-ignored.py @@ -29,8 +29,7 @@ class ImportTest(TestCase): #ed to go through all modules and copy all imports here from io import StringIO - from cuy.club.models import (Article, Event, Member, Webpage, - WebpageCategory) + from cuy.club.models import Article, Event, Member, Webpage, WebpageCategory from cuy.website.views.generic import PUBLIC_LOGIN from django.conf import settings from django.contrib.auth.decorators import login_required @@ -371,7 +370,7 @@ class ComplexLoginTests(TestCase): self.assertIsNotNone(t, 'Logged in as \'' + u.username + '\' but failed to get /committee/ content') def test_user_force(self): - from django.conf import settings + from django.conf import settings c = self.client u = self.user m = self.member diff --git a/core/TESTS/tests_copilot.py b/core/TESTS/tests_copilot.py index 1812d32..103bfc4 100644 --- a/core/TESTS/tests_copilot.py +++ b/core/TESTS/tests_copilot.py @@ -1,6 +1,6 @@ # Copilot: Sure, based on your `urls.py` file, here's how you might write end-to-end tests for the `survey_scans` endpoints: -from django.test import TestCase, Client +from django.test import Client, TestCase from django.urls import reverse # Copilot does not know that there is no data in the database, so that the tests need to pre-populate with |