mirror of
https://github.com/nottinghamtec/PyRIGS.git
synced 2026-01-17 05:22:16 +00:00
Merge branch 'master' into feature/online-auth
# Conflicts: # RIGS/test_functional.py
This commit is contained in:
David Taylor
@@ -1,12 +1,11 @@
|
||||
# -*- coding: utf-8 -*-
|
||||
import os
|
||||
import re
|
||||
from datetime import date, timedelta
|
||||
import pytz
|
||||
from datetime import date, time, datetime, timedelta
|
||||
|
||||
import reversion
|
||||
from django.conf import settings
|
||||
from django.core import mail, signing
|
||||
from django.core.urlresolvers import reverse
|
||||
|
||||
from django.core import mail
|
||||
from django.db import transaction
|
||||
from django.http import HttpResponseBadRequest
|
||||
from django.test import LiveServerTestCase, TestCase
|
||||
@@ -18,18 +17,60 @@ from selenium.webdriver.support.ui import WebDriverWait
|
||||
|
||||
from RIGS import models
|
||||
|
||||
import re
|
||||
import os
|
||||
from datetime import date, timedelta
|
||||
from django.db import transaction
|
||||
from reversion import revisions as reversion
|
||||
import json
|
||||
from django.core.urlresolvers import reverse
|
||||
from django.core import mail, signing
|
||||
|
||||
|
||||
from django.conf import settings
|
||||
|
||||
import sys
|
||||
|
||||
browsers = [{"platform": "macOS 10.12",
|
||||
"browserName": "chrome",
|
||||
"version": "latest"},
|
||||
]
|
||||
|
||||
|
||||
def on_platforms(platforms):
|
||||
if not os.environ.get("TRAVIS"):
|
||||
platforms = {'local'}
|
||||
|
||||
def decorator(base_class):
|
||||
module = sys.modules[base_class.__module__].__dict__
|
||||
for i, platform in enumerate(platforms):
|
||||
d = dict(base_class.__dict__)
|
||||
d['desired_capabilities'] = platform
|
||||
name = "%s_%s" % (base_class.__name__, i + 1)
|
||||
module[name] = type(name, (base_class,), d)
|
||||
|
||||
return decorator
|
||||
|
||||
|
||||
|
||||
|
||||
def create_browser(test_name, desired_capabilities):
|
||||
# return webdriver.Chrome()
|
||||
if os.environ.get("TRAVIS"):
|
||||
username = os.environ["SAUCE_USERNAME"]
|
||||
access_key = os.environ["SAUCE_ACCESS_KEY"]
|
||||
caps = {'browserName': desired_capabilities['browserName']}
|
||||
caps['platform'] = desired_capabilities['platform']
|
||||
caps['version'] = desired_capabilities['version']
|
||||
caps["tunnel-identifier"] = os.environ["TRAVIS_JOB_NUMBER"]
|
||||
caps["name"] = '#' + os.environ["TRAVIS_JOB_NUMBER"] + ": " + test_name
|
||||
hub_url = "%s:%s@localhost:4445" % (username, access_key)
|
||||
driver = webdriver.Remote(desired_capabilities=caps, command_executor="http://%s/wd/hub" % hub_url)
|
||||
return driver
|
||||
else:
|
||||
return webdriver.Chrome()
|
||||
|
||||
|
||||
@on_platforms(browsers)
|
||||
class UserRegistrationTest(LiveServerTestCase):
|
||||
def setUp(self):
|
||||
self.browser = webdriver.Firefox()
|
||||
self.browser = create_browser(self.id(), self.desired_capabilities)
|
||||
|
||||
self.browser.implicitly_wait(3) # Set implicit wait session wide
|
||||
os.environ['RECAPTCHA_TESTING'] = 'True'
|
||||
|
||||
@@ -157,7 +198,7 @@ class UserRegistrationTest(LiveServerTestCase):
|
||||
|
||||
# All is well
|
||||
|
||||
|
||||
@on_platforms(browsers)
|
||||
class EventTest(LiveServerTestCase):
|
||||
def setUp(self):
|
||||
self.profile = models.Profile(
|
||||
@@ -165,11 +206,13 @@ class EventTest(LiveServerTestCase):
|
||||
self.profile.set_password("EventTestPassword")
|
||||
self.profile.save()
|
||||
|
||||
self.vatrate = models.VatRate.objects.create(start_at='2014-03-05', rate=0.20, comment='test1')
|
||||
|
||||
self.browser = webdriver.Firefox()
|
||||
self.browser.implicitly_wait(3) # Set implicit wait session wide
|
||||
self.browser.maximize_window()
|
||||
self.vatrate = models.VatRate.objects.create(start_at='2014-03-05',rate=0.20,comment='test1')
|
||||
|
||||
self.browser = create_browser(self.id(), self.desired_capabilities)
|
||||
self.browser.implicitly_wait(10) # Set implicit wait session wide
|
||||
# self.browser.maximize_window()
|
||||
|
||||
os.environ['RECAPTCHA_TESTING'] = 'True'
|
||||
|
||||
def tearDown(self):
|
||||
@@ -212,7 +255,7 @@ class EventTest(LiveServerTestCase):
|
||||
# Gets redirected to login and back
|
||||
self.authenticate('/event/create/')
|
||||
|
||||
wait = WebDriverWait(self.browser, 10) # setup WebDriverWait to use later (to wait for animations)
|
||||
wait = WebDriverWait(self.browser, 3) #setup WebDriverWait to use later (to wait for animations)
|
||||
|
||||
wait.until(animation_is_finished())
|
||||
|
||||
@@ -367,11 +410,11 @@ class EventTest(LiveServerTestCase):
|
||||
self.assertEqual(obj.pk, int(option.get_attribute("value")))
|
||||
|
||||
# Set start date/time
|
||||
form.find_element_by_id('id_start_date').send_keys('3015-05-25')
|
||||
form.find_element_by_id('id_start_date').send_keys('25/05/3015')
|
||||
form.find_element_by_id('id_start_time').send_keys('06:59')
|
||||
|
||||
# Set end date/time
|
||||
form.find_element_by_id('id_end_date').send_keys('4000-06-27')
|
||||
form.find_element_by_id('id_end_date').send_keys('27/06/4000')
|
||||
form.find_element_by_id('id_end_time').send_keys('07:00')
|
||||
|
||||
# Add item
|
||||
@@ -473,7 +516,8 @@ class EventTest(LiveServerTestCase):
|
||||
self.browser.get(self.live_server_url + '/event/' + str(testEvent.pk) + '/duplicate/')
|
||||
self.authenticate('/event/' + str(testEvent.pk) + '/duplicate/')
|
||||
|
||||
wait = WebDriverWait(self.browser, 10) # setup WebDriverWait to use later (to wait for animations)
|
||||
|
||||
wait = WebDriverWait(self.browser, 3) #setup WebDriverWait to use later (to wait for animations)
|
||||
|
||||
save = self.browser.find_element_by_xpath(
|
||||
'(//button[@type="submit"])[3]')
|
||||
@@ -538,7 +582,8 @@ class EventTest(LiveServerTestCase):
|
||||
# Gets redirected to login and back
|
||||
self.authenticate('/event/create/')
|
||||
|
||||
wait = WebDriverWait(self.browser, 10) # setup WebDriverWait to use later (to wait for animations)
|
||||
|
||||
wait = WebDriverWait(self.browser, 3) #setup WebDriverWait to use later (to wait for animations)
|
||||
|
||||
wait.until(animation_is_finished())
|
||||
|
||||
@@ -553,14 +598,13 @@ class EventTest(LiveServerTestCase):
|
||||
e.send_keys('Test Event Name')
|
||||
|
||||
# Both dates, no times, end before start
|
||||
form.find_element_by_id('id_start_date').clear()
|
||||
form.find_element_by_id('id_start_date').send_keys('3015-04-24')
|
||||
self.browser.execute_script("document.getElementById('id_start_date').value='3015-04-24'")
|
||||
|
||||
form.find_element_by_id('id_end_date').clear()
|
||||
form.find_element_by_id('id_end_date').send_keys('3015-04-23')
|
||||
self.browser.execute_script("document.getElementById('id_end_date').value='3015-04-23'")
|
||||
|
||||
# Attempt to save - should fail
|
||||
save.click()
|
||||
|
||||
error = self.browser.find_element_by_xpath('//div[contains(@class, "alert-danger")]')
|
||||
self.assertTrue(error.is_displayed())
|
||||
self.assertIn("can't finish before it has started", error.find_element_by_xpath('//dd[1]/ul/li').text)
|
||||
@@ -568,16 +612,14 @@ class EventTest(LiveServerTestCase):
|
||||
# Same date, end time before start time
|
||||
form = self.browser.find_element_by_tag_name('form')
|
||||
save = self.browser.find_element_by_xpath('(//button[@type="submit"])[3]')
|
||||
form.find_element_by_id('id_start_date').clear()
|
||||
form.find_element_by_id('id_start_date').send_keys('3015-04-24')
|
||||
|
||||
form.find_element_by_id('id_end_date').clear()
|
||||
form.find_element_by_id('id_end_date').send_keys('3015-04-23')
|
||||
self.browser.execute_script("document.getElementById('id_start_date').value='3015-04-24'")
|
||||
self.browser.execute_script("document.getElementById('id_end_date').value='3015-04-23'")
|
||||
|
||||
form.find_element_by_id('id_start_time').clear()
|
||||
form.find_element_by_id('id_start_time').send_keys(Keys.DELETE)
|
||||
form.find_element_by_id('id_start_time').send_keys('06:59')
|
||||
|
||||
form.find_element_by_id('id_end_time').clear()
|
||||
form.find_element_by_id('id_end_time').send_keys(Keys.DELETE)
|
||||
form.find_element_by_id('id_end_time').send_keys('06:00')
|
||||
|
||||
# Attempt to save - should fail
|
||||
@@ -589,30 +631,27 @@ class EventTest(LiveServerTestCase):
|
||||
# Same date, end time before start time
|
||||
form = self.browser.find_element_by_tag_name('form')
|
||||
save = self.browser.find_element_by_xpath('(//button[@type="submit"])[3]')
|
||||
form.find_element_by_id('id_start_date').clear()
|
||||
form.find_element_by_id('id_start_date').send_keys('3015-04-24')
|
||||
|
||||
form.find_element_by_id('id_end_date').clear()
|
||||
form.find_element_by_id('id_end_date').send_keys('3015-04-23')
|
||||
self.browser.execute_script("document.getElementById('id_start_date').value='3015-04-24'")
|
||||
self.browser.execute_script("document.getElementById('id_end_date').value='3015-04-24'")
|
||||
|
||||
form.find_element_by_id('id_start_time').clear()
|
||||
form.find_element_by_id('id_start_time').send_keys(Keys.DELETE)
|
||||
form.find_element_by_id('id_start_time').send_keys('06:59')
|
||||
|
||||
form.find_element_by_id('id_end_time').clear()
|
||||
form.find_element_by_id('id_end_time').send_keys(Keys.DELETE)
|
||||
form.find_element_by_id('id_end_time').send_keys('06:00')
|
||||
|
||||
# No end date, end time before start time
|
||||
form = self.browser.find_element_by_tag_name('form')
|
||||
save = self.browser.find_element_by_xpath('(//button[@type="submit"])[3]')
|
||||
form.find_element_by_id('id_start_date').clear()
|
||||
form.find_element_by_id('id_start_date').send_keys('3015-04-24')
|
||||
|
||||
self.browser.execute_script("document.getElementById('id_start_date').value='3015-04-24'")
|
||||
self.browser.execute_script("document.getElementById('id_end_date').value=''")
|
||||
|
||||
form.find_element_by_id('id_end_date').clear()
|
||||
|
||||
form.find_element_by_id('id_start_time').clear()
|
||||
form.find_element_by_id('id_start_time').send_keys(Keys.DELETE)
|
||||
form.find_element_by_id('id_start_time').send_keys('06:59')
|
||||
|
||||
form.find_element_by_id('id_end_time').clear()
|
||||
form.find_element_by_id('id_end_time').send_keys(Keys.DELETE)
|
||||
form.find_element_by_id('id_end_time').send_keys('06:00')
|
||||
|
||||
# Attempt to save - should fail
|
||||
@@ -624,16 +663,13 @@ class EventTest(LiveServerTestCase):
|
||||
# 2 dates, end after start
|
||||
form = self.browser.find_element_by_tag_name('form')
|
||||
save = self.browser.find_element_by_xpath('(//button[@type="submit"])[3]')
|
||||
form.find_element_by_id('id_start_date').clear()
|
||||
form.find_element_by_id('id_start_date').send_keys('3015-04-24')
|
||||
self.browser.execute_script("document.getElementById('id_start_date').value='3015-04-24'")
|
||||
self.browser.execute_script("document.getElementById('id_end_date').value='3015-04-26'")
|
||||
|
||||
form.find_element_by_id('id_end_date').clear()
|
||||
form.find_element_by_id('id_end_date').send_keys('3015-04-26')
|
||||
|
||||
form.find_element_by_id('id_start_time').clear()
|
||||
|
||||
form.find_element_by_id('id_end_time').clear()
|
||||
|
||||
self.browser.execute_script("document.getElementById('id_start_time').value=''")
|
||||
self.browser.execute_script("document.getElementById('id_end_time').value=''")
|
||||
|
||||
# Attempt to save - should succeed
|
||||
save.click()
|
||||
|
||||
@@ -648,8 +684,9 @@ class EventTest(LiveServerTestCase):
|
||||
# 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 = WebDriverWait(self.browser, 3) #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())
|
||||
|
||||
@@ -667,8 +704,7 @@ class EventTest(LiveServerTestCase):
|
||||
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')
|
||||
self.browser.execute_script("document.getElementById('id_start_date').value='3015-04-24'")
|
||||
|
||||
# Save the rig
|
||||
save.click()
|
||||
@@ -727,6 +763,66 @@ class EventTest(LiveServerTestCase):
|
||||
organisationPanel = self.browser.find_element_by_xpath('//div[contains(text(), "Contact Details")]/..')
|
||||
|
||||
|
||||
def testEventEdit(self):
|
||||
person = models.Person(name="Event Edit Person", email="eventdetail@person.tests.rigs", phone="123 123").save()
|
||||
organisation = models.Organisation(name="Event Edit Organisation", email="eventdetail@organisation.tests.rigs", phone="123 456").save()
|
||||
venue = models.Venue(name="Event Detail Venue").save()
|
||||
|
||||
eventData = {
|
||||
'name': "Detail Test",
|
||||
'description': "This is an event to test the detail view",
|
||||
'notes': "It is going to be awful",
|
||||
'person': person,
|
||||
'organisation': organisation,
|
||||
'venue': venue,
|
||||
'mic': self.profile,
|
||||
'start_date': date(2015, 06, 04),
|
||||
'end_date': date(2015, 06, 05),
|
||||
'start_time': time(10, 00),
|
||||
'end_time': time(15, 00),
|
||||
'meet_at': self.create_datetime(2015, 06, 04, 10, 00),
|
||||
'access_at': self.create_datetime(2015, 06, 04, 10, 00),
|
||||
'collector': 'A Person'
|
||||
}
|
||||
|
||||
event = models.Event(**eventData)
|
||||
event.save()
|
||||
|
||||
item1Data = {
|
||||
'event': event,
|
||||
'name': "Detail Item 1",
|
||||
'cost': "10.00",
|
||||
'quantity': "1",
|
||||
'order': 1
|
||||
}
|
||||
|
||||
models.EventItem(**item1Data).save()
|
||||
|
||||
self.browser.get(self.live_server_url + '/event/%d/edit/' % event.pk)
|
||||
self.authenticate('/event/%d/edit/' % event.pk)
|
||||
|
||||
save = self.browser.find_element_by_xpath('(//button[@type="submit"])[1]')
|
||||
save.click()
|
||||
|
||||
successTitle = self.browser.find_element_by_xpath('//h1').text
|
||||
self.assertIn("N%05d | Detail Test" % event.pk, successTitle)
|
||||
|
||||
reloadedEvent = models.Event.objects.get(name='Detail Test')
|
||||
reloadedItem = models.EventItem.objects.get(name='Detail Item 1')
|
||||
|
||||
# Check the event
|
||||
for key, value in eventData.iteritems():
|
||||
self.assertEqual(str(getattr(reloadedEvent, key)), str(value))
|
||||
|
||||
# Check the item
|
||||
for key, value in item1Data.iteritems():
|
||||
self.assertEqual(str(getattr(reloadedItem, key)), str(value))
|
||||
|
||||
def create_datetime(self, year, month, day, hour, min):
|
||||
tz = pytz.timezone(settings.TIME_ZONE)
|
||||
return tz.localize(datetime(year, month, day, hour, min)).astimezone(pytz.utc)
|
||||
|
||||
@on_platforms(browsers)
|
||||
class IcalTest(LiveServerTestCase):
|
||||
def setUp(self):
|
||||
self.all_events = set(range(1, 18))
|
||||
@@ -788,8 +884,9 @@ class IcalTest(LiveServerTestCase):
|
||||
models.Event.objects.create(name="TE E18", start_date=date.today(), is_rig=False, status=models.Event.CANCELLED,
|
||||
description="non rig today cancelled")
|
||||
|
||||
self.browser = webdriver.Firefox()
|
||||
self.browser.implicitly_wait(3) # Set implicit wait session wide
|
||||
|
||||
self.browser = create_browser(self.id(), self.desired_capabilities)
|
||||
self.browser.implicitly_wait(3) # Set implicit wait session wide
|
||||
os.environ['RECAPTCHA_TESTING'] = 'True'
|
||||
|
||||
def tearDown(self):
|
||||
|
||||
Reference in New Issue
Block a user