From 2d62e3e7f7ccb6828d7cd3a5dd4d7de07fd40eda Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Niklas=20Laxstr=C3=B6m?= <niklas.laxstrom@gmail.com>
Date: Tue, 17 Sep 2013 14:37:34 -0700
Subject: [PATCH] Simplify test code

Change-Id: I65c3edc85ee8619c7e77cca7622e7025799bdcad
---
 tests/browser/features/font_selection.feature      |  1 -
 .../features/step_definitions/panel_steps.rb       | 14 +++++++-------
 tests/browser/features/support/pages/panel_page.rb |  1 +
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/tests/browser/features/font_selection.feature b/tests/browser/features/font_selection.feature
index c1a08990..024503d2 100644
--- a/tests/browser/features/font_selection.feature
+++ b/tests/browser/features/font_selection.feature
@@ -12,7 +12,6 @@ Feature: Font selection
   Background:
     Given I am logged in
       And I set "German" as the interface language
-      And the content language is "English"
       And I inspect current fonts
 
   Scenario: Font selector appears
diff --git a/tests/browser/features/step_definitions/panel_steps.rb b/tests/browser/features/step_definitions/panel_steps.rb
index d4b7cf05..07627e90 100644
--- a/tests/browser/features/step_definitions/panel_steps.rb
+++ b/tests/browser/features/step_definitions/panel_steps.rb
@@ -33,15 +33,15 @@ When(/^I open "(.*?)" panel of language settings$/) do |panel|
 	end
 end
 
-When(/^I select "(.*?)" font for the (.*?) language for the live preview$/) do |font,type|
-	if type == 'interface'
-		type = 'ui'
-	end
-	Selenium::WebDriver::Support::Select.new(
-		@browser.driver.find_element(:id, "#{type}-font-selector")
-	).select_by(:text, font)
+When(/^I select "(.*?)" font for the interface language for the live preview$/) do |font|
+	on(ULSPage).select_font_for_interface = font
 end
 
+When(/^I select "(.*?)" font for the content language for the live preview$/) do |font|
+	on(ULSPage).select_font_for_content = font
+end
+
+
 When(/^I close the panel to discard the changes$/) do
 	on(ULSPage) do |page|
 		page.panel_button_close_element.click
diff --git a/tests/browser/features/support/pages/panel_page.rb b/tests/browser/features/support/pages/panel_page.rb
index 0eb3b460..6d5ecd07 100644
--- a/tests/browser/features/support/pages/panel_page.rb
+++ b/tests/browser/features/support/pages/panel_page.rb
@@ -31,4 +31,5 @@ class ULSPage
 	a(:trigger_personal, class: 'uls-trigger')
 
 	select(:select_font_for_interface, id: 'ui-font-selector')
+	select(:select_font_for_content, id: 'content-font-selector')
 end