From b0efed428caee58f52d7dd43f2bd54247dc37365 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Niklas=20Laxstr=C3=B6m?= Date: Wed, 4 Dec 2013 12:21:40 +0200 Subject: [PATCH 1/2] Refactor another live preview scenario But left it disabled because of bug 57967 Bug: 57967 Change-Id: I7b1543f526eac93c9a0200731a722332a7410b06 --- .../features/live_preview_of_display_language.feature | 11 +++++++---- tests/browser/features/settings_panel.feature | 2 +- .../browser/features/step_definitions/panel_steps.rb | 4 ++-- 3 files changed, 10 insertions(+), 7 deletions(-) diff --git a/tests/browser/features/live_preview_of_display_language.feature b/tests/browser/features/live_preview_of_display_language.feature index b20244a3..dc41aace 100644 --- a/tests/browser/features/live_preview_of_display_language.feature +++ b/tests/browser/features/live_preview_of_display_language.feature @@ -32,12 +32,15 @@ Feature: Live preview of display language changes And I open Display panel of language settings Then I should see the text in the language panel in English - Scenario: Live preview of display language changes can be reverted on closing the dialog on cancel from a different section - Given I open "Language" panel of language settings + # https://bugzilla.wikimedia.org/57967 + # @commons.wikimedia.beta.wmflabs.org + Scenario: Live preview of display language changes can be reverted on closing the dialog on cancel from a different panel + Given I open the Universal Language Selector + And I open Display panel of language settings And I select a language different than English for display language - And I switch to "Input" panel of language settings + And I switch to Input panel of language settings When I click Cancel - And I open "Language" panel of language settings + And I open Display panel of language settings Then I should see the text in the language panel in English Scenario: Font setting is reset after pressing "Cancel" diff --git a/tests/browser/features/settings_panel.feature b/tests/browser/features/settings_panel.feature index e2ff8fe7..aedb962b 100644 --- a/tests/browser/features/settings_panel.feature +++ b/tests/browser/features/settings_panel.feature @@ -46,7 +46,7 @@ Feature: Settings panel When I open "Language" panel of language settings And I click the button with the ellipsis And I use the panel to change my interface language to "German" - And I switch to "Input" panel of language settings + And I switch to Input panel of language settings And I click X And I open "Language" panel of language settings Then the panel is in English diff --git a/tests/browser/features/step_definitions/panel_steps.rb b/tests/browser/features/step_definitions/panel_steps.rb index 3c0433fa..84e576f9 100644 --- a/tests/browser/features/step_definitions/panel_steps.rb +++ b/tests/browser/features/step_definitions/panel_steps.rb @@ -68,8 +68,8 @@ Then(/^the panel is in English/) do on(PanelPage).panel_language_element.text.should == "Language" end -When(/^I switch to "Input" panel of language settings/) do - on(PanelPage).panel_input_element.when_visible.click +When(/^I switch to Input panel of language settings/) do + on(PanelPage).panel_side_input_element.click end Then(/^the language list of ULS should use Autonym font$/) do From 63af9387b2c209fa43714c1df21fc7cb13c837f1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Niklas=20Laxstr=C3=B6m?= Date: Wed, 4 Dec 2013 12:27:29 +0200 Subject: [PATCH 2/2] Removing font live preview test * This feature is named live preview of language * There are two scenarios in font selection feature that also test live preview * This test is actually making changes as well Change-Id: I799698e08fc3d922259692de7ae0bbf5cbfd0a33 --- .../features/live_preview_of_display_language.feature | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/tests/browser/features/live_preview_of_display_language.feature b/tests/browser/features/live_preview_of_display_language.feature index dc41aace..1c0b3396 100644 --- a/tests/browser/features/live_preview_of_display_language.feature +++ b/tests/browser/features/live_preview_of_display_language.feature @@ -42,13 +42,3 @@ Feature: Live preview of display language changes When I click Cancel And I open Display panel of language settings Then I should see the text in the language panel in English - - Scenario: Font setting is reset after pressing "Cancel" - Given I open "Fonts" panel of language settings - When I set English font to OpenDyslexic - And I apply the changes - And I open "Fonts" panel of language settings - And I set English font to System - And I click Cancel - When I open "Fonts" panel of language settings - Then the selected content font must be OpenDyslexic