summaryrefslogtreecommitdiffstats
path: root/cucumber/features
diff options
context:
space:
mode:
authorPhilip Hands <phil@hands.com>2016-10-11 23:14:39 +0200
committerHolger Levsen <holger@layer-acht.org>2016-10-12 12:21:05 +0200
commit3769320be4aea15ae5f9b0c470deea67cb65e09d (patch)
tree8f9e7fc8fc893178f92dfdc869c15e01259c663e /cucumber/features
parent110b3e905312d6f94160c30d33b166ba4831d7ac (diff)
downloadjenkins.debian.net-3769320be4aea15ae5f9b0c470deea67cb65e09d.tar.xz
work around being offered American English after selecting UK
Signed-off-by: Holger Levsen <holger@layer-acht.org>
Diffstat (limited to 'cucumber/features')
-rw-r--r--cucumber/features/images/d-i_gui_AmericanEnglish.pngbin0 -> 4430 bytes
-rw-r--r--cucumber/features/step_definitions/common_steps.rb3
2 files changed, 2 insertions, 1 deletions
diff --git a/cucumber/features/images/d-i_gui_AmericanEnglish.png b/cucumber/features/images/d-i_gui_AmericanEnglish.png
new file mode 100644
index 00000000..a8b3ea0b
--- /dev/null
+++ b/cucumber/features/images/d-i_gui_AmericanEnglish.png
Binary files differ
diff --git a/cucumber/features/step_definitions/common_steps.rb b/cucumber/features/step_definitions/common_steps.rb
index 8b06c832..05cd7a9e 100644
--- a/cucumber/features/step_definitions/common_steps.rb
+++ b/cucumber/features/step_definitions/common_steps.rb
@@ -300,7 +300,8 @@ Given /^I select British English$/ do
@screen.wait(diui_png("UnitedKingdom"), 10 * PATIENCE)
@screen.type(Sikuli::Key.ENTER)
@screen.click_point(@screen.w-2, @screen.h*2/3)
- @screen.wait(diui_png("BritishEnglish"), 10 * PATIENCE)
+ # FIXME -- we're accepting AmmericanEnglish here, despite the fact it should be BritishEnglish due to the above -- looks like a D-I bug to me
+ on_screen, _ = @screen.waitAny([diui_png("BritishEnglish"),diui_png("AmericanEnglish")], 10 * PATIENCE)
@screen.type(Sikuli::Key.ENTER)
end