From b94cef92d23a4a7c76b10b20cde8c072d6aaa181 Mon Sep 17 00:00:00 2001
From: Tom Price <tom@codedinternet.com>
Date: Mon, 11 Jul 2016 23:26:12 +0100
Subject: [PATCH 1/3] Update selenium due to OS X based firefox issue

---
 requirements.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/requirements.txt b/requirements.txt
index 532cadea..995d2afd 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -20,7 +20,7 @@ python-dateutil==2.4.2
 pytz==2015.4
 raven==5.8.1
 reportlab==3.1.44
-selenium==2.53.1
+selenium==2.53.6
 simplejson==3.7.2
 six==1.9.0
 sqlparse==0.1.15

From 84393e9e4a107ec2f784d088bec854585cfe774b Mon Sep 17 00:00:00 2001
From: Tom Price <tom@codedinternet.com>
Date: Mon, 11 Jul 2016 23:26:43 +0100
Subject: [PATCH 2/3] Modify user creation test to replicate special character
 issue in #251

---
 RIGS/test_functional.py | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/RIGS/test_functional.py b/RIGS/test_functional.py
index 154fdfb2..7e5010f7 100644
--- a/RIGS/test_functional.py
+++ b/RIGS/test_functional.py
@@ -1,18 +1,19 @@
 # -*- coding: utf-8 -*-
+import os
+import re
+from datetime import date, timedelta
+
+import reversion
+from django.core import mail
+from django.db import transaction
 from django.test import LiveServerTestCase
 from django.test.client import Client
-from django.core import mail
 from selenium import webdriver
-from selenium.webdriver.common.keys import Keys
 from selenium.common.exceptions import StaleElementReferenceException, WebDriverException
+from selenium.webdriver.common.keys import Keys
 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
-import reversion
-import json
 
 
 class UserRegistrationTest(LiveServerTestCase):
@@ -103,7 +104,7 @@ class UserRegistrationTest(LiveServerTestCase):
         # Check Email
         self.assertEqual(len(mail.outbox), 1)
         email = mail.outbox[0]
-        self.assertIn('activation required', email.subject)
+        self.assertIn('John Smith "JS" activation required', email.subject)
         urls = re.findall(
             'http[s]?://(?:[a-zA-Z]|[0-9]|[$-_@.&+]|[!*\(\),]|(?:%[0-9a-fA-F][0-9a-fA-F]))+', email.body)
         self.assertEqual(len(urls), 1)

From 4f839d05f9fbe96b62f95b9100d3599342ce12c3 Mon Sep 17 00:00:00 2001
From: Tom Price <tom@codedinternet.com>
Date: Mon, 11 Jul 2016 23:28:15 +0100
Subject: [PATCH 3/3] Fix issues with special characters in registration email
 subject.

Closes #251
---
 templates/registration/activation_email_subject.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/templates/registration/activation_email_subject.txt b/templates/registration/activation_email_subject.txt
index 2237d0a8..1f707f9e 100644
--- a/templates/registration/activation_email_subject.txt
+++ b/templates/registration/activation_email_subject.txt
@@ -1 +1 @@
-{{ user }} activation required
\ No newline at end of file
+{{ user|safe }} activation required