arona/PyRIGS
1
0
Fork 0
mirror of https://github.com/nottinghamtec/PyRIGS.git synced 2026-03-03 18:48:23 +00:00
Code Issues Projects Releases Wiki Activity

Move user/group setup into new generateSampleUserData command

Browse Source
This commit is contained in:
FreneticScribbler
2021-02-04 15:44:07 +00:00
parent 6cb3d1855a
commit 462a16ec42
20 changed files with 300 additions and 253 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
RIGS/tests/conftest.py
View File

@@ -1,7 +1,13 @@
from RIGS import models
import pytest
from django.utils import timezone
@pytest.fixture(autouse=True)
def vat_rate(db):
return models.VatRate.objects.create(start_at='2014-03-05', rate=0.20, comment='test1')
@pytest.fixture()
def basic_event(db):
return models.Event.objects.create(name="TE E1", start_date=timezone.now())

2
RIGS/tests/pages.py
View File

@@ -52,7 +52,7 @@ class EventDetail(BasePage):
URL_TEMPLATE = 'event/{event_id}'
# TODO Refactor into regions to match template fragmentation
_event_name_selector = (By.XPATH, '//h1')
_event_name_selector = (By.XPATH, '//h2')
_person_panel_selector = (By.XPATH, '//div[contains(text(), "Contact Details")]/..')
_name_selector = (By.XPATH, '//dt[text()="Person"]/following-sibling::dd[1]')
_email_selector = (By.XPATH, '//dt[text()="Email"]/following-sibling::dd[1]')

2
RIGS/tests/test_interaction.py
View File

@@ -313,7 +313,7 @@ class TestEventDuplicate(BaseRigboardTest):
self.assertFalse(newEvent.authorised)
self.assertNotIn("N%05d" % self.testEvent.pk, self.driver.find_element_by_xpath('//h1').text)
self.assertNotIn("N%05d" % self.testEvent.pk, self.driver.find_element_by_xpath('//h2').text)
self.assertNotIn("Event data duplicated but not yet saved", self.page.warning) # Check info message not visible
# Check the new items are visible

6
RIGS/tests/test_models.py
View File

@@ -20,8 +20,10 @@ def test_str():
@pytest.mark.django_db
def test_find_correct(vat_rate):
new_rate = models.VatRate.objects.create(start_at='2016-03-01', rate=0.15, comment='test2')
assert str(models.VatRate.objects.find_rate('2015-03-01')) == vat_rate
assert str(models.VatRate.objects.find_rate('2016-03-01')) == new_rate
r = models.VatRate.objects.find_rate('2015-03-01')
assert r == vat_rate
r = models.VatRate.objects.find_rate('2016-03-01')
assert r == new_rate
def test_percent_correct(vat_rate):

22
RIGS/tests/test_unit.py
View File

@@ -9,7 +9,7 @@ from django.utils import timezone
from pytest_django.asserts import assertRedirects, assertNotContains, assertContains
import PyRIGS.tests.test_unit
from PyRIGS.tests.base import assert_times_equal, assert_oembed, login
from PyRIGS.tests.base import assert_times_almost_equal, assert_oembed, login
from RIGS import models
import pytest
@@ -262,10 +262,6 @@ class TestPrintPaperwork(TestCase):
self.assertEqual(response.status_code, 200)
def create_event():
return models.Event.objects.create(name="TE E1", start_date=date.today())
def test_login_redirect(client, django_user_model):
request_url = reverse('event_embed', kwargs={'pk': 1})
expected_url = "{0}?next={1}".format(reverse('login_embed'), request_url)
@@ -288,9 +284,8 @@ def test_login_cookie_warning(client):
assertContains(response, "Cookies do not seem to be enabled")
def test_xframe_headers(admin_client):
event = create_event()
event_url = reverse('event_embed', kwargs={'pk': event.pk})
def test_xframe_headers(admin_client, basic_event):
event_url = reverse('event_embed', kwargs={'pk': basic_event.pk})
login_url = reverse('login_embed')
response = admin_client.get(event_url, follow=True)
@@ -302,11 +297,10 @@ def test_xframe_headers(admin_client):
response._headers["X-Frame-Options"]
def test_oembed(client):
event = create_event()
event_url = reverse('event_detail', kwargs={'pk': event.pk})
event_embed_url = reverse('event_embed', kwargs={'pk': event.pk})
oembed_url = reverse('event_oembed', kwargs={'pk': event.pk})
def test_oembed(client, basic_event):
event_url = reverse('event_detail', kwargs={'pk': basic_event.pk})
event_embed_url = reverse('event_embed', kwargs={'pk': basic_event.pk})
oembed_url = reverse('event_oembed', kwargs={'pk': basic_event.pk})
alt_oembed_url = reverse('event_oembed', kwargs={'pk': 999})
alt_event_embed_url = reverse('event_embed', kwargs={'pk': 999})
@@ -413,7 +407,7 @@ def review(client, profile, obj, request_url):
obj.refresh_from_db()
assertContains(response, 'Reviewed by')
assertContains(response, profile.name)
assert_times_equal(time, obj.reviewed_at)
assert_times_almost_equal(time, obj.reviewed_at)
def test_ra_review(admin_client, admin_user):