arona/PyRIGS
1
0
Fork 0
mirror of https://github.com/nottinghamtec/PyRIGS.git synced 2026-01-20 06:52:15 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'rig_non_rig'

Browse Source
This commit is contained in:
David Taylor
2015-10-11 12:02:55 +01:00
parent ee361341c4 932b4a6852
commit d1d389eeaf
2 changed files with 33 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
RIGS/templates/RIGS/event_form.html
View File

@@ -57,14 +57,14 @@
$('#is_rig-selector button').on('click', function () { $('#is_rig-selector button').on('click', function () {
$('.form-non_rig').slideDown(); $('.form-non_rig').slideDown();
if ($(this).data('is_rig') == 1) { if ($(this).data('is_rig') == 1) {
$('#{{form.is_rig.auto_id}}').attr('checked', true); $('#{{form.is_rig.auto_id}}').prop('checked', true);
if ($('.form-non_rig').is(':hidden')) { if ($('.form-non_rig').is(':hidden')) {
$('.form-is_rig').show(); $('.form-is_rig').show();
} else { } else {
$('.form-is_rig').slideDown(); $('.form-is_rig').slideDown();
} }
} else { } else {
$('#{{form.is_rig.auto_id}}').attr('checked', false); $('#{{form.is_rig.auto_id}}').prop('checked', false);
$('.form-is_rig').slideUp(); $('.form-is_rig').slideUp();
} }
}) })

31
RIGS/test_functional.py
View File

@@ -613,7 +613,38 @@ class EventTest(LiveServerTestCase):
event = models.Event.objects.get(name='Test Event Name') event = models.Event.objects.get(name='Test Event Name')
self.assertIn("N0000%d | Test Event Name"%event.pk, self.browser.find_element_by_xpath('//h1').text) self.assertIn("N0000%d | Test Event Name"%event.pk, self.browser.find_element_by_xpath('//h1').text)
def testRigNonRig(self):
self.browser.get(self.live_server_url + '/event/create/')
# Gets redirected to login and back
self.authenticate('/event/create/')
wait = WebDriverWait(self.browser, 10) #setup WebDriverWait to use later (to wait for animations)
self.browser.implicitly_wait(3) #Set session-long wait (only works for non-existant DOM objects)
wait.until(animation_is_finished())
# Click Non-Rig button
self.browser.find_element_by_xpath('//button[.="Non-Rig"]').click()
# Click Rig button
self.browser.find_element_by_xpath('//button[.="Rig"]').click()
form = self.browser.find_element_by_tag_name('form')
save = self.browser.find_element_by_xpath('(//button[@type="submit"])[3]')
# Set title
e = self.browser.find_element_by_id('id_name')
e.send_keys('Test Event Name')
# Set an arbitrary date
form.find_element_by_id('id_start_date').clear()
form.find_element_by_id('id_start_date').send_keys('3015-04-24')
# Save the rig
save.click()
detail_panel = self.browser.find_element_by_xpath("//div[@id='content']/div/div[6]/div/div")
self.assertTrue(detail_panel.is_displayed())
self.assertIn("Event Detail", detail_panel.text)
def testEventDetail(self): def testEventDetail(self):
with transaction.atomic(), reversion.create_revision(): with transaction.atomic(), reversion.create_revision():