diff --git a/.travis.yml b/.travis.yml index f7277c6..648496d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -29,7 +29,9 @@ services: addons: # https://docs.travis-ci.com/user/firefox/ # https://muffinresearch.co.uk/using-the-latest-version-of-firefox-in-travis-ci/ - firefox: latest + firefox: 47.0.1 + # TODO(jdanek): Investigate https://travis-ci.org/jdanekrh/dispatch-console-tests/jobs/150479482 + # firefox: latest apt: sources: # http://blog.500tech.com/setting-up-travis-ci-to-run-tests-on-latest-google-chrome-version/ @@ -46,10 +48,10 @@ env: before_install: # https://docs.travis-ci.com/user/docker/ - - docker pull jdanekrh/dispatch-console:4-90415a - - docker pull jdanekrh/dispatch-router:4-90415a - - docker run -d -p 127.0.0.1:8080:8080 jdanekrh/dispatch-console:4-90415a - - docker run -d -p 127.0.0.1:5673:5673 jdanekrh/dispatch-router:4-90415a + - docker pull jdanekrh/dispatch-console:6-ae1223 + - docker pull jdanekrh/dispatch-router:6-ae1223 + - docker run -d -p 127.0.0.1:8080:8080 jdanekrh/dispatch-console:6-ae1223 + - docker run -d -p 127.0.0.1:5673:5673 jdanekrh/dispatch-router:6-ae1223 - docker ps -a # https://github.com/vadesecure/test-automation-framework/blob/66c29c58cdc219c9fe9bd702a7d1784c34b913ce/.travis.yml - export CHROMEDRIVER_VERSION=`curl -s http://chromedriver.storage.googleapis.com/LATEST_RELEASE` diff --git a/webdriver/test_connect_page.py b/webdriver/test_connect_page.py index 3ced13d..b7d7a4a 100644 --- a/webdriver/test_connect_page.py +++ b/webdriver/test_connect_page.py @@ -64,22 +64,16 @@ def setup(self, base_url: str, console_ip: str, selenium: webdriver.Remote): return self @pytest.mark.nondestructive - @pytest.mark.reproduces(issue='DISPATCH-433') + @pytest.mark.verifies(issue='DISPATCH-433') def test_open_connect_page(self): self.test_name = 'test_open_connect_page' self.do_test_open_connect_page() - # BUG: the connect button in the bar is not highlighted - with pytest.raises(TimeoutException): - ConnectPage.wait(self.selenium) + ConnectPage.wait(self.selenium) self.take_screenshot("10") - if self.selenium.capabilities['browserName'] == 'firefox': - # BUG: when reloaded, the page is empty below the bar - with pytest.raises(TimeoutException): - self.do_test_open_connect_page() - else: - self.do_test_open_connect_page() + # check that when reloaded, the page is not empty below the bar + self.do_test_open_connect_page() self.take_screenshot("20") def do_test_open_connect_page(self): diff --git a/webdriver/test_hawtio_logs_page.py b/webdriver/test_hawtio_logs_page.py index 9e5177d..61d227b 100644 --- a/webdriver/test_hawtio_logs_page.py +++ b/webdriver/test_hawtio_logs_page.py @@ -25,4 +25,4 @@ def test_open_hawtio_logs_page(self): LogsPage.wait(self.selenium) self.take_screenshot("10") # TODO: check it is not just empty page with toolbar - self.then_no_js_error() \ No newline at end of file + self.then_no_js_error() diff --git a/webdriver/test_overview_page.py b/webdriver/test_overview_page.py index 591a992..79e5445 100644 --- a/webdriver/test_overview_page.py +++ b/webdriver/test_overview_page.py @@ -75,8 +75,7 @@ def is_expanded(self, node: WebElement): def given_overview_page(self): connect = ConnectPage.open(self.base_url, self.selenium) connect.wait_for_frameworks() - # TODO: this is a bug in console, enable when DISPATCH-433 fixed - # ConnectPage.wait(self.selenium) + ConnectPage.wait(self.selenium) connect.wait_for_frameworks() connect.connect_to(self.console_ip)