arona/PyRIGS
1
0
Fork 0
mirror of https://github.com/nottinghamtec/PyRIGS.git synced 2026-01-17 05:22:16 +00:00
Code Issues Projects Releases Wiki Activity

Fix some async issues running tests.

Browse Source 
These were probably caused by the minor version change to jQuery.
Test logic remains unchanged as the underlying application still worked fine.
This commit is contained in:
Tom Price
2017-05-09 15:18:58 +01:00
parent c16ba62e45
commit 0f657662de
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
RIGS/test_functional.py
View File

@@ -1,6 +1,7 @@
# -*- coding: utf-8 -*- # -*- coding: utf-8 -*-
import os import os
import re import re
import time
from datetime import date, timedelta from datetime import date, timedelta
import reversion import reversion
@@ -297,6 +298,7 @@ class EventTest(LiveServerTestCase):
name.clear() name.clear()
name.send_keys('Rig ' + person1.name) name.send_keys('Rig ' + person1.name)
name.send_keys(Keys.ENTER) name.send_keys(Keys.ENTER)
time.sleep(0.1)
wait.until(animation_is_finished()) wait.until(animation_is_finished())
@@ -378,6 +380,7 @@ class EventTest(LiveServerTestCase):
e = modal.find_element_by_id("item_cost") e = modal.find_element_by_id("item_cost")
e.send_keys("23.95") e.send_keys("23.95")
e.send_keys(Keys.ENTER) # enter submit e.send_keys(Keys.ENTER) # enter submit
wait.until(animation_is_finished())
# Confirm item has been saved to json field # Confirm item has been saved to json field
objectitems = self.browser.execute_script("return objectitems;") objectitems = self.browser.execute_script("return objectitems;")
@@ -388,6 +391,7 @@ class EventTest(LiveServerTestCase):
# See new item appear in table # See new item appear in table
row = self.browser.find_element_by_id('item--1') # ID number is known, see above row = self.browser.find_element_by_id('item--1') # ID number is known, see above
self.assertIsNotNone(row.text)
self.assertIn("Test Item 1", row.find_element_by_xpath('//span[@class="name"]').text) self.assertIn("Test Item 1", row.find_element_by_xpath('//span[@class="name"]').text)
self.assertIn("This is an item description", row.find_element_by_xpath('//div[@class="item-description"]').text) self.assertIn("This is an item description", row.find_element_by_xpath('//div[@class="item-description"]').text)
self.assertEqual(u'£ 23.95', row.find_element_by_xpath('//tr[@id="item--1"]/td[2]').text) self.assertEqual(u'£ 23.95', row.find_element_by_xpath('//tr[@id="item--1"]/td[2]').text)
@@ -487,6 +491,7 @@ class EventTest(LiveServerTestCase):
e = modal.find_element_by_id("item_cost") e = modal.find_element_by_id("item_cost")
e.send_keys("23.95") e.send_keys("23.95")
e.send_keys(Keys.ENTER) # enter submit e.send_keys(Keys.ENTER) # enter submit
wait.until(animation_is_finished())
# Attempt to save # Attempt to save
save.click() save.click()
@@ -909,9 +914,9 @@ class animation_is_finished(object):
pass pass
def __call__(self, driver): def __call__(self, driver):
time.sleep(0.1) # allow time for the animation to actually start
numberAnimating = driver.execute_script('return $(":animated").length') numberAnimating = driver.execute_script('return $(":animated").length')
finished = numberAnimating == 0 finished = numberAnimating == 0
if finished: if finished:
import time
time.sleep(0.1) time.sleep(0.1)
return finished return finished