Merge ce0e477 into 099a184

.gitignore

@@ -25,6 +25,7 @@ var/
 *.egg-info/
 .installed.cfg
 *.egg
+node_modules/
 
 # Continer extras
 .vagrant
@@ -54,7 +55,6 @@ coverage.xml
 
 # Django stuff:
 *.log
-db.sqlite3
 
 # Sphinx documentation
 docs/_build/
@@ -108,4 +108,5 @@ atlassian-ide-plugin.xml
 com_crashlytics_export_strings.xml
 crashlytics.properties
 crashlytics-build.properties
-.vscode/
+.vscode/
+screenshots/

.travis.yml

@@ -1,13 +1,18 @@
 language: python
 python:
-  "3.6"
+  "3.8"
 cache: pip
 
 addons:
   chrome: stable
+
+before_install:
+  - export LANGUAGE=en_GB.UTF-8
 
 install:
-  - wget https://chromedriver.storage.googleapis.com/2.36/chromedriver_linux64.zip
+  - |
+    latest=$(wget -qO- https://chromedriver.storage.googleapis.com/LATEST_RELEASE)
+    wget https://chromedriver.storage.googleapis.com/$latest/chromedriver_linux64.zip
   - unzip chromedriver_linux64.zip
   - export PATH=$PATH:$(pwd)
   - chmod +x chromedriver

PyRIGS/decorators.py

@@ -8,7 +8,8 @@
 
 def get_oembed(login_url, request, oembed_view, kwargs):
     context = {}
-    context['oembed_url'] = "{0}://{1}{2}".format(request.scheme, request.META['HTTP_HOST'], reverse(oembed_view, kwargs=kwargs))
+    context['oembed_url'] = "{0}://{1}{2}".format(request.scheme, request.META['HTTP_HOST'],
+                                                  reverse(oembed_view, kwargs=kwargs))
     context['login_url'] = "{0}?{1}={2}".format(login_url, REDIRECT_FIELD_NAME, request.get_full_path())
     resp = render(request, 'login_redirect.html', context=context)
     return resp
@@ -28,9 +29,11 @@ def _checklogin(request, *args, **kwargs):
                     return get_oembed(login_url, request, oembed_view, kwargs)
                 else:
                     return HttpResponseRedirect('%s?%s=%s' % (login_url, REDIRECT_FIELD_NAME, request.get_full_path()))
+
         _checklogin.__doc__ = view_func.__doc__
         _checklogin.__dict__ = view_func.__dict__
         return _checklogin
+
     return _dec
 
 
@@ -60,9 +63,11 @@ def _checklogin(request, *args, **kwargs):
                 resp = render(request, '403.html')
                 resp.status_code = 403
                 return resp
+
         _checklogin.__doc__ = view_func.__doc__
         _checklogin.__dict__ = view_func.__dict__
         return _checklogin
+
     return _dec
 
 
@@ -80,6 +85,7 @@ def api_key_required(function):
     Failed users will be given a 403 error.
     Should only be used for urls which include <api_pk> and <api_key> kwargs
     """
+
     def wrap(request, *args, **kwargs):
 
         userid = kwargs.get('api_pk')
@@ -101,18 +107,21 @@ def wrap(request, *args, **kwargs):
         if user_object.api_key != key:
             return error_resp
         return function(request, *args, **kwargs)
+
     return wrap
 
 
 def nottinghamtec_address_required(function):
     """
     Checks that the current user has an email address ending @nottinghamtec.co.uk
     """
+
     def wrap(request, *args, **kwargs):
         # Fail if current user's email address isn't @nottinghamtec.co.uk
         if not request.user.email.endswith('@nottinghamtec.co.uk'):
-            error_resp = render(request, 'RIGS/eventauthorisation_request_error.html')
+            error_resp = render(request, 'eventauthorisation_request_error.html')
             return error_resp
 
         return function(request, *args, **kwargs)
+
     return wrap

PyRIGS/formats/en/formats.py

@@ -1,5 +1,3 @@
-
-
 DATETIME_FORMAT = ('d/m/Y H:i')
 DATE_FORMAT = ('d/m/Y')
 TIME_FORMAT = ('H:i')

PyRIGS/settings.py

@@ -26,9 +26,10 @@
 # SECURITY WARNING: don't run with debug turned on in production!
 DEBUG = bool(int(os.environ.get('DEBUG'))) if os.environ.get('DEBUG') else True
 
-
 STAGING = bool(int(os.environ.get('STAGING'))) if os.environ.get('STAGING') else False
 
+CI = bool(int(os.environ.get('CI'))) if os.environ.get('CI') else False
+
 ALLOWED_HOSTS = ['pyrigs.nottinghamtec.co.uk', 'rigs.nottinghamtec.co.uk', 'pyrigs.herokuapp.com']
 
 if STAGING:
@@ -45,7 +46,8 @@
 
 INTERNAL_IPS = ['127.0.0.1']
 
-ADMINS = [('Tom Price', 'tomtom5152@gmail.com'), ('IT Manager', 'it@nottinghamtec.co.uk'), ('Arona Jones', 'arona.jones@nottinghamtec.co.uk')]
+ADMINS = [('Tom Price', 'tomtom5152@gmail.com'), ('IT Manager', 'it@nottinghamtec.co.uk'),
+          ('Arona Jones', 'arona.jones@nottinghamtec.co.uk')]
 if DEBUG:
     ADMINS.append(('Testing Superuser', 'superuser@example.com'))
 
@@ -57,6 +59,9 @@
     'django.contrib.sessions',
     'django.contrib.messages',
     'django.contrib.staticfiles',
+    'django.contrib.humanize',
+    'versioning',
+    'users',
     'RIGS',
     'assets',
 
@@ -147,6 +152,27 @@
     }
 }
 
+# Tests lock up SQLite otherwise
+if STAGING or CI:
+    CACHES = {
+        'default': {
+            'BACKEND': 'django.core.cache.backends.locmem.LocMemCache'
+        }
+    }
+elif DEBUG:
+    CACHES = {
+        'default': {
+            'BACKEND': 'django.core.cache.backends.dummy.DummyCache'
+        }
+    }
+else:
+    CACHES = {
+        'default': {
+            'BACKEND': 'django.core.cache.backends.db.DatabaseCache',
+            'LOCATION': 'cache_table',
+        }
+    }
+
 RAVEN_CONFIG = {
     'dsn': os.environ.get('RAVEN_DSN'),
     # If you are using git, you can also automatically configure the
@@ -164,8 +190,10 @@
 ACCOUNT_ACTIVATION_DAYS = 7
 
 # reCAPTCHA settings
-RECAPTCHA_PUBLIC_KEY = os.environ.get('RECAPTCHA_PUBLIC_KEY', "6LeIxAcTAAAAAJcZVRqyHh71UMIEGNQ_MXjiZKhI")  # If not set, use development key
-RECAPTCHA_PRIVATE_KEY = os.environ.get('RECAPTCHA_PRIVATE_KEY', "6LeIxAcTAAAAAGG-vFI1TnRWxMZNFuojJ4WifJWe")  # If not set, use development key
+RECAPTCHA_PUBLIC_KEY = os.environ.get('RECAPTCHA_PUBLIC_KEY',
+                                      "6LeIxAcTAAAAAJcZVRqyHh71UMIEGNQ_MXjiZKhI")  # If not set, use development key
+RECAPTCHA_PRIVATE_KEY = os.environ.get('RECAPTCHA_PRIVATE_KEY',
+                                       "6LeIxAcTAAAAAGG-vFI1TnRWxMZNFuojJ4WifJWe")  # If not set, use development key
 NOCAPTCHA = True
 
 SILENCED_SYSTEM_CHECKS = ['captcha.recaptcha_test_key_error']
@@ -201,10 +229,10 @@
 
 USE_TZ = True
 
+# Need to allow seconds as datetime-local input type spits out a time that has seconds
 DATETIME_INPUT_FORMATS = ('%Y-%m-%dT%H:%M', '%Y-%m-%dT%H:%M:%S')
 
 # Static files (CSS, JavaScript, Images)
-# https://docs.djangoproject.com/en/1.7/howto/static-files/
 STATICFILES_STORAGE = 'django.contrib.staticfiles.storage.ManifestStaticFilesStorage'
 STATIC_URL = '/static/'
 STATIC_ROOT = os.path.join(BASE_DIR, 'static/')
@@ -216,7 +244,7 @@
     {
         'BACKEND': 'django.template.backends.django.DjangoTemplates',
         'DIRS': [
-            os.path.join(BASE_DIR, 'templates'),
+            os.path.join(BASE_DIR, 'templates')
         ],
         'APP_DIRS': True,
         'OPTIONS': {
@@ -243,3 +271,6 @@
     'RISK_ASSESSMENT_URL') else "http://example.com"
 RISK_ASSESSMENT_SECRET = os.environ.get('RISK_ASSESSMENT_SECRET') if os.environ.get(
     'RISK_ASSESSMENT_SECRET') else secrets.token_hex(15)
+
+IMGUR_UPLOAD_CLIENT_ID = os.environ.get('IMGUR_UPLOAD_CLIENT_ID', '')
+IMGUR_UPLOAD_CLIENT_SECRET = os.environ.get('IMGUR_UPLOAD_CLIENT_SECRET', '')

PyRIGS/tests/base.py

@@ -3,13 +3,31 @@
 from RIGS import models as rigsmodels
 from . import pages
 import os
+import pytz
+from datetime import date, time, datetime, timedelta
+from django.conf import settings
+import imgurpython
+import PyRIGS.settings
+import sys
+import pathlib
+import inspect
+
+
+def create_datetime(year, month, day, hour, min):
+    tz = pytz.timezone(settings.TIME_ZONE)
+    return tz.localize(datetime(year, month, day, hour, min)).astimezone(pytz.utc)
 
 
 def create_browser():
     options = webdriver.ChromeOptions()
     options.add_argument("--window-size=1920,1080")
+    # No caching, please and thank you
+    options.add_argument("--aggressive-cache-discard")
+    options.add_argument("--disk-cache-size=0")
+    # God Save The Queen
+    options.add_argument("--lang=en_GB")
+    options.add_argument("--headless")
     if os.environ.get('CI', False):
-        options.add_argument("--headless")
         options.add_argument("--no-sandbox")
     driver = webdriver.Chrome(options=options)
     return driver
@@ -34,3 +52,48 @@ def setUp(self):
         self.profile.save()
         loginPage = pages.LoginPage(self.driver, self.live_server_url).open()
         loginPage.login("EventTest", "EventTestPassword")
+
+
+def screenshot_failure(func):
+    def wrapper_func(self, *args, **kwargs):
+        try:
+            func(self, *args, **kwargs)
+        except Exception as e:
+            screenshot_name = func.__module__ + "." + func.__qualname__
+            screenshot_file = "screenshots/" + func.__qualname__ + ".png"
+            if not pathlib.Path("screenshots").is_dir():
+                os.mkdir("screenshots")
+            self.driver.save_screenshot(screenshot_file)
+
+            if settings.IMGUR_UPLOAD_CLIENT_ID != "":
+                config = {
+                    'album': None,
+                    'name': screenshot_name,
+                    'title': screenshot_name,
+                    'description': ""
+                }
+                client = imgurpython.ImgurClient(settings.IMGUR_UPLOAD_CLIENT_ID, settings.IMGUR_UPLOAD_CLIENT_SECRET)
+                image = client.upload_from_path(screenshot_file, config=config)
+                print("Error in test {} is at url {}".format(screenshot_name, image['link']), file=sys.stderr)
+            else:
+                print("Error in test {} is at path {}".format(screenshot_name, screenshot_file), file=sys.stderr)
+            raise e
+    return wrapper_func
+
+
+def screenshot_failure_cls(cls):
+    for attr in cls.__dict__:
+        if callable(getattr(cls, attr)) and attr.startswith("test"):
+            setattr(cls, attr, screenshot_failure(getattr(cls, attr)))
+    return cls
+
+
+# Checks if animation is done
+class animation_is_finished():
+    def __call__(self, driver):
+        numberAnimating = driver.execute_script('return $(":animated").length')
+        finished = numberAnimating == 0
+        if finished:
+            import time
+            time.sleep(0.1)
+        return finished

PyRIGS/tests/pages.py

@@ -1,4 +1,5 @@
 from pypom import Page, Region
+from selenium.webdriver.common.action_chains import ActionChains
 from selenium.webdriver.common.by import By
 from selenium.webdriver import Chrome
 from selenium.common.exceptions import NoSuchElementException
@@ -30,14 +31,19 @@ def __setattr__(self, name, value):
 
 class FormPage(BasePage):
     _errors_selector = (By.CLASS_NAME, "alert-danger")
+    _submit_locator = (By.XPATH, "//button[@type='submit' and contains(., 'Save')]")
 
     def remove_all_required(self):
-        self.driver.execute_script("Array.from(document.getElementsByTagName(\"input\")).forEach(function (el, ind, arr) { el.removeAttribute(\"required\")});")
-        self.driver.execute_script("Array.from(document.getElementsByTagName(\"select\")).forEach(function (el, ind, arr) { el.removeAttribute(\"required\")});")
+        self.driver.execute_script(
+            "Array.from(document.getElementsByTagName(\"input\")).forEach(function (el, ind, arr) { el.removeAttribute(\"required\")});")
+        self.driver.execute_script(
+            "Array.from(document.getElementsByTagName(\"select\")).forEach(function (el, ind, arr) { el.removeAttribute(\"required\")});")
 
     def submit(self):
         previous_errors = self.errors
-        self.find_element(*self._submit_locator).click()
+        submit = self.find_element(*self._submit_locator)
+        ActionChains(self.driver).move_to_element(submit).perform()
+        submit.click()
         self.wait.until(lambda x: self.errors != previous_errors or self.success)
 
     @property