frank-cucumber 0.8.8 → 0.8.10

data/frank-skeleton/frank_static_resources.bundle/index.haml

@@ -29,7 +29,7 @@
               %label(for="query") Selector
               %input#query(placeholder="label marked:'Search'")
               %button#flash_button Flash
-              %button#shelley_flash_button Flash using Shelley
+              %input#selector_engine(placeholder="uiquery")
           %td
             #refresh
               %img#loading(src="images/ajax-loader.gif")

data/frank-skeleton/frank_static_resources.bundle/index.html

@@ -29,7 +29,7 @@
               <label for='query'>Selector</label>
               <input id='query' placeholder="label marked:'Search'" />
               <button id='flash_button'>Flash</button>
-              <button id='shelley_flash_button'>Flash using Shelley</button>
+              <input id='selector_engine' placeholder='uiquery' />
             </div>
           </td>
           <td>

data/frank-skeleton/frank_static_resources.bundle/symbiote.js

@@ -380,10 +380,10 @@ $(document).ready(function() {
 
 
 
-  function sendFlashCommand( selector, use_shelley ) {
+  function sendFlashCommand( selector, engine ) {
     var command = {
-      query: selector,
-      selector_engine: use_shelley ? 'shelley_compat' : 'uiquery',
+	query: selector,
+	selector_engine: engine ? engine : 'uiquery' ,
       operation: {
         method_name: 'flash',
         arguments: []
@@ -482,13 +482,8 @@ $(document).ready(function() {
   });
 
   $('#flash_button').click( function(){
-    sendFlashCommand( $("input#query").val(), false );
+      sendFlashCommand( $("input#query").val(), $("input#selector_engine").val() );
   });
-
-  $('#shelley_flash_button').click( function(){
-    sendFlashCommand( $("input#query").val(), true );
-  });
-
   
   liveView = symbiote.LiveView( uiLocator.updateBackdrop, refreshViewHeirarchy );
 

data/lib/frank-cucumber/core_frank_steps.rb

@@ -130,6 +130,20 @@ When /^I fill in text fields as follows:$/ do |table|
   end
 end
 
+# simulate entering text from keyboard
+When /^I enter the text "([^\\"]*)" from keyboard to the textfield "([^\\"]*)"$/ do |text_to_type, text_field_mark| # !> ambiguous first argument; put parentheses or even spaces
+  selector = "view marked:'#{text_field_mark}' first"
+  if element_exists(selector)
+     touch( selector )
+  else
+     raise "Could not find [#{text_field_mark}], it does not exist."
+  end
+  text_field_selector =  "textField placeholder:'#{text_field_mark}'"
+  frankly_map( text_field_selector, 'becomeFirstResponder' )
+  frankly_map( text_field_selector, 'setText:', text_to_type )
+  frankly_map( text_field_selector, 'endEditing:', true )
+end
+
 # -- Rotate -- #
 Given /^the device is in (a )?landscape orientation$/ do |ignored|
   # for some reason the simulator sometimes starts of reporting its orientation as 'flat'. Workaround for this is to rotate the device then wait a bit
@@ -276,3 +290,7 @@ end
 When /^I quit the simulator/ do
   quit_simulator 
 end
+
+When /^I reset the simulator/ do
+  simulator_reset_data
+end

data/lib/frank-cucumber/frank_helper.rb

@@ -5,6 +5,8 @@ require 'frank-cucumber/frank_localize'
 module Frank module Cucumber
 
 module FrankHelper 
+  HOST = "localhost"
+  FRANK_PORT = 37265
 
   class << self
     # TODO: adding an ivar to the module itself is a big ugyl hack. We need a FrankDriver class, or similar
@@ -69,14 +71,12 @@ module FrankHelper
 
     res['results']
   end
-  
-  
-  def frankly_map( query, method_name, *method_args )
+
+  def frankly_engine_map( selector_engine, query, method_name, *method_args )
     operation_map = {
       :method_name => method_name,
       :arguments => method_args,
     }
-    selector_engine = Frank::Cucumber::FrankHelper.selector_engine || 'uiquery' # default to UIQuery for backwards compatibility
     res = post_to_uispec_server( 'map', :query => query, :operation => operation_map, :selector_engine => selector_engine )
     res = JSON.parse( res )
     if res['outcome'] != 'SUCCESS'
@@ -85,12 +85,29 @@ module FrankHelper
 
     res['results']
   end
+  
+  def frankly_map( query, method_name, *method_args )
+    selector_engine = Frank::Cucumber::FrankHelper.selector_engine || 'uiquery' # default to UIQuery for backwards compatibility
+    frankly_engine_map( selector_engine, query, method_name, *method_args )
+  end
 
   def frankly_dump
     res = get_to_uispec_server( 'dump' )
     puts JSON.pretty_generate(JSON.parse(res)) rescue puts res #dumping a super-deep DOM causes errors
   end
 
+  def frankly_screenshot(filename, subframe=nil, allwindows=true)
+    path = 'screenshot'
+    path += '/allwindows' if allwindows
+    path += "/frame/" + URI.escape(subframe) if (subframe != nil)
+
+    data = get_to_uispec_server( path )
+
+    open(filename, "wb") do |file|
+      file.write(data)
+    end
+  end
+
   def frankly_oriented_portrait?
     'portrait' == frankly_current_orientation
   end
@@ -173,8 +190,10 @@ module FrankHelper
     make_http_request( url, req )
   end
 
-  def frank_url_for( verb )
-    url = URI.parse "http://localhost:37265/"
+  def frank_url_for( verb , port=nil )
+    port ||= FRANK_PORT
+    
+    url = URI.parse "http://#{HOST}:#{port}/"
     url.path = '/'+verb
     url
   end
@@ -214,6 +233,17 @@ module FrankHelper
     APPLESCRIPT}
   end
 
+def simulator_reset_data
+  %x{osascript<<APPLESCRIPT
+activate application "iPhone Simulator"
+tell application "System Events"
+  click menu item 5 of menu 1 of menu bar item 2 of menu bar 1 of process "#{Localize.t(:iphone_simulator)}"
+  delay 0.5
+  click button 2 of window 1 of process "#{Localize.t(:iphone_simulator)}"
+end tell
+  APPLESCRIPT} 
+end
+
   #Note this needs to have "Enable access for assistive devices"
   #chcked in the Universal Access system preferences
   def simulator_hardware_menu_press( menu_label )

data/lib/frank-cucumber/frank_localize.rb

@@ -8,6 +8,14 @@ module Frank
         case ENV['LANG']
         when /^fr_/
           :fr
+        when /^de_/
+          :de
+        when /^ru_/
+          :ru
+        when /^zh_/
+          :zh
+        when /^ja_/
+          :ja
         else
           :en
         end

data/lib/frank-cucumber/localize.yml

@@ -18,4 +18,48 @@ fr:
   shake_gesture: Secousse
   simulate_memory_warning: Simuler un avertissement de mémoire
   toggle_in_call_status_bar: Afficher/Masquer la barre d'état d'appel en cour
-  simulate_hardware_keyboard: Simuler un clavier matériel
+  simulate_hardware_keyboard: Simuler un clavier matériel
+
+de:
+  iphone_simulator: iOS-Simulator
+  hardware: Hardware
+  home: Home
+  rotate_left: Links drehen
+  rotate_right: Rechts drehen
+  shake_gesture: Schüttelgeste
+  simulate_memory_warning: Speicherwarnhinweis simulieren
+  toggle_in_call_status_bar: Status für eingeh. Anrufe ein/aus
+  simulate_hardware_keyboard: Hardware-Tastatur simulieren
+
+ru:
+  iphone_simulator: Симулятор iOS
+  hardware: Аппаратура
+  home: Экран «Домой»
+  rotate_left: Повернуть влево
+  rotate_right: Повернуть вправо
+  shake_gesture: Выполнить жест встряхивания
+  simulate_memory_warning: Симулировать предупреждение о нехватке памяти
+  toggle_in_call_status_bar: Переключить на строку состояния поступающего вызова
+  simulate_hardware_keyboard: Симулировать физическую клавиатуру
+
+zh:
+  iphone_simulator: iOS 模拟器
+  hardware: 硬件
+  home: 首页
+  rotate_left: 向左旋转
+  rotate_right: 向右旋转
+  shake_gesture: 摇动手势
+  simulate_memory_warning: 模拟内存警告
+  toggle_in_call_status_bar: 切换呼叫状态栏
+  simulate_hardware_keyboard: 模拟硬件键盘
+
+ja:
+  iphone_simulator: iOSシミュレータ
+  hardware: ハードウェア
+  home: ホーム
+  rotate_left: 反時計回りに回転
+  rotate_right: 時計回りに回転
+  shake_gesture: シェイクジェスチャー
+  simulate_memory_warning: メモリ警告をシミュレート
+  toggle_in_call_status_bar: 着信ステータスバーを切り替える
+  simulate_hardware_keyboard: ハードウェアキーボードをシミュレート

data/lib/frank-cucumber/version.rb

@@ -1,5 +1,5 @@
 module Frank
   module Cucumber
-    VERSION = "0.8.8"
+    VERSION = "0.8.10"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: frank-cucumber
 version: !ruby/object:Gem::Version
-  version: 0.8.8
+  version: 0.8.10
   prerelease: 
 platform: ruby
 authors:
@@ -10,11 +10,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-01-19 00:00:00.000000000Z
+date: 2012-03-19 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cucumber
-  requirement: &70324880537740 !ruby/object:Gem::Requirement
+  requirement: &70296015296240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,10 +22,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70324880537740
+  version_requirements: *70296015296240
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70324880536340 !ruby/object:Gem::Requirement
+  requirement: &70296015295720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -33,10 +33,10 @@ dependencies:
         version: '2.0'
   type: :runtime
   prerelease: false
-  version_requirements: *70324880536340
+  version_requirements: *70296015295720
 - !ruby/object:Gem::Dependency
   name: sim_launcher
-  requirement: &70324880535140 !ruby/object:Gem::Requirement
+  requirement: &70296015295240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -44,10 +44,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70324880535140
+  version_requirements: *70296015295240
 - !ruby/object:Gem::Dependency
   name: i18n
-  requirement: &70324880534020 !ruby/object:Gem::Requirement
+  requirement: &70296015294760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -55,10 +55,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70324880534020
+  version_requirements: *70296015294760
 - !ruby/object:Gem::Dependency
   name: plist
-  requirement: &70324880532620 !ruby/object:Gem::Requirement
+  requirement: &70296015294160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -66,10 +66,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70324880532620
+  version_requirements: *70296015294160
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &70324880531520 !ruby/object:Gem::Requirement
+  requirement: &70296015293620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -77,7 +77,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70324880531520
+  version_requirements: *70296015293620
 description: Use cucumber to test native iOS apps via Frank
 email:
 - gems@thepete.net