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.

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

Update to Console version 5-242972 #11

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 7 additions & 5 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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/
Expand All @@ -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:5-242972
- docker pull jdanekrh/dispatch-router:5-242972
- docker run -d -p 127.0.0.1:8080:8080 jdanekrh/dispatch-console:5-242972
- docker run -d -p 127.0.0.1:5673:5673 jdanekrh/dispatch-router:5-242972
- 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`
Expand Down
15 changes: 5 additions & 10 deletions webdriver/test_connect_page.py
Original file line number Diff line number Diff line change
Expand Up @@ -64,22 +64,17 @@ 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)
# the connect button in the bar is highlighted
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()
# 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):
Expand Down
7 changes: 3 additions & 4 deletions webdriver/test_hawtio_logs_page.py
Original file line number Diff line number Diff line change
Expand Up @@ -16,13 +16,12 @@ 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_hawtio_logs_page(self):
self.test_name = 'test_open_hawtio_logs_page'
bookmark = '{}/logs'.format(self.base_url)
self.selenium.get(bookmark)
with pytest.raises(TimeoutException):
LogsPage.wait(self.selenium)
LogsPage.wait(self.selenium)
self.take_screenshot("10")
# TODO: check it is not just empty page with toolbar
self.then_no_js_error()
self.then_no_js_error()