From 66ec83c32394033ce5503197a11e696a3886108b Mon Sep 17 00:00:00 2001
From: Martin Edenhofer <me@edenhofer.de>
Date: Tue, 9 Feb 2016 21:02:57 +0100
Subject: [PATCH] Fixed language selection (new widget).

---
 test/browser/prefereces_test.rb  |  6 +++---
 test/browser/setting_test.rb     |  2 +-
 test/browser/translation_test.rb |  6 +++---
 test/browser_test_helper.rb      | 15 +++++++++++++++
 4 files changed, 22 insertions(+), 7 deletions(-)

diff --git a/test/browser/prefereces_test.rb b/test/browser/prefereces_test.rb
index 1c187f7a0..8ea3d87ad 100644
--- a/test/browser/prefereces_test.rb
+++ b/test/browser/prefereces_test.rb
@@ -46,7 +46,7 @@ class PreferencesTest < TestCase
     click( css: 'a[href="#profile"]' )
     click( css: 'a[href="#profile/language"]' )
     select(
-      css: '.language_item select[name="locale"]',
+      css: '.language_item [name="locale"]',
       value: 'Deutsch',
     )
     click( css: '.content button[type="submit"]' )
@@ -159,7 +159,7 @@ class PreferencesTest < TestCase
     click( css: 'a[href="#profile"]' )
     click( css: 'a[href="#profile/language"]' )
     select(
-      css: '.language_item select[name="locale"]',
+      css: '.language_item [name="locale"]',
       value: 'English (United States)',
     )
     click( css: '.content button[type="submit"]' )
@@ -275,7 +275,7 @@ class PreferencesTest < TestCase
     click( css: 'a[href="#profile/language"]' )
     sleep 4
     select(
-      css: '.language_item select[name="locale"]',
+      css: '.language_item [name="locale"]',
       value: 'Deutsch',
     )
     click( css: '.content button[type="submit"]' )
diff --git a/test/browser/setting_test.rb b/test/browser/setting_test.rb
index ccfc9da61..6338da35c 100644
--- a/test/browser/setting_test.rb
+++ b/test/browser/setting_test.rb
@@ -16,7 +16,7 @@ class SettingTest < TestCase
     click( css: 'a[href="#profile"]' )
     click( css: 'a[href="#profile/language"]' )
     select(
-      css: '.language_item select[name="locale"]',
+      css: '.language_item [name="locale"]',
       value: 'English (United States)',
     )
     click( css: '.content button[type="submit"]' )
diff --git a/test/browser/translation_test.rb b/test/browser/translation_test.rb
index 02375209a..fed45ef87 100644
--- a/test/browser/translation_test.rb
+++ b/test/browser/translation_test.rb
@@ -15,7 +15,7 @@ class TranslationTest < TestCase
     click(css: 'a[href="#profile"]')
     click(css: 'a[href="#profile/language"]')
     select(
-      css: '.language_item select[name="locale"]',
+      css: '.language_item [name="locale"]',
       value: 'English (United States)',
     )
     click(css: '.content button[type="submit"]')
@@ -37,7 +37,7 @@ class TranslationTest < TestCase
     click(css: 'a[href="#profile"]')
     click(css: 'a[href="#profile/language"]')
     select(
-      css: '.language_item select[name="locale"]',
+      css: '.language_item [name="locale"]',
       value: 'Deutsch',
     )
     click(css: '.content button[type="submit"]')
@@ -180,7 +180,7 @@ class TranslationTest < TestCase
     click(css: 'a[href="#profile"]')
     click(css: 'a[href="#profile/language"]')
     select(
-      css: '.language_item select[name="locale"]',
+      css: '.language_item [name="locale"]',
       value: 'English (United States)',
     )
     click(css: '.content button[type="submit"]')
diff --git a/test/browser_test_helper.rb b/test/browser_test_helper.rb
index 1b2915548..7b14eae82 100644
--- a/test/browser_test_helper.rb
+++ b/test/browser_test_helper.rb
@@ -514,6 +514,21 @@ class TestCase < Test::Unit::TestCase
 
     instance = params[:browser] || @browser
 
+    # searchable select
+    element = instance.find_elements({ css: "#{params[:css]}.js-shadow" })[0]
+    if element
+      element = instance.find_elements({ css: "#{params[:css]}.js-shadow + .js-input" })[0]
+      element.click
+      element.clear
+      sleep 1
+      element.send_keys(params[:value])
+      sleep 0.5
+      element.send_keys(:enter)
+      sleep 0.5
+      return
+    end
+
+    # native select
     begin
       element  = instance.find_elements({ css: params[:css] })[0]
       dropdown = Selenium::WebDriver::Support::Select.new(element)