arona/PyRIGS
1
0
Fork 0
mirror of https://github.com/nottinghamtec/PyRIGS.git synced 2026-02-11 17:19:42 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'master' into checkin

Browse Source
This commit is contained in:
FreneticScribbler
2023-05-14 22:14:04 +01:00
parent 15a9a03200 724762a1e8
commit 67d2f80815
8 changed files with 958 additions and 1072 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Pipfile
View File

@@ -19,7 +19,7 @@ cssutils = "~=1.0.2"
dj-database-url = "~=0.5.0" dj-database-url = "~=0.5.0"
dj-static = "~=0.0.6" dj-static = "~=0.0.6"
Django = "~=3.2" Django = "~=3.2"
django-debug-toolbar = "~=3.2" django-debug-toolbar = "~=4.0.0"
django-filter = "~=2.4.0" django-filter = "~=2.4.0"
django-ical = "~=1.7.1" django-ical = "~=1.7.1"
django-recurrence = "~=1.10.3" django-recurrence = "~=1.10.3"
@@ -79,7 +79,7 @@ django-hcaptcha = "*"
pikepdf = "*" pikepdf = "*"
django-queryable-properties = "*" django-queryable-properties = "*"
django-mass-edit = "*" django-mass-edit = "*"
selenium = "~=3.141.0" selenium = "~=4.9.1"
[dev-packages] [dev-packages]
pycodestyle = "~=2.9.1" pycodestyle = "~=2.9.1"

754
Pipfile.lock generated
View File

File diff suppressed because it is too large Load Diff

4
PyRIGS/settings.py
View File

@@ -64,7 +64,7 @@ INSTALLED_APPS = (
'assets', 'assets',
'training', 'training',
'debug_toolbar', # 'debug_toolbar',
'registration', 'registration',
'reversion', 'reversion',
'widget_tweaks', 'widget_tweaks',
@@ -75,7 +75,7 @@ INSTALLED_APPS = (
MIDDLEWARE = ( MIDDLEWARE = (
'django.middleware.security.SecurityMiddleware', 'django.middleware.security.SecurityMiddleware',
'whitenoise.middleware.WhiteNoiseMiddleware', 'whitenoise.middleware.WhiteNoiseMiddleware',
'debug_toolbar.middleware.DebugToolbarMiddleware', # 'debug_toolbar.middleware.DebugToolbarMiddleware',
'reversion.middleware.RevisionMiddleware', 'reversion.middleware.RevisionMiddleware',
'django.contrib.sessions.middleware.SessionMiddleware', 'django.contrib.sessions.middleware.SessionMiddleware',
'django.middleware.common.CommonMiddleware', 'django.middleware.common.CommonMiddleware',

2
RIGS/tests/regions.py
View File

@@ -6,7 +6,7 @@ from PyRIGS.tests.regions import TextBox, Modal, SimpleMDETextArea
class Header(Region): class Header(Region):
def find_link(self, link_text): def find_link(self, link_text):
return self.driver.find_element_by_partial_link_text(link_text) return self.driver.find_element(By.PARTIAL_LINK_TEXT, link_text)
class ItemRow(Region): class ItemRow(Region):

19
RIGS/tests/test_interaction.py
View File

@@ -318,7 +318,7 @@ class TestEventDuplicate(BaseRigboardTest):
self.assertFalse(newEvent.authorised) self.assertFalse(newEvent.authorised)
self.assertNotIn("N%05d" % self.testEvent.pk, self.driver.find_element_by_xpath('//h2').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 self.assertNotIn("Event data duplicated but not yet saved", self.page.warning) # Check info message not visible
# Check the new items are visible # Check the new items are visible
@@ -327,26 +327,25 @@ class TestEventDuplicate(BaseRigboardTest):
self.assertIn("Test Item 2", table.text) self.assertIn("Test Item 2", table.text)
self.assertIn("Test Item 3", table.text) self.assertIn("Test Item 3", table.text)
infoPanel = self.driver.find_element_by_xpath('//div[contains(text(), "Event Info")]/..') infoPanel = self.driver.find_element(By.XPATH, '//div[contains(text(), "Event Info")]/..')
self.assertIn("N%05d" % self.testEvent.pk, self.assertIn("N%05d" % self.testEvent.pk, infoPanel.find_element(By.XPATH, '//dt[text()="Based On"]/following-sibling::dd[1]').text)
infoPanel.find_element_by_xpath('//dt[text()="Based On"]/following-sibling::dd[1]').text)
# Check the PO hasn't carried through # Check the PO hasn't carried through
self.assertNotIn("TESTPO", infoPanel.find_element_by_xpath('//dt[text()="PO"]/following-sibling::dd[1]').text) self.assertNotIn("TESTPO", infoPanel.find_element(By.XPATH, '//dt[text()="PO"]/following-sibling::dd[1]').text)
self.assertIn("N%05d" % self.testEvent.pk, self.assertIn("N%05d" % self.testEvent.pk,
infoPanel.find_element_by_xpath('//dt[text()="Based On"]/following-sibling::dd[1]').text) infoPanel.find_element(By.XPATH, '//dt[text()="Based On"]/following-sibling::dd[1]').text)
self.driver.get(self.live_server_url + '/event/' + str(self.testEvent.pk)) # Go back to the old event self.driver.get(self.live_server_url + '/event/' + str(self.testEvent.pk)) # Go back to the old event
# Check that based-on hasn't crept into the old event # Check that based-on hasn't crept into the old event
infoPanel = self.driver.find_element_by_xpath('//div[contains(text(), "Event Info")]/..') infoPanel = self.driver.find_element(By.XPATH, '//div[contains(text(), "Event Info")]/..')
self.assertNotIn("N%05d" % self.testEvent.pk, self.assertNotIn("N%05d" % self.testEvent.pk,
infoPanel.find_element_by_xpath('//dt[text()="Based On"]/following-sibling::dd[1]').text) infoPanel.find_element(By.XPATH, '//dt[text()="Based On"]/following-sibling::dd[1]').text)
# Check the PO remains on the old event # Check the PO remains on the old event
self.assertIn("TESTPO", infoPanel.find_element_by_xpath('//dt[text()="PO"]/following-sibling::dd[1]').text) self.assertIn("TESTPO", infoPanel.find_element(By.XPATH, '//dt[text()="PO"]/following-sibling::dd[1]').text)
self.assertNotIn("N%05d" % self.testEvent.pk, self.assertNotIn("N%05d" % self.testEvent.pk,
infoPanel.find_element_by_xpath('//dt[text()="Based On"]/following-sibling::dd[1]').text) infoPanel.find_element(By.XPATH, '//dt[text()="Based On"]/following-sibling::dd[1]').text)
# Check the items are as they were # Check the items are as they were
table = self.page.item_table # ID number is known, see above table = self.page.item_table # ID number is known, see above

4
assets/tests/test_interaction.py
View File

@@ -195,7 +195,7 @@ class TestAssetForm(AutoLoginTest):
# self.assertTrue(self.page.parent_selector.options[0].selected) # self.assertTrue(self.page.parent_selector.options[0].selected)
self.page.parent_selector.toggle() self.page.parent_selector.toggle()
self.assertFalse(self.driver.find_element_by_id('cable-table').is_displayed()) self.assertFalse(self.driver.find_element(By.ID, 'cable-table').is_displayed())
self.page.submit() self.page.submit()
self.assertTrue(self.page.success) self.assertTrue(self.page.success)
@@ -350,7 +350,7 @@ class TestAssetAudit(AutoLoginTest):
self.wait.until(ec.visibility_of_element_located((By.ID, 'modal'))) self.wait.until(ec.visibility_of_element_located((By.ID, 'modal')))
self.assertEqual(self.page.modal.asset_id, asset_row.id) self.assertEqual(self.page.modal.asset_id, asset_row.id)
self.page.modal.close() self.page.modal.close()
self.assertFalse(self.driver.find_element_by_id('modal').is_displayed()) self.assertFalse(self.driver.find_element(By.ID, 'modal').is_displayed())
# Make sure audit log was NOT filled out # Make sure audit log was NOT filled out
audited = models.Asset.objects.get(asset_id=asset_row.id) audited = models.Asset.objects.get(asset_id=asset_row.id)
assert audited.last_audited_by is None assert audited.last_audited_by is None

1193
package-lock.json generated
View File

File diff suppressed because it is too large Load Diff

50
users/tests/test_users.py
View File

@@ -6,6 +6,7 @@ from django.core import mail
from django.test import LiveServerTestCase from django.test import LiveServerTestCase
from django.test.utils import override_settings from django.test.utils import override_settings
from selenium.webdriver.common.keys import Keys from selenium.webdriver.common.keys import Keys
from selenium.webdriver.common.by import By
from PyRIGS.tests.base import create_browser from PyRIGS.tests.base import create_browser
from RIGS import models from RIGS import models
@@ -24,31 +25,31 @@ class UserRegistrationTest(LiveServerTestCase):
def test_registration(self): def test_registration(self):
# Navigate to the registration page # Navigate to the registration page
self.browser.get(self.live_server_url + '/user/register/') self.browser.get(self.live_server_url + '/user/register/')
title_text = self.browser.find_element_by_tag_name('h3').text title_text = self.browser.find_element(By.TAG_NAME, 'h3').text
self.assertIn("User Registration", title_text) self.assertIn("User Registration", title_text)
# Check the form invites correctly # Check the form invites correctly
username = self.browser.find_element_by_id('id_username') username = self.browser.find_element(By.ID, 'id_username')
self.assertEqual(username.get_attribute('placeholder'), 'Username') self.assertEqual(username.get_attribute('placeholder'), 'Username')
email = self.browser.find_element_by_id('id_email') email = self.browser.find_element(By.ID, 'id_email')
self.assertEqual(email.get_attribute('placeholder'), 'E-mail') self.assertEqual(email.get_attribute('placeholder'), 'E-mail')
# If this is correct we don't need to test it later # If this is correct we don't need to test it later
self.assertEqual(email.get_attribute('type'), 'email') self.assertEqual(email.get_attribute('type'), 'email')
password1 = self.browser.find_element_by_id('id_password1') password1 = self.browser.find_element(By.ID, 'id_password1')
self.assertEqual(password1.get_attribute('placeholder'), 'Password') self.assertEqual(password1.get_attribute('placeholder'), 'Password')
self.assertEqual(password1.get_attribute('type'), 'password') self.assertEqual(password1.get_attribute('type'), 'password')
password2 = self.browser.find_element_by_id('id_password2') password2 = self.browser.find_element(By.ID, 'id_password2')
self.assertEqual( self.assertEqual(
password2.get_attribute('placeholder'), 'Password confirmation') password2.get_attribute('placeholder'), 'Password confirmation')
self.assertEqual(password2.get_attribute('type'), 'password') self.assertEqual(password2.get_attribute('type'), 'password')
first_name = self.browser.find_element_by_id('id_first_name') first_name = self.browser.find_element(By.ID, 'id_first_name')
self.assertEqual(first_name.get_attribute('placeholder'), 'First name') self.assertEqual(first_name.get_attribute('placeholder'), 'First name')
last_name = self.browser.find_element_by_id('id_last_name') last_name = self.browser.find_element(By.ID, 'id_last_name')
self.assertEqual(last_name.get_attribute('placeholder'), 'Last name') self.assertEqual(last_name.get_attribute('placeholder'), 'Last name')
initials = self.browser.find_element_by_id('id_initials') initials = self.browser.find_element(By.ID, 'id_initials')
self.assertEqual(initials.get_attribute('placeholder'), 'Initials') self.assertEqual(initials.get_attribute('placeholder'), 'Initials')
# No longer required for new users # No longer required for new users
# phone = self.browser.find_element_by_id('id_phone') # phone = self.browser.find_element(By.ID, 'id_phone')
# self.assertEqual(phone.get_attribute('placeholder'), 'Phone') # self.assertEqual(phone.get_attribute('placeholder'), 'Phone')
# Fill the form out incorrectly # Fill the form out incorrectly
@@ -62,21 +63,20 @@ class UserRegistrationTest(LiveServerTestCase):
initials.send_keys('JS') initials.send_keys('JS')
# phone.send_keys('0123456789') # phone.send_keys('0123456789')
time.sleep(1) time.sleep(1)
self.browser.switch_to.frame(self.browser.find_element_by_tag_name("iframe")) self.browser.switch_to.frame(self.browser.find_element(By.TAG_NAME, "iframe"))
self.browser.find_element_by_id('anchor').click() self.browser.find_element(By.ID, 'anchor').click()
self.browser.switch_to.default_content() self.browser.switch_to.default_content()
time.sleep(3) time.sleep(3)
# Submit incorrect form # Submit incorrect form
submit = self.browser.find_element_by_xpath("//input[@type='submit']") submit = self.browser.find_element(By.XPATH, "//input[@type='submit']")
submit.click() submit.click()
# Restablish error fields # Restablish error fields
password1 = self.browser.find_element_by_id('id_password1') password1 = self.browser.find_element(By.ID, 'id_password1')
password2 = self.browser.find_element_by_id('id_password2') password2 = self.browser.find_element(By.ID, 'id_password2')
# Read what the error is # Read what the error is
alert = self.browser.find_element_by_css_selector( alert = self.browser.find_element(By.CSS_SELECTOR, '.alert-danger').text
'div.alert-danger').text
# TODO Use regex matching to handle smart/unsmart quotes... # TODO Use regex matching to handle smart/unsmart quotes...
self.assertIn("password fields didn", alert) self.assertIn("password fields didn", alert)
@@ -92,8 +92,7 @@ class UserRegistrationTest(LiveServerTestCase):
password2.send_keys(Keys.ENTER) password2.send_keys(Keys.ENTER)
# Check we have a success message # Check we have a success message
alert = self.browser.find_element_by_css_selector( alert = self.browser.find_element(By.CSS_SELECTOR, '.alert-success').text
'div.alert-success').text
self.assertIn('register', alert) self.assertIn('register', alert)
self.assertIn('email', alert) self.assertIn('email', alert)
@@ -111,14 +110,14 @@ class UserRegistrationTest(LiveServerTestCase):
self.browser.get(urls[0]) # go to the first link self.browser.get(urls[0]) # go to the first link
# Complete registration # Complete registration
title_text = self.browser.find_element_by_tag_name('h2').text title_text = self.browser.find_element(By.TAG_NAME, 'h2').text
self.assertIn('Complete', title_text) self.assertIn('Complete', title_text)
# Test login # Test login
self.browser.get(self.live_server_url + '/user/login') self.browser.get(self.live_server_url + '/user/login')
username = self.browser.find_element_by_id('id_username') username = self.browser.find_element(By.ID, 'id_username')
self.assertEqual(username.get_attribute('placeholder'), 'Username') self.assertEqual(username.get_attribute('placeholder'), 'Username')
password = self.browser.find_element_by_id('id_password') password = self.browser.find_element(By.ID, 'id_password')
self.assertEqual(password.get_attribute('placeholder'), 'Password') self.assertEqual(password.get_attribute('placeholder'), 'Password')
self.assertEqual(password.get_attribute('type'), 'password') self.assertEqual(password.get_attribute('type'), 'password')
@@ -132,8 +131,7 @@ class UserRegistrationTest(LiveServerTestCase):
self.assertFalse(profileObject.is_approved) self.assertFalse(profileObject.is_approved)
# Read what the error is # Read what the error is
alert = self.browser.find_element_by_css_selector( alert = self.browser.find_element(By.CSS_SELECTOR, 'div.alert-danger').text
'div.alert-danger').text
self.assertIn("approved", alert) self.assertIn("approved", alert)
# Approve the user so we can proceed # Approve the user so we can proceed
@@ -142,14 +140,14 @@ class UserRegistrationTest(LiveServerTestCase):
# Retry login # Retry login
self.browser.get(self.live_server_url + '/user/login') self.browser.get(self.live_server_url + '/user/login')
username = self.browser.find_element_by_id('id_username') username = self.browser.find_element(By.ID, 'id_username')
username.send_keys('TestUsername') username.send_keys('TestUsername')
password = self.browser.find_element_by_id('id_password') password = self.browser.find_element(By.ID, 'id_password')
password.send_keys('correcthorsebatterystaple') password.send_keys('correcthorsebatterystaple')
password.send_keys(Keys.ENTER) password.send_keys(Keys.ENTER)
# Check we are logged in # Check we are logged in
udd = self.browser.find_element_by_class_name('navbar').text udd = self.browser.find_element(By.CLASS_NAME, 'navbar').text
self.assertIn('Hi John', udd) self.assertIn('Hi John', udd)
# Check all the data actually got saved # Check all the data actually got saved