Commit Graph

59 Commits

Author SHA1 Message Date
David Taylor
f8aaf9f36e Merge branch 'master' into feature/online-auth
# Conflicts:
#	RIGS/rigboard.py
#	RIGS/test_functional.py
#	RIGS/urls.py
#	requirements.txt
2017-05-12 20:53:00 +01:00
David Taylor
e573088c5e Fix some issues caused by changes made over the last year 2017-05-10 17:51:55 +01:00
David Taylor
7ac9eef7a2 Merge master into python-deps
# Conflicts:
#	PyRIGS/settings.py
#	RIGS/admin.py
#	RIGS/models.py
#	RIGS/test_functional.py
#	RIGS/urls.py
#	requirements.txt
#	wercker.yml
2017-05-10 17:32:21 +01:00
David Taylor
286e4314f5 Require users to have nottinghamtec.co.uk address before allowing them to send messages to clients 2017-05-10 15:39:13 +01:00
Tom Price
331dab20f7 Add basic tracking of when an event authorisation request was sent.
Designed and requested by Ross because he can't remember if he's push a button...
2017-04-19 18:14:36 +01:00
Tom Price
430862b24d Add tracking of who sent the link 2017-04-11 15:52:38 +01:00
Tom Price
5be3842aea Fix test client login because we are still using Django 1.8 2017-04-10 23:28:00 +01:00
Tom Price
067e03b757 Remove Event.purchase_order in favour of a simple EventAuthorisation object. 2017-04-10 23:16:50 +01:00
Tom Price
22119a3d08 Add test for sending authorisation email to client 2017-04-10 20:50:28 +01:00
Tom Price
7fd0c50146 Add sending of emails to clients.
Add email sending methods.

Add TEC side sending of emails.
2017-04-10 20:39:19 +01:00
Tom Price
97b11eabbd Add test for sending emails.
Add backup email if there isn't an MIC
2017-04-10 19:28:35 +01:00
Tom Price
1670b190c2 Add tests for the client side authorisation 2017-04-10 18:11:49 +01:00
David Taylor
b939bc5a64 Do not display "not saved" message when the event has been saved 2016-10-23 14:05:25 +01:00
David Taylor
90c8b19915 Added tests for PO non-duplication 2016-10-23 12:45:27 +01:00
Tom Price
84393e9e4a Modify user creation test to replicate special character issue in #251 2016-07-11 23:26:43 +01:00
Tom Price
8cfda69717 Set wercker up to use postgres for tests again.
Modify the tests to be postgres compatible by using more pointers to things rather than getting them everytime.
2016-03-31 16:03:07 +01:00
Tom Price
98ee9bb0db Fix imports in tests 2016-03-31 12:13:11 +01:00
Tom Price
2ee7c064af Add a dirty work around for wercker not quite working correctly. 2016-03-18 16:48:43 +00:00
Tom Price
4370cf60d1 And yet some more waits 2016-03-17 18:44:03 +00:00
Tom Price
e7496a9d82 Add some more waits for animations in failing test 2016-03-17 18:37:15 +00:00
Tom Price
77f7a25fa8 Try maximising firefox so it is large enough to pass the test 2016-03-17 18:06:37 +00:00
Tom Price
10c5ea3e7c Add a wait for the animation to complete during event creation. 2016-03-17 17:47:02 +00:00
David Taylor
c6b45da72c Made tests more reliable - wait for success page to load before checking item exists in database 2016-03-16 12:49:42 +00:00
Tom Price
29126a558b Make the captcha Foxtrot Oscar from the functional tests 2016-01-04 23:38:17 +00:00
David Taylor
0b5936be90 Added test for rig/non-rig changing 2015-10-11 11:39:33 +01:00
Tom Price
93b2d37727 Manually undo 28f5158 and move the session wide implicitly_wait to setUp methods. 2015-09-09 16:56:45 +01:00
Tom Price
28f51589d3 Add implicit_delay's everywhere they MIGHT be needed (where a request is made) 2015-09-09 16:33:29 +01:00
Tom Price
0402dd44b2 Add a small delay to waiting for animations to cope with async threads sometimes misbehaving. 2015-09-09 13:09:13 +01:00
David Taylor
0eb820000c Merge branch 'master' into duplicate-event 2015-08-27 23:59:50 +01:00
David Taylor
0cf62f983f Added data save check to registration (currently fails) 2015-08-27 01:35:27 +01:00
David Taylor
26697759d0 Added tests for EventDuplicate 2015-08-16 20:04:59 +01:00
David Taylor
e8aeb6aed7 Fixed time-travelling in the functional tests 2015-07-29 18:55:43 +01:00
Tom Price
9bbdb9fbe0 Merge branch 'master' into web-calendar 2015-07-29 18:39:36 +01:00
David Taylor
41ed0c96a2 Merge branch 'validation' 2015-07-20 22:53:44 +01:00
David Taylor
f08d7ed430 Added functional test for date validation 2015-07-20 22:52:08 +01:00
David Taylor
5641a998f3 Removed unnecessary variable & updated test 2015-07-19 16:14:40 +01:00
David Taylor
278864c7ea Added ical tests, and upgraded selenium 2015-06-30 17:11:50 +01:00
David Taylor
8ee76a9a75 Fixed testEventDetail 2015-06-28 19:02:18 +01:00
David Taylor
65a8b43dbf Fix testRigCreate (wait for animations) 2015-06-28 18:44:32 +01:00
David Taylor
e96b36e533 Fixed registration test 2015-06-28 16:40:22 +01:00
Tom Price
6b2df1b9f4 TestEventDetail does not work.
Changd name to prevent it from running a full suite of tests.

The issue appears to be with trying to access events without a
reversion history for that sepecific event.
2015-06-04 07:04:01 +01:00
Tom Price
8666dcc9a4 Start work on an EventDetail test 2015-06-04 06:42:01 +01:00
Tom Price
abdbad14d6 Add using the pk of the event rather than a static for atomicity when running other tests. 2015-06-04 06:30:47 +01:00
Tom Price
6180fdf7a4 Finish testing the remaining parts of adding an event 2015-06-04 06:26:43 +01:00
Tom Price
1f6e624cd9 Add small value checks, saving and checking error is displayed correctly. 2015-06-04 06:00:11 +01:00
Tom Price
e132bb2b9d Enable checking newly added item has worked 2015-06-04 05:40:41 +01:00
Tom Price
92795754b1 Enable adding an event item 2015-06-04 05:08:14 +01:00
Tom Price
85e827cd51 Add organisation, venue, start/end date/time 2015-06-02 00:48:00 +01:00
Tom Price
bd6d254557 Fix PEP8 fails 2015-06-02 00:15:26 +01:00
Tom Price
d8c2bd9260 Fix OS X fails 2015-06-02 00:13:01 +01:00