From cdb21c9c499d110f8c1a59470e69990b3e3a1f82 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Niklas=20Laxstr=C3=B6m?= Date: Wed, 4 Dec 2013 11:59:43 +0200 Subject: [PATCH] Refactor two live preview scenarios Change-Id: I8e0dc62e24f9f86232af6b68dc4809e858aa2367 --- .../live_preview_of_display_language.feature | 12 ++++++++---- .../step_definitions/cog_sidebar_user_steps.rb | 8 -------- .../features/step_definitions/common_steps.rb | 8 ++++++++ tests/browser/features/support/pages/panel_page.rb | 1 - 4 files changed, 16 insertions(+), 13 deletions(-) diff --git a/tests/browser/features/live_preview_of_display_language.feature b/tests/browser/features/live_preview_of_display_language.feature index cc971004..b20244a3 100644 --- a/tests/browser/features/live_preview_of_display_language.feature +++ b/tests/browser/features/live_preview_of_display_language.feature @@ -14,18 +14,22 @@ Feature: Live preview of display language changes And I click on the link to select Malayalam Then I should see the text in the language panel in Malayalam + @commons.wikimedia.beta.wmflabs.org Scenario: Live preview of display language changes can be reverted on cancel - Given I open "Language" panel of language settings + 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 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 + @commons.wikimedia.beta.wmflabs.org Scenario: Live preview of display language changes can be reverted on closing the dialog with the X button - Given I open "Language" panel of language settings + 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 When I click X - 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: Live preview of display language changes can be reverted on closing the dialog on cancel from a different section diff --git a/tests/browser/features/step_definitions/cog_sidebar_user_steps.rb b/tests/browser/features/step_definitions/cog_sidebar_user_steps.rb index 0e7ae9f8..39c11dac 100644 --- a/tests/browser/features/step_definitions/cog_sidebar_user_steps.rb +++ b/tests/browser/features/step_definitions/cog_sidebar_user_steps.rb @@ -27,20 +27,12 @@ Given(/^I navigate to the Language Settings panel$/) do step "I see the logged in language settings panel" end -When(/^I click Cancel$/) do - on(PanelPage).panel_button_cancel_element.click -end - When(/^I click the cog icon by Languages in the sidebar$/) do on(NoInterlanguagePage).cog_element.when_present.click # Wait for the panel to open on(PanelPage).panel_display_element.when_visible end -When(/^I click X$/) do - on(InterlanguagePage).x_element.click -end - Then(/^I can navigate back to Input Settings$/) do on(InterlanguagePage) do |page| page.back_to_input diff --git a/tests/browser/features/step_definitions/common_steps.rb b/tests/browser/features/step_definitions/common_steps.rb index 2daa5bdd..d5a85d9a 100644 --- a/tests/browser/features/step_definitions/common_steps.rb +++ b/tests/browser/features/step_definitions/common_steps.rb @@ -33,3 +33,11 @@ end When(/^in the language filter I type (.+)$/) do |language_abbreviation| on(IMEPage).language_filter = language_abbreviation end + +When(/^I click Cancel$/) do + on(PanelPage).panel_button_cancel_element.click +end + +When(/^I click X$/) do + on(InterlanguagePage).x_element.click +end diff --git a/tests/browser/features/support/pages/panel_page.rb b/tests/browser/features/support/pages/panel_page.rb index 12f9bbe0..bd0a3033 100644 --- a/tests/browser/features/support/pages/panel_page.rb +++ b/tests/browser/features/support/pages/panel_page.rb @@ -29,7 +29,6 @@ class PanelPage select_list(:panel_content_font_selector, id: "content-font-selector") select_list(:panel_interface_font_selector, id: "ui-font-selector") - # TODO: Rename to match convention button(:other_language_button, class: "button uls-language-button", index: 1) button(:default_language_button, css: ".uls-language-button.down")