From 22bdbd5927dd3fbf8aeddaa1eaedbe966633242f Mon Sep 17 00:00:00 2001
From: Sebastian Vetter <sebastian@roadsi.de>
Date: Wed, 13 Aug 2014 10:24:49 +1000
Subject: [PATCH] Set bigger screen size for headless browser

---
 .travis.yml                  | 2 +-
 fancypages/test/testcases.py | 6 +-----
 tests/browser/test_editor.py | 4 ++++
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index ecdb426..90cfb6f 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -38,7 +38,7 @@ env:
 
 before_install:
   - "export DISPLAY=:99.0"
-  - "sh -e /etc/init.d/xvfb start"
+  - "/sbin/start-stop-daemon --start --quiet --pidfile /tmp/custom_xvfb_99.pid --make-pidfile --background --exec /usr/bin/Xvfb -- :99 -ac -screen 0 1280x1024x16"
 
 install:
   - pip install $PIP_OPTS wheel setuptools -U
diff --git a/fancypages/test/testcases.py b/fancypages/test/testcases.py
index 69c98ea..20d3a03 100644
--- a/fancypages/test/testcases.py
+++ b/fancypages/test/testcases.py
@@ -102,15 +102,11 @@ class SplinterTestCase(LiveServerTestCase):
     is_staff = False
     is_logged_in = True
 
-    def get_local_browser(self):
-        return Browser(SPLINTER_WEBDRIVER)
-
     def setUp(self):
         super(SplinterTestCase, self).setUp()
         self.user = None
         self.base_url = URL(self.live_server_url)
-
-        self.browser = self.get_local_browser()
+        self.browser = Browser(SPLINTER_WEBDRIVER)
 
         if self.is_anonymous and not self.is_staff:
             return
diff --git a/tests/browser/test_editor.py b/tests/browser/test_editor.py
index f4d9e8d..0963c7b 100644
--- a/tests/browser/test_editor.py
+++ b/tests/browser/test_editor.py
@@ -219,10 +219,14 @@ def test_can_be_added_with_new_image_and_link(self):
         self.find_and_click_by_css(self.browser, '.edit-button')
         self.wait_for_editor_reload()
 
+        self.browser.is_element_present_by_css('iframe')
+
         self.find_and_click_by_css(
             self.browser, 'a[data-behaviours=load-asset-modal]')
         self.wait_for_editor_reload()
 
+        self.browser.is_element_present_by_css('iframe')
+
         with self.browser.get_iframe(0) as iframe:
             self.wait_for_editor_reload()
             self.find_and_click_by_css(