jenkins-bot has submitted this change and it was merged. Change subject: Refactor timeline browsertests ......................................................................
Refactor timeline browsertests - Applied the Given-When-Then rule - Added separate accessors for disabled arrow elements Bug: T146276 Change-Id: I0278ef607f96851ed69e7373b952f5d02139cb0c --- M tests/browser/features/support/pages/diff_page.rb M tests/browser/features/support/step_definitions/timeline.rb M tests/browser/features/timeline.feature 3 files changed, 14 insertions(+), 20 deletions(-) Approvals: WMDE-Fisch: Looks good to me, approved jenkins-bot: Verified diff --git a/tests/browser/features/support/pages/diff_page.rb b/tests/browser/features/support/pages/diff_page.rb index b483c2f..6fb52b7 100644 --- a/tests/browser/features/support/pages/diff_page.rb +++ b/tests/browser/features/support/pages/diff_page.rb @@ -14,8 +14,11 @@ a(:revisionslider_help_close_start, css: '.revisionslider-help-close-start > a') a(:revisionslider_help_close_end, css: '.revisionslider-help-close-end > a') - div(:revisionslider_timeline_backwards, css: '.mw-revslider-arrow.mw-revslider-arrow-backwards') - div(:revisionslider_timeline_forwards, css: '.mw-revslider-arrow.mw-revslider-arrow-forwards') + div(:revisionslider_timeline_backwards, css: '.mw-revslider-arrow.mw-revslider-arrow-backwards:not(.oo-ui-widget-disabled)') + div(:revisionslider_timeline_forwards, css: '.mw-revslider-arrow.mw-revslider-arrow-forwards:not(.oo-ui-widget-disabled)') + + div(:revisionslider_timeline_backwards_disabled, css: '.mw-revslider-arrow.mw-revslider-arrow-backwards.oo-ui-widget-disabled') + div(:revisionslider_timeline_forwards_disabled, css: '.mw-revslider-arrow.mw-revslider-arrow-forwards.oo-ui-widget-disabled') div(:revisionslider_pointer_lower, css: '.mw-revslider-pointer-lower') div(:revisionslider_pointer_upper, css: '.mw-revslider-pointer-upper') diff --git a/tests/browser/features/support/step_definitions/timeline.rb b/tests/browser/features/support/step_definitions/timeline.rb index 2873a9c..c334de2 100644 --- a/tests/browser/features/support/step_definitions/timeline.rb +++ b/tests/browser/features/support/step_definitions/timeline.rb @@ -1,17 +1,17 @@ Then(/^The forward arrow should be disabled/) do - expect(on(DiffPage).revisionslider_timeline_forwards_element.class_name).to match 'oo-ui-widget-disabled' + expect(on(DiffPage).revisionslider_timeline_forwards_disabled_element).to be_visible end Then(/^The backward arrow should be disabled/) do - expect(on(DiffPage).revisionslider_timeline_backwards_element.class_name).to match 'oo-ui-widget-disabled' + expect(on(DiffPage).revisionslider_timeline_backwards_disabled_element).to be_visible end Then(/^The forward arrow should be enabled/) do - expect(on(DiffPage).revisionslider_timeline_forwards_element.class_name).not_to match 'oo-ui-widget-disabled' + expect(on(DiffPage).revisionslider_timeline_forwards_element).to be_visible end Then(/^The backward arrow should be enabled/) do - expect(on(DiffPage).revisionslider_timeline_backwards_element.class_name).not_to match 'oo-ui-widget-disabled' + expect(on(DiffPage).revisionslider_timeline_backwards_element).to be_visible end Given(/^I click on the forward arrow$/) do @@ -20,4 +20,4 @@ Given(/^I click on the backward arrow$/) do on(DiffPage).revisionslider_timeline_backwards_element.when_visible.click -end \ No newline at end of file +end diff --git a/tests/browser/features/timeline.feature b/tests/browser/features/timeline.feature index 94df85b..16f8f9a 100644 --- a/tests/browser/features/timeline.feature +++ b/tests/browser/features/timeline.feature @@ -8,9 +8,7 @@ Scenario: RevisionSlider timeline arrows to be disabled with 3 revisions Given a page with 3 revision(s) exists And I am on the diff page - And I click on the expand button - And The RevisionSlider has loaded - And I have dismissed the help dialog + When I have loaded the RevisionSlider and dismissed the help dialog Then The backward arrow should be disabled And The forward arrow should be disabled @@ -18,15 +16,8 @@ Given a page with 30 revision(s) exists And The window size is 800 by 600 And I am on the diff page - And I click on the expand button - And The RevisionSlider has loaded - And I have dismissed the help dialog - And The help dialog is hidden + When I have loaded the RevisionSlider and dismissed the help dialog + And I click on the backward arrow + And I click on the forward arrow Then The backward arrow should be enabled And The forward arrow should be disabled - Given I click on the backward arrow - Then The backward arrow should be disabled - And The forward arrow should be enabled - Given I click on the forward arrow - Then The backward arrow should be enabled - And The forward arrow should be disabled \ No newline at end of file -- To view, visit https://gerrit.wikimedia.org/r/315476 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I0278ef607f96851ed69e7373b952f5d02139cb0c Gerrit-PatchSet: 7 Gerrit-Project: mediawiki/extensions/RevisionSlider Gerrit-Branch: master Gerrit-Owner: Tobias Gritschacher <tobias.gritschac...@wikimedia.de> Gerrit-Reviewer: Addshore <addshorew...@gmail.com> Gerrit-Reviewer: Tobias Gritschacher <tobias.gritschac...@wikimedia.de> Gerrit-Reviewer: WMDE-Fisch <christoph.jau...@wikimedia.de> Gerrit-Reviewer: jenkins-bot <> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits