diff --git a/tests/browser/environments.yml b/tests/browser/environments.yml index 4e84d0ad..0a27a828 100644 --- a/tests/browser/environments.yml +++ b/tests/browser/environments.yml @@ -15,8 +15,12 @@ # bundle exec cucumber # mw-vagrant-host: &default - mediawiki_url: http://127.0.0.1:8080/wiki/ + mediawiki_url: http://en.mediawiki.localhost/index.php/ + mediawiki_api_url: http://en.mediawiki.localhost/api.php user_factory: true + mediawiki_user: Tester + mediawiki_password: test + mw-vagrant-guest: mediawiki_url: http://127.0.0.1/wiki/ @@ -27,4 +31,4 @@ integration: user_factory: true # mediawiki_url: THIS WILL BE SET BY JENKINS -default: *default \ No newline at end of file +default: *default diff --git a/tests/browser/features/history.feature b/tests/browser/features/history.feature index a11c0db3..e0afec3a 100644 --- a/tests/browser/features/history.feature +++ b/tests/browser/features/history.feature @@ -3,24 +3,22 @@ Feature: RevisionSlider history Background: Given a page with 4 revision(s) exists -# Deactivated until bar clicking will be reintroduced see T165831 -# -# Scenario: RevisionSlider history can be accessed using browser back and forward buttons after clicking on a revision -# When I have loaded the RevisionSlider and dismissed the help dialog -# And I click on revision 1 to move the older pointer -# And I wait until the diff has loaded -# And I click on revision 2 to move the newer pointer -# And I wait until the diff has loaded -# And I click the browser back button -# And I wait until the diff has loaded -# And I click the browser back button -# And I wait until the diff has loaded -# And I click the browser forward button -# And I wait until the diff has loaded -# Then the older pointer should be on revision 1 -# And the newer pointer should be on revision 4 -# And revision 1 should be loaded on the left of the diff -# And revision 4 should be loaded on the right of the diff + Scenario: RevisionSlider history can be accessed using browser back and forward buttons after clicking on a revision + When I have loaded the RevisionSlider and dismissed the help dialog + And I click on revision 1 to move the older pointer + And I wait until the diff has loaded + And I click on revision 2 to move the newer pointer + And I wait until the diff has loaded + And I click the browser back button + And I wait until the diff has loaded + And I click the browser back button + And I wait until the diff has loaded + And I click the browser forward button + And I wait until the diff has loaded + Then the older pointer should be on revision 1 + And the newer pointer should be on revision 4 + And revision 1 should be loaded on the left of the diff + And revision 4 should be loaded on the right of the diff Scenario: RevisionSlider history can be accessed using browser back and forward buttons after dragging to a revision When I have loaded the RevisionSlider and dismissed the help dialog