diff --git a/.github/workflows/django.yml b/.github/workflows/django.yml index 1b289a10..ac31f7bf 100644 --- a/.github/workflows/django.yml +++ b/.github/workflows/django.yml @@ -12,7 +12,7 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - browser: ['chrome', 'firefox'] + browser: ['chrome'] env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} BROWSER: ${{ matrix.browser }} diff --git a/PyRIGS/tests/base.py b/PyRIGS/tests/base.py index 5cc5aaa6..1b56860a 100644 --- a/PyRIGS/tests/base.py +++ b/PyRIGS/tests/base.py @@ -19,11 +19,15 @@ def create_datetime(year, month, day, hour, min): return tz.localize(datetime(year, month, day, hour, min)).astimezone(pytz.utc) -def create_browser(browser): +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") @@ -37,7 +41,7 @@ def create_browser(browser): class BaseTest(LiveServerTestCase): def setUp(self): super().setUpClass() - self.driver = create_browser(env('BROWSER', default="chrome")) + self.driver = create_browser() self.wait = WebDriverWait(self.driver, 15) def tearDown(self): diff --git a/PyRIGS/tests/regions.py b/PyRIGS/tests/regions.py index 828b9492..25b06c4c 100644 --- a/PyRIGS/tests/regions.py +++ b/PyRIGS/tests/regions.py @@ -75,7 +75,7 @@ class BootstrapSelectElement(Region): self.open() search_box.clear() search_box.send_keys(query) - self.wait.until(expected_conditions.invisibility_of_element_located(*self._status_locator)) + self.wait.until(expected_conditions.invisibility_of_element_located(self._status_locator)) @property def options(self):