More optimisation and cleanup (#420)

PyRIGS/tests/base.py

@@ -11,30 +11,22 @@ from selenium.webdriver.support.wait import WebDriverWait
 
 from RIGS import models as rigsmodels
 from . import pages
-from envparse import env
+
+from pytest_django.asserts import assertContains
 
 
-def create_datetime(year, month, day, hour, min):
+def create_datetime(year, month, day, hour, minute):
     tz = pytz.timezone(settings.TIME_ZONE)
-    return tz.localize(datetime(year, month, day, hour, min)).astimezone(pytz.utc)
+    return tz.localize(datetime(year, month, day, hour, minute)).astimezone(tz)
 
 
 def create_browser():
-    browser = env('BROWSER', default="chrome")
-    if browser == "firefox":
-        options = webdriver.FirefoxOptions()
-        options.headless = True
-        driver = webdriver.Firefox(options=options)
-        driver.set_window_position(0, 0)
-        # Firefox is pissy about out of bounds otherwise
-        driver.set_window_size(3840, 2160)
-    else:
-        options = webdriver.ChromeOptions()
-        options.add_argument("--window-size=1920,1080")
-        options.add_argument("--headless")
-        if settings.CI:
-            options.add_argument("--no-sandbox")
-        driver = webdriver.Chrome(options=options)
+    options = webdriver.ChromeOptions()
+    options.add_argument("--window-size=1920,1080")
+    options.add_argument("--headless")
+    if settings.CI:
+        options.add_argument("--no-sandbox")
+    driver = webdriver.Chrome(options=options)
     return driver
 
 
@@ -60,6 +52,7 @@ class AutoLoginTest(BaseTest):
         login_page.login("EventTest", "EventTestPassword")
 
 
+# FIXME Refactor as a pytest fixture
 def screenshot_failure(func):
     def wrapper_func(self, *args, **kwargs):
         try:
@@ -83,5 +76,30 @@ def screenshot_failure_cls(cls):
     return cls
 
 
-def assert_times_equal(first_time, second_time):
+def assert_times_almost_equal(first_time, second_time):
     assert first_time.replace(microsecond=0, second=0) == second_time.replace(microsecond=0, second=0)
+
+
+def assert_oembed(alt_event_embed_url, alt_oembed_url, client, event_embed_url, event_url, oembed_url):
+    # Test the meta tag is in place
+    response = client.get(event_url, follow=True, HTTP_HOST='example.com')
+    assertContains(response, 'application/json+oembed')
+    assertContains(response, oembed_url)
+    # Test that the JSON exists
+    response = client.get(oembed_url, follow=True, HTTP_HOST='example.com')
+    assert response.status_code == 200
+    assertContains(response, event_embed_url)
+    # Should also work for non-existant events
+    response = client.get(alt_oembed_url, follow=True, HTTP_HOST='example.com')
+    assert response.status_code == 200
+    assertContains(response, alt_event_embed_url)
+
+
+def login(client, django_user_model):
+    pwd = 'testuser'
+    usr = 'TestUser'
+    user = django_user_model.objects.create_user(username=usr, email="TestUser@test.com", password=pwd,
+                                                 is_superuser=True,
+                                                 is_active=True, is_staff=True)
+    assert client.login(username=usr, password=pwd)
+    return user