Skip to content

Commit

Permalink
Scottx611x/run selenium on travis only (#1650)
Browse files Browse the repository at this point in the history
* Run selenium-based tests on Travis only

* Call parent classes `setUp()`

* Move pyvirtualdisplay creation into `setUp()` and stop said display in `tearDown()`

* Skip selenium tests if not using production settings

* Lower resolution of pyvirtual display

* Remove skipping functionality and update wiki instructions instead
  • Loading branch information
scottx611x committed Apr 3, 2017
1 parent 24ec5d5 commit 2660dca
Showing 1 changed file with 10 additions and 7 deletions.
17 changes: 10 additions & 7 deletions refinery/selenium_testing/tests.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
from django.contrib.auth.models import User
from django.contrib.staticfiles.testing import StaticLiveServerTestCase

from pyvirtualdisplay import Display
from selenium import webdriver

Expand All @@ -9,13 +10,10 @@

from factory_boy.utils import make_analyses_with_single_dataset, make_datasets
from selenium_testing.utils import (
assert_body_text, login, wait_until_id_clickable, MAX_WAIT,
assert_text_within_id, delete_from_ui, wait_until_class_visible,
wait_until_id_visible)

# Start a pyvirtualdisplay for geckodriver to interact with
display = Display(visible=0, size=(1900, 1080))
display.start()
assert_body_text, assert_text_within_id, delete_from_ui, login,
MAX_WAIT, wait_until_class_visible, wait_until_id_clickable,
wait_until_id_visible
)


class SeleniumTestBase(StaticLiveServerTestCase):
Expand All @@ -26,6 +24,10 @@ class SeleniumTestBase(StaticLiveServerTestCase):

def setUp(self, site_login=True, initialize_guest=True,
public_group_needed=True):

# Start a pyvirtualdisplay for geckodriver to interact with
self.display = Display(visible=0, size=(1366, 768))
self.display.start()
self.browser = webdriver.Firefox()
self.browser.maximize_window()

Expand All @@ -42,6 +44,7 @@ def setUp(self, site_login=True, initialize_guest=True,

def tearDown(self):
self.browser.quit()
self.display.stop()

class Meta:
abstract = True
Expand Down

0 comments on commit 2660dca

Please sign in to comment.