mirror of
https://github.com/nottinghamtec/PyRIGS.git
synced 2026-03-10 14:08:24 +00:00
Toolchain/Dependency Upgrade (#418)
* Upgrade to heroku-20 stack * Move some gulp deps to dev rather than prod * npm upgrade * Fix audit time check in asset audit test * Attempt at parallelising tests where possible * Add basic calendar button test Mainly to pickup on FullCalendar loading errors * Upgrade python deps * Tends to help if I push valid yaml * You valid now? * Fix whoops in requirements.txt * Change python ver * Define service in coveralls task * Run parallelised RIGS tests as one matrix job * Update python version in tests * Cache python dependencies Should majorly speedup parallelillelelised testing * Purge old vagrant config * No Ruby compass bodge, no need for rubocop! * Purge old .idea config * Switch to gh-a artifact uploading instead of imgur 'hack' For test failure screenshots. Happy now @mattysmith22? ;p * Oops, remove unused import * Exclude tests from the coverage stats Seems to be artifically deflating our stats * Refactor asset audit tests with better selectors Also fixed a silly title error with the modal * Add title checking to the slightly insane assets test * Fix unauth test to not just immediately pass out * Upload failure screenshots as individual artifacts not a zip Turns out I can't unzip things from my phone, which is a pain * Should fix asset test on CI * What about this? * What about this? Swear I spend my life jiggerypokerying the damn test suite... * Does this help the coverage be less weird? * Revert "Does this help the coverage be less weird?" This reverts commit39ab9df836. * Use pytest as our test runner for better parallelism Also rewrote some asset tests to be in the pytest style. May do some more. Some warnings cleaned up in the process. * Bah, codestyle * Oops, remove obsolete if check * Fix screenshot uploading on CI (again) * Try this way of parallel coverage * Add codeclimate maintainability badge * Remove some unused gulp dependencies * Run asset building serverside * Still helps if I commit valid YAML * See below * Different approach to CI dependencies * Exclude node_modules from codestyle * Does this work? * Parallel parallel builds were giving me a headache, try this * Update codeclimate settings, purge some config files * Well the YAML was *syntactically* valid.... * Switch back to old coveralls method * Fix codeclimate config, mark 2 * Attempt to bodge asset test * Oops, again Probably bedtime.. * Might fix heroku building * Attempt #2 at fixing heroku * Belt and braces approach to coverage * Github, you need a Actions YAML validator! * Might fix actions? * Try ignoring some third party deprecation warnings * Another go at making coverage show up * Some template cleanup * Minor python cleanup * Import optimisation * Revert "Minor python cleanup" This reverts commit6a4620a2e5. * Add format arg to coverage command * Ignore test directories from Heroku slug * Maybe this works to purge deps postbuild * Bunch of test refactoring * Restore signals import, screw you import optimisation * Further template refactoring * Add support for running tests with geckodriver, do this on CI * Screw you codestyle * Disable firefox tests for now That was way more errors than I expected * Run cleanup script from the right location * Plausibly fix tests * Helps if I don't delete the pipeline folder prior to collectstatic * Enable whitenoise * Can I delete pipeline here? * Allow seconds difference in assert_times_equal * Disable codeclimate * Remove not working rm command * Maybe this fixes coverage? * Try different coverage reporter * Fix search_help to need login * Made versioning magic a bit less expansive We have more apps than I thought... * Fix IDI0T error in Assets URLS * Refactor 'no access to unauthed' test to cover all of PyRIGS * Add RAs/Checklists to sample data generator * Fix some HTML errors in templates Which apparently only Django's HTML parser cares about, browsers DGAF... * Port title test to project level * Fix more HTML * Fix cable type detail
This commit is contained in:
GitHub
@@ -1,14 +1,12 @@
|
||||
from pypom import Page, Region
|
||||
from selenium.webdriver.common.by import By
|
||||
from selenium.webdriver.support import expected_conditions
|
||||
from selenium.webdriver import Chrome
|
||||
from django.urls import reverse
|
||||
from PyRIGS.tests import regions
|
||||
from RIGS.tests import regions as rigs_regions
|
||||
from PyRIGS.tests.pages import BasePage, FormPage
|
||||
from selenium.common.exceptions import NoSuchElementException
|
||||
from pypom import Region
|
||||
from selenium.webdriver.common.by import By
|
||||
from selenium.webdriver.support import expected_conditions as EC
|
||||
|
||||
from PyRIGS.tests import regions
|
||||
from PyRIGS.tests.pages import BasePage, FormPage
|
||||
from RIGS.tests import regions as rigs_regions
|
||||
|
||||
|
||||
class Index(BasePage):
|
||||
URL_TEMPLATE = reverse('index')
|
||||
@@ -304,3 +302,43 @@ class UserPage(BasePage):
|
||||
|
||||
def generate_key(self):
|
||||
self.find_element(*self._generation_button_selector).click()
|
||||
|
||||
|
||||
class CalendarPage(BasePage):
|
||||
URL_TEMPLATE = 'rigboard/calendar'
|
||||
|
||||
_go_locator = (By.ID, 'go-to-date-button')
|
||||
|
||||
_today_selector = (By.ID, 'today-button')
|
||||
|
||||
_prev_selector = (By.ID, 'prev-button')
|
||||
_next_selector = (By.ID, 'next-button')
|
||||
|
||||
_month_selector = (By.ID, 'month-button')
|
||||
_week_selector = (By.ID, 'week-button')
|
||||
_day_selector = (By.ID, 'day-button')
|
||||
|
||||
def go(self):
|
||||
return self.find_element(*self._go_locator).click()
|
||||
|
||||
@property
|
||||
def target_date(self):
|
||||
return regions.DatePicker(self, self.find_element(By.ID, 'go-to-date-input'))
|
||||
|
||||
def today(self):
|
||||
return self.find_element(*self._today_selector).click()
|
||||
|
||||
def prev(self):
|
||||
return self.find_element(*self._prev_selector).click()
|
||||
|
||||
def next(self):
|
||||
return self.find_element(*self._next_selector).click()
|
||||
|
||||
def month(self):
|
||||
return self.find_element(*self._month_selector).click()
|
||||
|
||||
def week(self):
|
||||
return self.find_element(*self._week_selector).click()
|
||||
|
||||
def day(self):
|
||||
return self.find_element(*self._day_selector).click()
|
||||
|
||||
@@ -1,10 +1,6 @@
|
||||
from pypom import Region
|
||||
from selenium.webdriver.common.by import By
|
||||
from selenium.webdriver.support import expected_conditions
|
||||
from selenium.webdriver.remote.webelement import WebElement
|
||||
from selenium.webdriver.support.ui import WebDriverWait
|
||||
from selenium.webdriver.support.select import Select
|
||||
import datetime
|
||||
|
||||
from PyRIGS.tests.regions import TextBox, Modal
|
||||
|
||||
|
||||
|
||||
@@ -1,22 +1,15 @@
|
||||
import datetime
|
||||
from datetime import date, time, timedelta
|
||||
from urllib.parse import urlparse
|
||||
from datetime import date
|
||||
|
||||
import pytest
|
||||
from django.conf import settings
|
||||
from django.core import mail, signing
|
||||
from django.core.management import call_command
|
||||
from django.db import transaction
|
||||
from django.http import HttpResponseBadRequest
|
||||
from django.test import TestCase
|
||||
from django.test.client import Client
|
||||
from django.test.utils import override_settings
|
||||
from django.urls import reverse
|
||||
from django.utils import timezone
|
||||
from reversion import revisions as reversion
|
||||
from RIGS import models, urls
|
||||
from RIGS.tests import regions
|
||||
|
||||
from . import pages
|
||||
from RIGS import models
|
||||
from pytest_django.asserts import assertContains, assertNotContains
|
||||
|
||||
|
||||
class BaseCase(TestCase):
|
||||
@@ -52,12 +45,32 @@ class TestEventValidation(BaseCase):
|
||||
def test_create(self):
|
||||
url = reverse('event_create')
|
||||
# end time before start access after start
|
||||
response = self.client.post(url, {'start_date': datetime.date(2020, 1, 1), 'start_time': datetime.time(10, 00), 'end_time': datetime.time(9, 00), 'access_at': datetime.datetime(2020, 1, 5, 10)})
|
||||
self.assertFormError(response, 'form', 'end_time', "Unless you've invented time travel, the event can't finish before it has started.")
|
||||
self.assertFormError(response, 'form', 'access_at', "Regardless of what some clients might think, access time cannot be after the event has started.")
|
||||
response = self.client.post(url, {'start_date': datetime.date(2020, 1, 1), 'start_time': datetime.time(10, 00),
|
||||
'end_time': datetime.time(9, 00),
|
||||
'access_at': datetime.datetime(2020, 1, 5, 10)})
|
||||
self.assertFormError(response, 'form', 'end_time',
|
||||
"Unless you've invented time travel, the event can't finish before it has started.")
|
||||
self.assertFormError(response, 'form', 'access_at',
|
||||
"Regardless of what some clients might think, access time cannot be after the event has started.")
|
||||
|
||||
|
||||
class ClientEventAuthorisationTest(BaseCase):
|
||||
def setup_event():
|
||||
models.VatRate.objects.create(start_at='2014-03-05', rate=0.20, comment='test1')
|
||||
venue = models.Venue.objects.create(name='Authorisation Test Venue')
|
||||
client = models.Person.objects.create(name='Authorisation Test Person', email='authorisation@functional.test')
|
||||
organisation = models.Organisation.objects.create(name='Authorisation Test Organisation', union_account=True)
|
||||
return models.Event.objects.create(
|
||||
name='Authorisation Test',
|
||||
start_date=date.today(),
|
||||
venue=venue,
|
||||
person=client,
|
||||
organisation=organisation,
|
||||
)
|
||||
|
||||
|
||||
def setup_mail(event, profile):
|
||||
profile.email = "teccie@nottinghamtec.co.uk"
|
||||
profile.save()
|
||||
auth_data = {
|
||||
'name': 'Test ABC',
|
||||
'po': '1234ABCZXY',
|
||||
@@ -65,72 +78,78 @@ class ClientEventAuthorisationTest(BaseCase):
|
||||
'uni_id': 1234567890,
|
||||
'tos': True
|
||||
}
|
||||
hmac = signing.dumps({'pk': event.pk, 'email': 'authemail@function.test',
|
||||
'sent_by': profile.pk})
|
||||
url = reverse('event_authorise', kwargs={'pk': event.pk, 'hmac': hmac})
|
||||
return auth_data, hmac, url
|
||||
|
||||
def setUp(self):
|
||||
super().setUp()
|
||||
self.hmac = signing.dumps({'pk': self.event.pk, 'email': 'authemail@function.test',
|
||||
'sent_by': self.profile.pk})
|
||||
self.url = reverse('event_authorise', kwargs={'pk': self.event.pk, 'hmac': self.hmac})
|
||||
|
||||
def test_requires_valid_hmac(self):
|
||||
bad_hmac = self.hmac[:-1]
|
||||
url = reverse('event_authorise', kwargs={'pk': self.event.pk, 'hmac': bad_hmac})
|
||||
response = self.client.get(url)
|
||||
self.assertIsInstance(response, HttpResponseBadRequest)
|
||||
# TODO: Add some form of sensbile user facing error
|
||||
# self.assertIn(response.content, "new URL") # check there is some level of sane instruction
|
||||
def test_requires_valid_hmac(client, admin_user):
|
||||
event = setup_event()
|
||||
auth_data, hmac, url = setup_mail(event, admin_user)
|
||||
bad_hmac = hmac[:-1]
|
||||
url = reverse('event_authorise', kwargs={'pk': event.pk, 'hmac': bad_hmac})
|
||||
response = client.get(url)
|
||||
assert isinstance(response, HttpResponseBadRequest)
|
||||
# TODO: Add some form of sensible user facing error
|
||||
# self.assertIn(response.content, "new URL") # check there is some level of sane instruction
|
||||
# response = client.get(url)
|
||||
# assertContains(response, event.organisation.name)
|
||||
|
||||
response = self.client.get(self.url)
|
||||
self.assertContains(response, self.event.organisation.name)
|
||||
|
||||
def test_validation(self):
|
||||
response = self.client.get(self.url)
|
||||
self.assertContains(response, "Terms of Hire")
|
||||
self.assertContains(response, "Account code")
|
||||
self.assertContains(response, "University ID")
|
||||
def test_validation(client, admin_user):
|
||||
event = setup_event()
|
||||
auth_data, hmac, url = setup_mail(event, admin_user)
|
||||
response = client.get(url)
|
||||
assertContains(response, "Terms of Hire")
|
||||
assertContains(response, "Account code")
|
||||
assertContains(response, "University ID")
|
||||
|
||||
response = self.client.post(self.url)
|
||||
self.assertContains(response, "This field is required.", 5)
|
||||
response = client.post(url)
|
||||
assertContains(response, "This field is required.", 5)
|
||||
|
||||
data = self.auth_data
|
||||
data['amount'] = self.event.total + 1
|
||||
auth_data['amount'] = event.total + 1
|
||||
|
||||
response = self.client.post(self.url, data)
|
||||
self.assertContains(response, "The amount authorised must equal the total for the event")
|
||||
self.assertNotContains(response, "This field is required.")
|
||||
response = client.post(url, auth_data)
|
||||
assertContains(response, "The amount authorised must equal the total for the event")
|
||||
assertNotContains(response, "This field is required.")
|
||||
|
||||
data['amount'] = self.event.total
|
||||
response = self.client.post(self.url, data)
|
||||
self.assertContains(response, "Your event has been authorised")
|
||||
auth_data['amount'] = event.total
|
||||
response = client.post(url, auth_data)
|
||||
assertContains(response, "Your event has been authorised")
|
||||
|
||||
self.event.refresh_from_db()
|
||||
self.assertTrue(self.event.authorised)
|
||||
self.assertEqual(self.event.authorisation.email, "authemail@function.test")
|
||||
event.refresh_from_db()
|
||||
assert event.authorised
|
||||
assert str(event.authorisation.email) == "authemail@function.test"
|
||||
|
||||
def test_duplicate_warning(self):
|
||||
auth = models.EventAuthorisation.objects.create(event=self.event, name='Test ABC', email='dupe@functional.test',
|
||||
amount=self.event.total, sent_by=self.profile)
|
||||
response = self.client.get(self.url)
|
||||
self.assertContains(response, 'This event has already been authorised.')
|
||||
|
||||
auth.amount += 1
|
||||
auth.save()
|
||||
def test_duplicate_warning(client, admin_user):
|
||||
event = setup_event()
|
||||
auth_data, hmac, url = setup_mail(event, admin_user)
|
||||
auth = models.EventAuthorisation.objects.create(event=event, name='Test ABC', email='dupe@functional.test',
|
||||
amount=event.total, sent_by=admin_user)
|
||||
response = client.get(url)
|
||||
assertContains(response, 'This event has already been authorised.')
|
||||
|
||||
response = self.client.get(self.url)
|
||||
self.assertContains(response, 'amount has changed')
|
||||
auth.amount += 1
|
||||
auth.save()
|
||||
|
||||
def test_email_sent(self):
|
||||
mail.outbox = []
|
||||
response = client.get(url)
|
||||
assertContains(response, 'amount has changed')
|
||||
|
||||
data = self.auth_data
|
||||
data['amount'] = self.event.total
|
||||
|
||||
response = self.client.post(self.url, data)
|
||||
self.assertContains(response, "Your event has been authorised.")
|
||||
self.assertEqual(len(mail.outbox), 2)
|
||||
@pytest.mark.django_db(transaction=True)
|
||||
def test_email_sent(admin_client, admin_user, mailoutbox):
|
||||
event = setup_event()
|
||||
auth_data, hmac, url = setup_mail(event, admin_user)
|
||||
|
||||
self.assertEqual(mail.outbox[0].to, ['authemail@function.test'])
|
||||
self.assertEqual(mail.outbox[1].to, [settings.AUTHORISATION_NOTIFICATION_ADDRESS])
|
||||
data = auth_data
|
||||
data['amount'] = event.total
|
||||
response = admin_client.post(url, data)
|
||||
assertContains(response, "Your event has been authorised.")
|
||||
assert len(mailoutbox) == 2
|
||||
assert mailoutbox[0].to == ['authemail@function.test']
|
||||
assert mailoutbox[1].to == [settings.AUTHORISATION_NOTIFICATION_ADDRESS]
|
||||
|
||||
|
||||
class TECEventAuthorisationTest(BaseCase):
|
||||
|
||||
@@ -1,31 +1,19 @@
|
||||
import datetime
|
||||
from datetime import date, time, timedelta
|
||||
from urllib.parse import urlparse
|
||||
|
||||
from django.conf import settings
|
||||
from django.core import mail, signing
|
||||
from django.core.management import call_command
|
||||
from django.db import transaction
|
||||
from django.http import HttpResponseBadRequest
|
||||
from django.test.client import Client
|
||||
from django.test.utils import override_settings
|
||||
from django.urls import reverse
|
||||
from django.utils import timezone
|
||||
from PyRIGS.tests import base
|
||||
from PyRIGS.tests import regions as base_regions
|
||||
from PyRIGS.tests.base import (AutoLoginTest, BaseTest, animation_is_finished,
|
||||
screenshot_failure_cls)
|
||||
from reversion import revisions as reversion
|
||||
from RIGS import models, urls
|
||||
from RIGS.tests import regions
|
||||
from selenium.common.exceptions import NoSuchElementException
|
||||
from selenium.webdriver.common.action_chains import ActionChains
|
||||
from selenium.webdriver.common.by import By
|
||||
from selenium.webdriver.common.keys import Keys
|
||||
from selenium.webdriver.support import expected_conditions as EC
|
||||
from selenium.webdriver.support.ui import WebDriverWait
|
||||
from selenium.webdriver.common.action_chains import ActionChains
|
||||
|
||||
from PyRIGS.tests import base
|
||||
from PyRIGS.tests import regions as base_regions
|
||||
from PyRIGS.tests.base import (AutoLoginTest, screenshot_failure_cls)
|
||||
from PyRIGS.tests.pages import animation_is_finished
|
||||
from RIGS import models
|
||||
from RIGS.tests import regions
|
||||
from . import pages
|
||||
|
||||
|
||||
@@ -251,7 +239,7 @@ class TestEventCreate(BaseRigboardTest):
|
||||
# Double-check we don't lose data when swapping
|
||||
self.page.select_event_type("Rig")
|
||||
self.wait.until(animation_is_finished())
|
||||
self.assertEquals(self.page.name, rig_name)
|
||||
self.assertEqual(self.page.name, rig_name)
|
||||
self.wait.until(animation_is_finished())
|
||||
self.page.select_event_type("Non-Rig")
|
||||
|
||||
@@ -645,7 +633,18 @@ class TestCalendar(BaseRigboardTest):
|
||||
else:
|
||||
self.assertNotContains(response, "TE E" + str(test) + " ")
|
||||
|
||||
# Wow - that was a lot of tests
|
||||
def test_calendar_buttons(self): # If FullCalendar fails to load for whatever reason, the buttons don't work
|
||||
self.page = pages.CalendarPage(self.driver, self.live_server_url).open()
|
||||
self.assertIn(timezone.now().strftime("%Y-%m"), self.driver.current_url)
|
||||
|
||||
target_date = datetime.date(2020, 1, 1)
|
||||
self.page.target_date.set_value(target_date)
|
||||
self.page.go()
|
||||
self.assertIn(self.page.target_date.value.strftime("%Y-%m"), self.driver.current_url)
|
||||
|
||||
self.page.next()
|
||||
target_date += datetime.timedelta(days=32)
|
||||
self.assertIn(target_date.strftime("%m"), self.driver.current_url)
|
||||
|
||||
|
||||
@screenshot_failure_cls
|
||||
|
||||
@@ -1,13 +1,12 @@
|
||||
import pytz
|
||||
from reversion import revisions as reversion
|
||||
from django.conf import settings
|
||||
from django.core.exceptions import ValidationError
|
||||
from django.test import TestCase
|
||||
from RIGS import models
|
||||
from versioning import versioning
|
||||
from datetime import date, timedelta, datetime, time
|
||||
from decimal import *
|
||||
from PyRIGS.tests.base import create_browser
|
||||
|
||||
import pytz
|
||||
from django.conf import settings
|
||||
from django.test import TestCase
|
||||
from reversion import revisions as reversion
|
||||
|
||||
from RIGS import models
|
||||
|
||||
|
||||
class ProfileTestCase(TestCase):
|
||||
|
||||
@@ -2,13 +2,14 @@ from datetime import date
|
||||
|
||||
from django.core.exceptions import ObjectDoesNotExist
|
||||
from django.core.management import call_command
|
||||
from django.urls import reverse
|
||||
from django.test import TestCase
|
||||
from django.test.utils import override_settings
|
||||
from django.urls import reverse, reverse_lazy
|
||||
from django.utils import timezone
|
||||
from pytest_django.asserts import assertRedirects, assertNotContains, assertContains
|
||||
|
||||
from PyRIGS.tests.base import assert_times_equal
|
||||
from RIGS import models
|
||||
from reversion import revisions as reversion
|
||||
|
||||
|
||||
class TestAdminMergeObjects(TestCase):
|
||||
@@ -354,203 +355,105 @@ class TestSampleDataGenerator(TestCase):
|
||||
self.assertRaisesRegex(CommandError, ".*production", call_command, 'generateSampleRIGSData')
|
||||
|
||||
|
||||
class TestSearchLogic(TestCase):
|
||||
@classmethod
|
||||
def setUpTestData(cls):
|
||||
cls.profile = models.Profile.objects.create(username="testuser1", email="1@test.com", is_superuser=True,
|
||||
is_active=True, is_staff=True)
|
||||
|
||||
cls.persons = {
|
||||
1: models.Person.objects.create(name="Right Person", phone="1234"),
|
||||
2: models.Person.objects.create(name="Wrong Person", phone="5678"),
|
||||
}
|
||||
|
||||
cls.organisations = {
|
||||
1: models.Organisation.objects.create(name="Right Organisation", email="test@example.com"),
|
||||
2: models.Organisation.objects.create(name="Wrong Organisation", email="check@fake.co.uk"),
|
||||
}
|
||||
|
||||
cls.venues = {
|
||||
1: models.Venue.objects.create(name="Right Venue", address="1 Test Street, EX1"),
|
||||
2: models.Venue.objects.create(name="Wrong Venue", address="2 Check Way, TS2"),
|
||||
}
|
||||
|
||||
cls.events = {
|
||||
1: models.Event.objects.create(name="Right Event", start_date=date.today(), person=cls.persons[1],
|
||||
organisation=cls.organisations[1], venue=cls.venues[1]),
|
||||
2: models.Event.objects.create(name="Wrong Event", start_date=date.today(), person=cls.persons[2],
|
||||
organisation=cls.organisations[2], venue=cls.venues[2]),
|
||||
}
|
||||
|
||||
def setUp(self):
|
||||
self.profile.set_password('testuser')
|
||||
self.profile.save()
|
||||
self.assertTrue(self.client.login(username=self.profile.username, password='testuser'))
|
||||
|
||||
def test_event_search(self):
|
||||
# Test search by name
|
||||
request_url = "%s?q=%s" % (reverse('event_archive'), self.events[1].name)
|
||||
response = self.client.get(request_url, follow=True)
|
||||
self.assertContains(response, self.events[1].name)
|
||||
self.assertNotContains(response, self.events[2].name)
|
||||
|
||||
# Test search by ID
|
||||
request_url = "%s?q=%s" % (reverse('event_archive'), self.events[1].pk)
|
||||
response = self.client.get(request_url, follow=True)
|
||||
self.assertContains(response, self.events[1].name)
|
||||
self.assertNotContains(response, self.events[2].name)
|
||||
|
||||
def test_people_search(self):
|
||||
# Test search by name
|
||||
request_url = "%s?q=%s" % (reverse('person_list'), self.persons[1].name)
|
||||
response = self.client.get(request_url, follow=True)
|
||||
self.assertContains(response, self.persons[1].name)
|
||||
self.assertNotContains(response, self.persons[2].name)
|
||||
|
||||
# Test search by ID
|
||||
request_url = "%s?q=%s" % (reverse('person_list'), self.persons[1].pk)
|
||||
response = self.client.get(request_url, follow=True)
|
||||
self.assertContains(response, self.persons[1].name)
|
||||
self.assertNotContains(response, self.persons[2].name)
|
||||
|
||||
# Test search by phone
|
||||
request_url = "%s?q=%s" % (reverse('person_list'), self.persons[1].phone)
|
||||
response = self.client.get(request_url, follow=True)
|
||||
self.assertContains(response, self.persons[1].name)
|
||||
self.assertNotContains(response, self.persons[2].name)
|
||||
|
||||
def test_organisation_search(self):
|
||||
# Test search by name
|
||||
request_url = "%s?q=%s" % (reverse('organisation_list'), self.organisations[1].name)
|
||||
response = self.client.get(request_url, follow=True)
|
||||
self.assertContains(response, self.organisations[1].name)
|
||||
self.assertNotContains(response, self.organisations[2].name)
|
||||
|
||||
# Test search by ID
|
||||
request_url = "%s?q=%s" % (reverse('organisation_list'), self.organisations[1].pk)
|
||||
response = self.client.get(request_url, follow=True)
|
||||
self.assertContains(response, self.organisations[1].name)
|
||||
self.assertNotContains(response, self.organisations[2].name)
|
||||
|
||||
# Test search by email
|
||||
request_url = "%s?q=%s" % (reverse('organisation_list'), self.organisations[1].email)
|
||||
response = self.client.get(request_url, follow=True)
|
||||
self.assertContains(response, self.organisations[1].email)
|
||||
self.assertNotContains(response, self.organisations[2].email)
|
||||
|
||||
def test_venue_search(self):
|
||||
# Test search by name
|
||||
request_url = "%s?q=%s" % (reverse('venue_list'), self.venues[1].name)
|
||||
response = self.client.get(request_url, follow=True)
|
||||
self.assertContains(response, self.venues[1].name)
|
||||
self.assertNotContains(response, self.venues[2].name)
|
||||
|
||||
# Test search by ID
|
||||
request_url = "%s?q=%s" % (reverse('venue_list'), self.venues[1].pk)
|
||||
response = self.client.get(request_url, follow=True)
|
||||
self.assertContains(response, self.venues[1].name)
|
||||
self.assertNotContains(response, self.venues[2].name)
|
||||
|
||||
# Test search by address
|
||||
request_url = "%s?q=%s" % (reverse('venue_list'), self.venues[1].address)
|
||||
response = self.client.get(request_url, follow=True)
|
||||
self.assertContains(response, self.venues[1].address)
|
||||
self.assertNotContains(response, self.venues[2].address)
|
||||
def search(client, url, found, notfound, arguments):
|
||||
for argument in arguments:
|
||||
query = getattr(found, argument)
|
||||
request_url = "%s?q=%s" % (reverse_lazy(url), query)
|
||||
response = client.get(request_url, follow=True)
|
||||
assertContains(response, getattr(found, 'name'))
|
||||
assertNotContains(response, getattr(notfound, 'name'))
|
||||
|
||||
|
||||
class TestHSLogic(TestCase):
|
||||
@classmethod
|
||||
def setUpTestData(cls):
|
||||
cls.profile = models.Profile.objects.create(username="testuser1", email="1@test.com", is_superuser=True,
|
||||
is_active=True, is_staff=True)
|
||||
def test_search(admin_client):
|
||||
persons = {
|
||||
1: models.Person.objects.create(name="Right Person", phone="1234"),
|
||||
2: models.Person.objects.create(name="Wrong Person", phone="5678"),
|
||||
}
|
||||
organisations = {
|
||||
1: models.Organisation.objects.create(name="Right Organisation", email="test@example.com"),
|
||||
2: models.Organisation.objects.create(name="Wrong Organisation", email="check@fake.co.uk"),
|
||||
}
|
||||
venues = {
|
||||
1: models.Venue.objects.create(name="Right Venue", address="1 Test Street, EX1"),
|
||||
2: models.Venue.objects.create(name="Wrong Venue", address="2 Check Way, TS2"),
|
||||
}
|
||||
events = {
|
||||
1: models.Event.objects.create(name="Right Event", start_date=date.today(), venue=venues[1], person=persons[1],
|
||||
organisation=organisations[1]),
|
||||
2: models.Event.objects.create(name="Wrong Event", start_date=date.today(), venue=venues[2], person=persons[2],
|
||||
organisation=organisations[2]),
|
||||
}
|
||||
search(admin_client, 'event_archive', events[1], events[2], ['name', 'id'])
|
||||
search(admin_client, 'person_list', persons[1], persons[2], ['name', 'id', 'phone'])
|
||||
search(admin_client, 'organisation_list', organisations[1], organisations[2],
|
||||
['name', 'id', 'email'])
|
||||
search(admin_client, 'venue_list', venues[1], venues[2],
|
||||
['name', 'id', 'address'])
|
||||
|
||||
cls.vatrate = models.VatRate.objects.create(start_at='2014-03-05', rate=0.20, comment='test1')
|
||||
cls.venue = models.Venue.objects.create(name="Venue 1")
|
||||
|
||||
cls.events = {
|
||||
1: models.Event.objects.create(name="TE E1", start_date=date.today(),
|
||||
description="This is an event description\nthat for a very specific reason spans two lines.",
|
||||
venue=cls.venue),
|
||||
2: models.Event.objects.create(name="TE E2", start_date=date.today()),
|
||||
}
|
||||
def setup_for_hs():
|
||||
models.VatRate.objects.create(start_at='2014-03-05', rate=0.20, comment='test1')
|
||||
venue = models.Venue.objects.create(name="Venue 1")
|
||||
return venue, {
|
||||
1: models.Event.objects.create(name="TE E1", start_date=date.today(),
|
||||
description="This is an event description\nthat for a very specific reason spans two lines.",
|
||||
venue=venue),
|
||||
2: models.Event.objects.create(name="TE E2", start_date=date.today()),
|
||||
}
|
||||
|
||||
cls.ras = {
|
||||
1: models.RiskAssessment.objects.create(event=cls.events[1],
|
||||
nonstandard_equipment=False,
|
||||
nonstandard_use=False,
|
||||
contractors=False,
|
||||
other_companies=False,
|
||||
crew_fatigue=False,
|
||||
big_power=False,
|
||||
power_mic=cls.profile,
|
||||
generators=False,
|
||||
other_companies_power=False,
|
||||
nonstandard_equipment_power=False,
|
||||
multiple_electrical_environments=False,
|
||||
noise_monitoring=False,
|
||||
known_venue=True,
|
||||
safe_loading=True,
|
||||
safe_storage=True,
|
||||
area_outside_of_control=True,
|
||||
barrier_required=True,
|
||||
nonstandard_emergency_procedure=True,
|
||||
special_structures=False,
|
||||
suspended_structures=False,
|
||||
outside=False),
|
||||
}
|
||||
|
||||
cls.checklists = {
|
||||
1: models.EventChecklist.objects.create(event=cls.events[1],
|
||||
power_mic=cls.profile,
|
||||
safe_parking=False,
|
||||
safe_packing=False,
|
||||
exits=False,
|
||||
trip_hazard=False,
|
||||
warning_signs=False,
|
||||
ear_plugs=False,
|
||||
hs_location="Locked away safely",
|
||||
extinguishers_location="Somewhere, I forgot",
|
||||
earthing=False,
|
||||
pat=False,
|
||||
date=timezone.now(),
|
||||
venue=cls.venue),
|
||||
}
|
||||
def create_ra(usr):
|
||||
venue, events = setup_for_hs()
|
||||
return models.RiskAssessment.objects.create(event=events[1], nonstandard_equipment=False, nonstandard_use=False,
|
||||
contractors=False, other_companies=False, crew_fatigue=False,
|
||||
big_power=False, power_mic=usr, generators=False,
|
||||
other_companies_power=False, nonstandard_equipment_power=False,
|
||||
multiple_electrical_environments=False, noise_monitoring=False,
|
||||
known_venue=True, safe_loading=True, safe_storage=True,
|
||||
area_outside_of_control=True, barrier_required=True,
|
||||
nonstandard_emergency_procedure=True, special_structures=False,
|
||||
suspended_structures=False, outside=False)
|
||||
|
||||
def setUp(self):
|
||||
self.profile.set_password('testuser')
|
||||
self.profile.save()
|
||||
self.assertTrue(self.client.login(username=self.profile.username, password='testuser'))
|
||||
|
||||
def test_list(self):
|
||||
request_url = reverse('hs_list')
|
||||
response = self.client.get(request_url, follow=True)
|
||||
self.assertContains(response, self.events[1].name)
|
||||
self.assertContains(response, self.events[2].name)
|
||||
self.assertContains(response, 'Create')
|
||||
def create_checklist(usr):
|
||||
venue, events = setup_for_hs()
|
||||
return models.EventChecklist.objects.create(event=events[1], power_mic=usr, safe_parking=False,
|
||||
safe_packing=False, exits=False, trip_hazard=False, warning_signs=False,
|
||||
ear_plugs=False, hs_location="Locked away safely",
|
||||
extinguishers_location="Somewhere, I forgot", earthing=False, pat=False,
|
||||
date=timezone.now(), venue=venue)
|
||||
|
||||
def test_ra_review(self):
|
||||
request_url = reverse('ra_review', kwargs={'pk': self.ras[1].pk})
|
||||
response = self.client.get(request_url, follow=True)
|
||||
self.assertContains(response, 'Reviewed by')
|
||||
self.assertContains(response, self.profile.name)
|
||||
ra = models.RiskAssessment.objects.get(event=self.events[1])
|
||||
self.assertEqual(timezone.now().date(), ra.reviewed_at.date())
|
||||
self.assertEqual(timezone.now().hour, ra.reviewed_at.hour)
|
||||
self.assertEqual(timezone.now().minute, ra.reviewed_at.minute)
|
||||
|
||||
def test_checklist_review(self):
|
||||
request_url = reverse('ec_review', kwargs={'pk': self.checklists[1].pk})
|
||||
response = self.client.get(request_url, follow=True)
|
||||
self.assertContains(response, 'Reviewed by')
|
||||
self.assertContains(response, self.profile.name)
|
||||
checklist = models.EventChecklist.objects.get(event=self.events[1])
|
||||
self.assertEqual(timezone.now().date(), checklist.reviewed_at.date())
|
||||
self.assertEqual(timezone.now().hour, checklist.reviewed_at.hour)
|
||||
self.assertEqual(timezone.now().minute, checklist.reviewed_at.minute)
|
||||
def test_list(admin_client):
|
||||
venue, events = setup_for_hs()
|
||||
request_url = reverse('hs_list')
|
||||
response = admin_client.get(request_url, follow=True)
|
||||
assertContains(response, events[1].name)
|
||||
assertContains(response, events[2].name)
|
||||
assertContains(response, 'Create')
|
||||
|
||||
def test_ra_redirect(self):
|
||||
request_url = reverse('event_ra', kwargs={'pk': self.events[1].pk})
|
||||
expected_url = reverse('ra_edit', kwargs={'pk': self.ras[1].pk})
|
||||
|
||||
response = self.client.get(request_url, follow=True)
|
||||
self.assertRedirects(response, expected_url, status_code=302, target_status_code=200)
|
||||
def review(client, profile, obj, request_url):
|
||||
time = timezone.now()
|
||||
response = client.get(reverse(request_url, kwargs={'pk': obj.pk}), follow=True)
|
||||
obj.refresh_from_db()
|
||||
assertContains(response, 'Reviewed by')
|
||||
assertContains(response, profile.name)
|
||||
assert_times_equal(time, obj.reviewed_at)
|
||||
|
||||
|
||||
def test_ra_review(admin_client, admin_user):
|
||||
review(admin_client, admin_user, create_ra(admin_user), 'ra_review')
|
||||
|
||||
|
||||
def test_checklist_review(admin_client, admin_user):
|
||||
review(admin_client, admin_user, create_checklist(admin_user), 'ec_review')
|
||||
|
||||
|
||||
def test_ra_redirect(admin_client, admin_user):
|
||||
ra = create_ra(admin_user)
|
||||
request_url = reverse('event_ra', kwargs={'pk': ra.event.pk})
|
||||
expected_url = reverse('ra_edit', kwargs={'pk': ra.pk})
|
||||
|
||||
response = admin_client.get(request_url, follow=True)
|
||||
assertRedirects(response, expected_url, status_code=302, target_status_code=200)
|
||||
|
||||
Reference in New Issue
Block a user