jenkins-bot has submitted this change and it was merged. Change subject: Fix and enable feature Persistent settings ......................................................................
Fix and enable feature Persistent settings * Reuse existing steps where possible * Rename steps file to match convention * Moved unrelated steps to a new file * Added wait for saving https://mingle.corp.wikimedia.org/projects/internationalization/cards/3822 Bug: 56885 Change-Id: I480058430696579947187265b940ea46156f1519 --- M tests/browser/features/persistent_settings.feature M tests/browser/features/step_definitions/panel_steps.rb A tests/browser/features/step_definitions/persistent_settings_steps.rb R tests/browser/features/support/pages/live_preview_of_display_language_steps.rb 4 files changed, 20 insertions(+), 27 deletions(-) Approvals: KartikMistry: Looks good to me, approved jenkins-bot: Verified diff --git a/tests/browser/features/persistent_settings.feature b/tests/browser/features/persistent_settings.feature index ba1fa2d..54dd2c7 100644 --- a/tests/browser/features/persistent_settings.feature +++ b/tests/browser/features/persistent_settings.feature @@ -1,23 +1,22 @@ -@login @reset-preferences-after [email protected] @login @reset-preferences-after Feature: Persistent settings This assumes wiki content language is English. Background: Given I am logged in - And I set interface language that is different from content language and has a font + And I set "German" as the interface language + And I open the Universal Language Selector + And I open Display panel of language settings + And I open Fonts panel of language settings + And I select OpenDyslexic font for the interface language for the live preview Scenario: Interface font sticks to another page - When I open "Fonts" panel of language settings - And I select a font for the interface language - And I apply the changes + When I apply the changes And I visit a random page - And I open "Fonts" panel of language settings - Then the selected interface font must be what I previously selected + Then the selected interface font must be OpenDyslexic Scenario: Discarding a live preview of a font keeps the previous font - When I open "Fonts" panel of language settings - And I select a font for the interface language - And I close the panel to discard the changes + When I close the panel to discard the changes And I visit a random page - Then the selected interface font must be "system" + Then the selected interface font must be Systemschriftart diff --git a/tests/browser/features/step_definitions/panel_steps.rb b/tests/browser/features/step_definitions/panel_steps.rb index 9bde273..156aa8d 100644 --- a/tests/browser/features/step_definitions/panel_steps.rb +++ b/tests/browser/features/step_definitions/panel_steps.rb @@ -31,7 +31,10 @@ end When(/^I apply the changes$/) do - on(PanelPage).panel_button_apply_element.click + on(PanelPage) do |page| + page.panel_button_apply_element.click + page.language_settings_dialog_element.wait_while_present + end end Then(/^I can disable input methods$/) do diff --git a/tests/browser/features/step_definitions/persistent_settings_steps.rb b/tests/browser/features/step_definitions/persistent_settings_steps.rb new file mode 100644 index 0000000..bc3e3e2 --- /dev/null +++ b/tests/browser/features/step_definitions/persistent_settings_steps.rb @@ -0,0 +1,6 @@ +Then(/^the selected interface font must be (.*?)$/) do |font| + step 'I open the Universal Language Selector' + step 'I open Display panel of language settings' + step 'I open Fonts panel of language settings' + on(PanelPage).font_for_interface.should == font +end diff --git a/tests/browser/features/step_definitions/persistent_steps.rb b/tests/browser/features/support/pages/live_preview_of_display_language_steps.rb similarity index 61% rename from tests/browser/features/step_definitions/persistent_steps.rb rename to tests/browser/features/support/pages/live_preview_of_display_language_steps.rb index 74f01fd..53f869f 100644 --- a/tests/browser/features/step_definitions/persistent_steps.rb +++ b/tests/browser/features/support/pages/live_preview_of_display_language_steps.rb @@ -1,18 +1,3 @@ -Given(/^I set interface language that is different from content language and has a font$/) do - visit(PreferencesPage) do |page| - page.set_interface_language_element.select_value 'de' - page.save_element.click - end -end - -When(/^I select a font for the interface language$/) do - on(PanelPage).select_font_for_interface = 'OpenDyslexic' -end - -Then(/^the selected interface font must be what I previously selected$/) do - on(PanelPage).select_font_for_interface.should == 'OpenDyslexic' -end - When(/^I set English font to System$/) do on(PanelPage).select_font_for_content = 'System font' end -- To view, visit https://gerrit.wikimedia.org/r/96716 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I480058430696579947187265b940ea46156f1519 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/UniversalLanguageSelector Gerrit-Branch: master Gerrit-Owner: Nikerabbit <[email protected]> Gerrit-Reviewer: Amire80 <[email protected]> Gerrit-Reviewer: KartikMistry <[email protected]> Gerrit-Reviewer: Zfilipin <[email protected]> Gerrit-Reviewer: jenkins-bot _______________________________________________ MediaWiki-commits mailing list [email protected] https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
