Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Scottx611x/run selenium on travis only #1650

Merged
merged 7 commits into from
Apr 3, 2017
Merged

Scottx611x/run selenium on travis only #1650

Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
d7dce57
Run selenium-based tests on Travis only
scottx611x Mar 27, 2017
8d53273
Call parent classes `setUp()`
scottx611x Mar 27, 2017
6a1aa81
Move pyvirtualdisplay creation into `setUp()` and stop said display i…
scottx611x Mar 30, 2017
112ba2e
Skip selenium tests if not using production settings
scottx611x Mar 30, 2017
c733de5
Merge branch 'scottx611x/run_selenium_on_travis_only' of https://gith…
scottx611x Mar 30, 2017
054dfa6
Lower resolution of pyvirtual display
scottx611x Apr 3, 2017
9852c5c
Remove skipping functionality and update wiki instructions instead
scottx611x Apr 3, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
17 changes: 10 additions & 7 deletions refinery/selenium_testing/tests.py
View file
Open in desktop
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