calabash-cucumber-ios-cn 0.0.1 → 0.0.2

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NmJhMDMxYmJkNjNlOThkMjFlZmRhMDI0NzQ4NGNlNjI3ZmE4ODY5Mw==
+    ZmFiZDc2YzM1NjQ3ODNhNzg2MGIzZGUwZDU3ZTYwYTI2ZDE3ZjAyMA==
   data.tar.gz: !binary |-
-    MTg4ZjM3ZTdkMDFmMGM1ZDdlMGQxOGY2NzkxYWFjZDhlYWMxMzgzZA==
+    NzVmYmE5ZmIxZmI5NzNiMGE0ZTIyNGJlZmM1NzExNjIwYWQzMjY4OA==
 SHA512:
   metadata.gz: !binary |-
-    ZGNjMzEwNzI1MzkxMGJhNWM3ZGZlY2EzYTU4MThhMDE3MzY5NWRlNmE0MjE2
-    MGE2MmY0ZDY3MTg4YjkyNDExMjgzYzRiOWFjOTkzMWFlZDkxMjNlOTc0YmRi
-    MGM0Mjk2NzZmZGI1NGFmMmU0MmQ1MzU0NDgxNjkyMDExOWNlMjA=
+    MmMwNGI0MDQ3NmExOTNlYzIyYjY4OTFiNDEyN2NmN2Q1NzliZGEyY2I0Y2Rk
+    OTJmMTAyYzA5ODY1NWRlM2YyMDc5OWQ3N2RiYWE3MzFjZWY5Y2JhMTU1ZWEy
+    NzBhNzI5Y2NmMjA0NmUxZjFmODYzNDU5ZTBmMjVmMmY5MTIzMGE=
   data.tar.gz: !binary |-
-    ZTRmNTdlMDA5NTNmNGU0ZWMyZGE2NzRlNWRlNDZiNGUzOTg4ZWM5MzkzOGY2
-    ZDM5YmU0MzdjNWNiMjgzYjYzMzlhZTVhMzU1ZTUzNzRiMGI2OTIzODE2YTJj
-    MjBlMTE3ZWRlNzdjMGQ2Y2U1ZTllNDAzODg0ZjdhYjViYTI3NTY=
+    NmQzNDUyZWYzZTdhYmE4M2IxMzY5MGZmNWE2Y2E0MzA1Y2QzYTkwOGEzODYy
+    OTE4YWRjMDEzMWE2ODI2YWFjY2ZhMTlmOWUyNjFiNDQzN2Q1ZTFmYmZhMTll
+    ZGIzY2M4NGIyMDhkYmE4ODIwNWY0MmFlYmZiZmRiOGFiNzljYjA=

data/features/step_definitions/calabash_steps.rb

@@ -1,467 +1,323 @@
 # encoding: UTF-8
 
 Given /^应用正在运行$/ do
-  macro 'the app is running'
+  macro %Q|the app is running|
 end
 
-
 # -- Touch --#
-Then /^I (?:press|touch) on screen (\d+) from the left and (\d+) from the top$/ do |x, y|
-  touch(nil, {:offset => {:x => x.to_i, :y => y.to_i}})
-  sleep(STEP_PAUSE)
+Then /^我点按屏幕左(\d+)上(\d+)$/ do |x, y|
+  macro %Q|I press on screen #{x} from the left and #{y} from the top|
 end
 
-Then /^I (?:press|touch) "([^\"]*)"$/ do |name|
-  touch("view marked:'#{name}'")
-  sleep(STEP_PAUSE)
+Then /^我点按"([^\"]*)"$/ do |name|
+  macro %Q|I press "#{name}"|
 end
 
-Then /^I (?:press|touch) (\d+)% right and (\d+)% down from "([^\"]*)" $/ do |x,y,name|
-  raise "This step is not yet implemented on iOS"
+Then /^我点按"([^\"]*)"右(\d+)%下(\d+)$/ do |x,y,name|
+  macro %Q|I press #{x}% right and #{y}% down from "#{name}"|
 end
 
-Then /^I (?:press|touch) button number (\d+)$/ do |index|
-  index = index.to_i
-  screenshot_and_raise "Index should be positive (was: #{index})" if (index<=0)
-  touch("button index:#{index-1}")
-  sleep(STEP_PAUSE)
+Then /^我点按第(\d+)个按钮$/ do |index|
+  macro %Q|I press button number #{index}|
 end
 
-Then /^I (?:press|touch) the "([^\"]*)" button$/ do |name|
-  touch("button marked:'#{name}'")
-  sleep(STEP_PAUSE)
+Then /^我点按"([^\"]*)"按钮$/ do |name|
+  macro %Q|I press the "#{name}" button|
 end
 
-Then /^I (?:press|touch) (?:input|text) field number (\d+)$/ do |index|
-  index = index.to_i
-  screenshot_and_raise "Index should be positive (was: #{index})" if (index<=0)
-  touch("textField index:#{index-1}")
-  sleep(STEP_PAUSE)  
+Then /^我点按第(\d+)个文本框$/ do |index|
+  macro %Q|I press text field number #{index}|
 end
 
 
-Then /^I (?:press|touch) the "([^\"]*)" (?:input|text) field$/ do |name|
-  placeholder_query = "textField placeholder:'#{name}'"
-  marked_query = "textField marked:'#{name}'"
-  if !query(placeholder_query).empty?
-    touch(placeholder_query)
-  elsif !query(marked_query).empty?
-    touch(marked_query)
-  else
-    screenshot_and_raise "could not find text field with placeholder '#{name}' or marked as '#{name}'"
-  end
-  sleep(STEP_PAUSE)
+Then /^我点按文本框"([^\"]*)"$/ do |name|
+  macro %Q|I press the "#{name}" text field|
 end
 
 #Note in tables views: this means visible cell index!
-Then /^I (?:press|touch) list item number (\d+)$/ do |index|
-   index = index.to_i
-   screenshot_and_raise "Index should be positive (was: #{index})" if (index<=0)
-   touch("tableViewCell index:#{index-1}")
-   sleep(STEP_PAUSE)
+Then /^我点按第(\d+)个列表项$/ do |index|
+  macro %Q|I press list item number #{index}|
 end
 
-Then /^I (?:press|touch) list item "([^\"]*)"$/ do |cell_name|
-  if
-  query("tableViewCell marked:'#{cell_name}'").empty?
-  then
-    touch("tableViewCell text:'#{cell_name}'")
-  else
-    touch("tableViewCell marked:'#{cell_name}'")
-  end
-  sleep(STEP_PAUSE)
+Then /^我点按列表项"([^\"]*)"$/ do |cell_name|
+  macro %Q|I press list item "#{cell_name}"|
 end
 
-Then /^I toggle the switch$/ do
-  touch("switch")
-  sleep(STEP_PAUSE)
+Then /^我切换开关$/ do
+  macro %Q|I toggle the switch|
 end
 
-Then /^I toggle the "([^\"]*)" switch$/ do |name|
-  touch("switch marked:'#{name}'")
-  sleep(STEP_PAUSE)
+Then /^我切换"([^\"]*)"开关$/ do |name|
+  macro %Q|I toggle the "#{name}" switch|
 end
 
-Then /^I touch (?:the)? user location$/ do
-  touch("view:'MKUserLocationView'")
-  sleep(STEP_PAUSE)
+Then /^我点按用户的位置$/ do
+  macro %Q|I touch the user location|
 end
 
-Then /^I (?:touch|press) (?:done|search)$/ do
-  done
-  sleep(STEP_PAUSE)
+Then /^我点按(?:完成|搜索|done|search)$/ do
+  macro %Q|I touch done|
 end
 
 
 ## -- Entering text -- ##
 
-Then /^I enter "([^\"]*)" into the "([^\"]*)" field$/ do |text_to_type, field_name|
-  touch("textField marked:'#{field_name}'")
-  wait_for_keyboard()
-  keyboard_enter_text text_to_type
-  sleep(STEP_PAUSE)
+Then /^我在"([^\"]*)"中输入"([^\"]*)"$/ do |text_to_type, field_name|
+  macro %Q|I enter "#{text_to_type}" into the "#{field_name}" field|
 end
 
-Then /^I enter "([^\"]*)" into the "([^\"]*)" (?:text|input) field$/ do |text_to_type, field_name|
-  touch("textField marked:'#{field_name}'")
-  wait_for_keyboard()
-  keyboard_enter_text text_to_type
-  sleep(STEP_PAUSE)
+Then /^我在文本框"([^\"]*)"中输入"([^\"]*)"$/ do |text_to_type, field_name|
+  macro %Q|I enter "#{text_to_type}" into the "#{field_name}" text field|
 end
 
 # alias
-Then /^I fill in "([^\"]*)" with "([^\"]*)"$/ do |text_field, text_to_type|
-  macro %Q|I enter "#{text_to_type}" into the "#{text_field}" text field|
+Then /^我在"([^\"]*)"中填写"([^\"]*)"$/ do |text_field, text_to_type|
+  macro %Q|I fill in "#{text_field}" with "#{text_to_type}"|
 end
 
-Then /^I use the native keyboard to enter "([^\"]*)" into the "([^\"]*)" (?:text|input) field$/ do |text_to_type, field_name|
-  macro %Q|I touch the "#{field_name}" text field|
-  wait_for_keyboard()
-  keyboard_enter_text(text_to_type)
-  sleep(STEP_PAUSE)
+Then /^我用软键盘输入"([^\"]*)"到"([^\"]*)"文本框$/ do |text_to_type, field_name|
+  macro %Q|I use the native keyboard to enter "#{text_to_type}" into the "#{field_name}" text field|
 end
 
-Then /^I fill in text fields as follows:$/ do |table|
-  table.hashes.each do |row|
-    macro %Q|I enter "#{row['text']}" into the "#{row['field']}" text field|
-  end
+Then /^我在文本框中填写:$/ do |table|
+  step %Q|I fill in text fields as follows:|, table
 end
 
-Then /^I enter "([^\"]*)" into (?:input|text) field number (\d+)$/ do |text, index|
-  index = index.to_i
-  screenshot_and_raise "Index should be positive (was: #{index})" if (index<=0)
-  touch("textField index:#{index-1}")
-  wait_for_keyboard()
-  keyboard_enter_text text
-  sleep(STEP_PAUSE)
+Then /^我在第(\d+)个文本框中输入"([^\"]*)"$/ do |text, index|
+  macro %Q|I enter "#{text}" into text field number #{index}|
 end
 
-Then /^I use the native keyboard to enter "([^\"]*)" into (?:input|text) field number (\d+)$/ do |text_to_type, index|
-  idx = index.to_i
-  macro %Q|I touch text field number #{idx}|
-  wait_for_keyboard()
-  keyboard_enter_text(text_to_type)
-  sleep(STEP_PAUSE)
+Then /^我用软键盘在第(\d+)个文本框中输入"([^\"]*)"$/ do |text_to_type, index|
+  macro %Q|I use the native keyboard to enter "#{text_to_type}" into text field number #{index}|
 end
 
-When /^I clear "([^\"]*)"$/ do |name|
-  msg = "When I clear <name>' will be deprecated because it is ambiguous - what should be cleared?"
-  _deprecated('0.9.151', msg, :warn)
-  clear_text("textField marked:'#{name}'")
+When /^我清除"([^\"]*)"$/ do |name|
+  macro %Q|I clear "#{name}"|
 end
 
-Then /^I clear (?:input|text) field number (\d+)$/ do |index|
-  index = index.to_i
-  screenshot_and_raise "Index should be positive (was: #{index})" if (index<=0)
-  clear_text("textField index:#{index-1}")
+Then /^我清除第(\d+)个文本框$/ do |index|
+  macro %Q|I clear text field number #{index}|
 end
 
 # -- See -- #
-Then /^I wait to see "([^\"]*)"$/ do |expected_mark|
-  wait_for(WAIT_TIMEOUT) { view_with_mark_exists( expected_mark ) }
-end
-
-Then /^I wait until I don't see "([^\"]*)"$/ do |expected_mark|
-  sleep 1## wait for previous screen to disappear
-  wait_for(WAIT_TIMEOUT) { not element_exists( "view marked:'#{expected_mark}'" )}
+Then /^我等到看见"([^\"]*)"$/ do |expected_mark|
+  macro %Q|I wait to see "#{expected_mark}"|
 end
 
-Then /^I wait to not see "([^\"]*)"$/ do |expected_mark|
-  macro %Q|I wait until I don't see "#{expected_mark}"|
+Then /^我等到看不见"([^\"]*)"$/ do |expected_mark|
+  macro %Q|I wait until I don't see "#{expected_mark}|
 end
 
-Then /^I wait for "([^\"]*)" to appear$/ do |name|
-  macro %Q|I wait to see "#{name}"|
+Then /^我等到"([^\"]*)"出现$/ do |name|
+  macro %Q|I wait for "#{name}" to appear|
 end
 
-Then /^I wait for the "([^\"]*)" button to appear$/ do |name|
-  wait_for(WAIT_TIMEOUT) { element_exists( "button marked:'#{name}'" ) }
+Then /^我等到"([^\"]*)"按钮出现$/ do |name|
+  macro %Q|I wait for the "#{name}" button to appear|
 end
 
-Then /^I wait to see a navigation bar titled "([^\"]*)"$/ do |expected_mark|
-  msg = "waited for '#{WAIT_TIMEOUT}' seconds but did not see the navbar with title '#{expected_mark}'"
-  wait_for(:timeout => WAIT_TIMEOUT,
-           :timeout_message => msg ) do
-    all_items = query("navigationItemView marked:'#{expected_mark}'")
-    button_items = query("navigationItemButtonView")
-    non_button_items = all_items.delete_if { |item| button_items.include?(item) }
-    !non_button_items.empty?
-  end
+Then /^我等到看见标题是"([^\"]*)"的导航条$/ do |expected_mark|
+  macro %Q|I wait to see a navigation bar titled "#{expected_mark}"|
 end
 
-Then /^I wait for the "([^\"]*)" (?:input|text) field$/ do |placeholder_or_view_mark|
-  wait_for(WAIT_TIMEOUT) {
-    element_exists( "textField placeholder:'#{placeholder_or_view_mark}'") ||
-          element_exists( "textField marked:'#{placeholder_or_view_mark}'")
-  }
+Then /^我等待"([^\"]*)"文本框$/ do |placeholder_or_view_mark|
+  macro %Q|I wait for the "#{placeholder_or_view_mark}" text field|
 end
 
-Then /^I wait for (\d+) (?:input|text) field(?:s)?$/ do |count|
-  count = count.to_i
-  wait_for(WAIT_TIMEOUT) { query(:textField).count >= count  }
+Then /^我等待(\d+)个文本框$/ do |count|
+  macro %Q|I wait for #{count} text field|
 end
 
 
-Then /^I wait$/ do
-  sleep 2
+Then /^我等$/ do
+  macro %Q|I wait|
 end
 
-Then /^I wait and wait$/ do
-  sleep 4
+Then /^我等啊等$/ do
+ macro %Q|I wait and wait|
 end
 
-Then /^I wait and wait and wait...$/ do
-  sleep 10
+Then /^我等啊等啊等...$/ do
+  macro %Q|I wait and wait and wait...|
 end
 
-When /^I wait for ([\d\.]+) second(?:s)?$/ do |num_seconds|
-  num_seconds = num_seconds.to_f
-  sleep num_seconds
+When /^我等([\d\.]+)秒$/ do |num_seconds|
+  macro %Q|I wait for #{num_seconds} seconds|
 end
 
 
-Then /^I go back$/ do
-  touch("navigationItemButtonView first")
-  sleep(STEP_PAUSE)
+Then /^我后退$/ do
+  macro %Q|I go back|
 end
 
-Then /^(?:I\s)?take (?:picture|screenshot)$/ do
-  sleep(STEP_PAUSE)
-  screenshot_embed
+Then /^(?:我)?截屏$/ do
+  macro %Q|I take screenshot|
 end
 
-Then /^I swipe (left|right|up|down)$/ do |dir|
-  swipe(dir)
-  sleep(STEP_PAUSE)
+DIRs = {"左" => "left", "右" => "right", "上" => "up", "下" => "down"}
+
+Then /^我向(左|右|上|下)划$/ do |dir|
+  dir = DIRs[dir]
+  macro %Q|I swipe #{dir}|
 end
 
-Then /^I swipe (left|right|up|down) on number (\d+)$/ do |dir, index|
-  index = index.to_i
-  screenshot_and_raise "Index should be positive (was: #{index})" if (index<=0)
-  swipe(dir, {:query => "scrollView index:#{index-1}"})
-  sleep(STEP_PAUSE)
+Then /^我向(左|右|上|下)划第(\d+)个$/ do |dir, index|
+  dir = DIRs[dir]
+  macro %Q|I swipe #{dir} on number #{index}|
 end
 
-Then /^I swipe (left|right|up|down) on number (\d+) at x (\d+) and y (\d+)$/ do |dir, index, x, y|
-  index = index.to_i
-  screenshot_and_raise "Index should be positive (was: #{index})" if (index<=0)
-  swipe(dir, {:offset => {:x => x.to_i, :y => y.to_i}, :query => "scrollView index:#{index-1}"})
-  sleep(STEP_PAUSE)
+Then /^我向(左|右|上|下)划第(\d+)个的x:(\d+),y:(\d+)$/ do |dir, index, x, y|
+  dir = DIRs[dir]
+  macro %Q|I swipe #{dir} on number #{index} at x #{x} and y #{y}|
 end
 
-Then /^I swipe (left|right|up|down) on "([^\"]*)"$/ do |dir, mark|
-    swipe(dir, {:query => "view marked:'#{mark}'"})
-    sleep(STEP_PAUSE)
+Then /^我在"([^\"]*)"上向(左|右|上|下)划$/ do |dir, mark|
+  dir = DIRs[dir]
+  macro %Q|I swipe #{dir} on "#{mark}"|
 end
 
-Then /^I swipe on cell number (\d+)$/ do |index|
-  index = index.to_i
-  screenshot_and_raise "Index should be positive (was: #{index})" if (index<=0)
-  cell_swipe({:query => "tableViewCell index:#{index-1}"})
-  sleep(STEP_PAUSE)
+Then /^我划动第(\d+)个格子$/ do |index|
+  macro %Q|I swipe on cell number #{index}|
 end
 
 
 ##pinch##
-Then /^I pinch to zoom (in|out)$/ do |in_out|
-  pinch(in_out)
-  sleep(STEP_PAUSE)
+Then /^我双指(放大|缩小)$/ do |in_out|
+  in_out = in_out == "放大" and "in" or "out"
+  macro %Q|I pinch to zoom #{in_out}|
 end
 
-Then /^I pinch to zoom (in|out) on "([^\"]*)"$/ do |in_out, name|
-  pinch(in_out,{:query => "view marked:'#{name}'"})
-  sleep(STEP_PAUSE)
+Then /^我在"([^\"]*)"上双指(放大|缩小)$/ do |name, in_out|
+  in_out = in_out == "放大" and "in" or "out"
+  macro %Q|I pinch to zoom #{in_out} on "#{name}"|
 end
 
 #   Note "up/left/right" seems to be missing on the web base
-Then /^I scroll (left|right|up|down)$/ do |dir|
-  scroll("scrollView index:0", dir)
-  sleep(STEP_PAUSE)
+Then /^我向(上|下|左|右)滚动$/ do |dir|
+  dir = DIRs[dir]
+  macro %Q|I scroll #{dir}|
 end
 
-Then /^I scroll (left|right|up|down) on "([^\"]*)"$/ do |dir,name|
-  scroll("view marked:'#{name}'", dir)
-  sleep(STEP_PAUSE)
+Then /^我在"([^\"]*)"上向(上|下|左|右)滚动$/ do |name, dir|
+  dir = DIRs[dir]
+  macro %Q|I scroll #{dir} on "#{name}"|
 end
 
 
 
 ### Playback ###
-Then /^I playback recording "([^\"]*)"$/ do |filename|
-    playback(filename)
-    sleep(STEP_PAUSE)
+Then /^我回放记录"([^\"]*)"$/ do |filename|
+  macro %Q|I playback recording "#{filename}"|
 end
 
-Then /^I playback recording "([^\"]*)" on "([^\"]*)"$/ do |filename, name|
-    playback(filename, {:query => "view marked:'#{name}'"})
-    sleep(STEP_PAUSE)
+Then /^我在"([^\"]*)"上回放记录"([^\"]*)"$/ do |name, filename|
+  macro %Q|I playback recording "#{filename}" on "#{name}"|
 end
 
-Then /^I playback recording "([^\"]*)" on "([^\"]*)" with offset (\d+),(\d+)$/ do |filename, name, x, y|
-  x = x.to_i
-  y = y.to_i
-  playback(filename, {:query => "view marked:'#{name}'", :offset => {:x => x, :y => y}})
-  sleep(STEP_PAUSE)
+Then /^我在"([^\"]*)"上回放记录"([^\"]*)"，偏移(\d+),(\d+)$/ do |name, filename, x, y|
+  macro %Q|I playback recording "#{filename}" on "#{name}" with offset #{x},#{y}|
 end
 
-Then /^I reverse playback recording "([^\"]*)"$/ do |filename|
-  playback(filename, {:reverse => true})
-  sleep(STEP_PAUSE)
+Then /^我反向回放记录"([^\"]*)"$/ do |filename|
+  macro %Q|I reverse playback recording "#{filename}"|
 end
 
-Then /^I reverse playback recording "([^\"]*)" on "([^\"]*)"$/ do |filename, name|
-  playback(filename, {:query => "view marked:'#{name}'",:reverse => true})
-  sleep(STEP_PAUSE)
+Then /^我在"([^\"]*)"上反向回放记录"([^\"]*)"$/ do |name, filename|
+  macro %Q|I reverse playback recording "#{filename}" on "#{name}"|
 end
 
-Then /^I reverse playback recording "([^\"]*)" on "([^\"]*)" with offset (\d+),(\d+)$/ do |filename, name, x, y|
-  x = x.to_i
-  y = y.to_i
-  playback(filename, {:query => "view marked:'#{name}'", :offset => {:x => x, :y => y},:reverse => true})
-  sleep(STEP_PAUSE)
+Then /^我在"([^\"]*)"上反向回放记录"([^\"]*)"，偏移(\d+),(\d+)$/ do |name, filename, x, y|
+  macro %Q|I reverse playback recording "#{filename}" on "#{name}" with offset #{x},#{y}|
 end
 
 
 ### Device orientation ###
-Then /^I rotate device (left|right)$/ do |dir|
-  dir = dir.to_sym
-  rotate(dir)
-  sleep(5)#SERVO wait
+Then /^我向(左|右)旋转设备$/ do |dir|
+  dir = DIRs[dir]
+  macro %Q|I rotate device #{dir}|
 end
 
-Then /^I send app to background for (\d+) seconds$/ do |secs|
-  secs = secs.to_f
-  send_app_to_background(secs)
-  sleep(secs+10)
+Then /^我把应用切到后台(\d+)秒$/ do |secs|
+  macro %Q|I send app to background for #{secs} seconds|
 end
 
 ### Assertions ###
-Then /^I should see "([^\"]*)"$/ do |expected_mark|
-  res = (element_exists( "view marked:'#{expected_mark}'" ) or
-         element_exists( "view text:'#{expected_mark}'"))
-  if not res
-    screenshot_and_raise "No element found with mark or text: #{expected_mark}"
-  end
+Then /^我应该看到"([^\"]*)"$/ do |expected_mark|
+  macro %Q|I should see "#{expected_mark}"|
 end
 
-Then /^I should not see "([^\"]*)"$/ do |expected_mark|
-  res = query("view marked:'#{expected_mark}'")
-  res.concat query("view text:'#{expected_mark}'")
-  unless res.empty?
-    screenshot_and_raise "Expected no element with text nor accessibilityLabel: #{expected_mark}, found #{res.join(", ")}"
-  end
+Then /^我应该看不到"([^\"]*)"$/ do |expected_mark|
+  macro %Q|I should not see "#{expected_mark}"|
 end
 
-Then /^I should see a "([^\"]*)" button$/ do |expected_mark|
-  check_element_exists("button marked:'#{expected_mark}'")
+Then /^我应该看到"([^\"]*)"按钮$/ do |expected_mark|
+  macro %Q|I should see a "#{expected_mark}" button|
 end
-Then /^I should not see a "([^\"]*)" button$/ do |expected_mark|
-  check_element_does_not_exist("button marked:'#{expected_mark}'")
+Then /^我应该看不到"([^\"]*)"按钮$/ do |expected_mark|
+  macro %Q|I should not see a "#{expected_mark}" button|
 end
 
-Then /^I don't see the text "([^\"]*)"$/ do |text|
-  macro %Q|I should not see "#{text}"|
+Then /^我看不到文字"([^\"]*)"$/ do |text|
+  macro %Q|I don't see the text "#{text}"|
 end
-Then /^I don't see the "([^\"]*)"$/ do |text|
-  macro %Q|I should not see "#{text}"|
+Then /^我看不到"([^\"]*)"$/ do |text|
+  macro %Q|I don't see the "#{text}"|
 end
 
-Then /^I see the text "([^\"]*)"$/ do |text|
-  macro %Q|I should see "#{text}"|
+Then /^我看到文字"([^\"]*)"$/ do |text|
+  macro %Q|I see the text "#{text}"|
 end
-Then /^I see the "([^\"]*)"$/ do |text|
-  macro %Q|I should see "#{text}"|
+Then /^我看到"([^\"]*)"$/ do |text|
+  macro %Q|I see the "#{text}"|
 end
 
-Then /^I (?:should)? see text starting with "([^\"]*)"$/ do |text|
-  res = query("view {text BEGINSWITH '#{text}'}").empty?
-  if res
-    screenshot_and_raise "No text found starting with: #{text}"
-  end
+Then /^我应该看到以"([^\"]*)"开头的文字$/ do |text|
+  macro %Q|I should see text starting with "#{text}"|
 end
 
-Then /^I (?:should)? see text containing "([^\"]*)"$/ do |text|
-  res = query("view {text LIKE '*#{text}*'}").empty?
-  if res
-    screenshot_and_raise "No text found containing: #{text}"
-  end
+Then /^我应该看到包含"([^\"]*)"的文字$/ do |text|
+  macro %Q|I should see text containing "#{text}"|
 end
 
-Then /^I (?:should)? see text ending with "([^\"]*)"$/ do |text|
-  res = query("view {text ENDSWITH '#{text}'}").empty?
-  if res
-    screenshot_and_raise "No text found ending with: #{text}"
-  end
+Then /^我应该看到以"([^\"]*)"结尾的文字$/ do |text|
+  macro %Q|I should see text ending with "#{text}"|
 end
 
-Then /^I see (\d+) (?:input|text) field(?:s)?$/ do |count|
-  count = count.to_i
-  cnt = query(:textField).count
-  if cnt < count
-      screenshot_and_raise "Expected at least #{count} text/input fields, found #{cnt}"
-  end
+Then /^我看到(\d+)个文本框$/ do |count|
+  macro %Q|I see #{count} text fields|
 end
 
-Then /^I should see a "([^\"]*)" (?:input|text) field$/ do |expected_mark|
-  res = element_exists("textField placeholder:'#{expected_mark}'") ||
-          element_exists("textField marked:'#{expected_mark}'")
-  unless res
-    screenshot_and_raise "Expected textfield with placeholder or accessibilityLabel: #{expected_mark}"
-  end
+Then /^我应该看到"([^\"]*)"文本框$/ do |expected_mark|
+  macro %Q|I should see a "#{expected_mark}" text field|
 end
 
-Then /^I should not see a "([^\"]*)" (?:input|text) field$/ do |expected_mark|
-  res = query("textField placeholder:'#{expected_mark}'")
-  res.concat query("textField marked:'#{expected_mark}'")
-  unless res.empty?
-    screenshot_and_raise "Expected no textfield with placeholder nor accessibilityLabel: #{expected_mark}, found #{res}"
-  end
+Then /^我应该看不到"([^\"]*)"文本框$/ do |expected_mark|
+  macro %Q|I should not see a "#{expected_mark}" text field|
 end
 
 
-Then /^I should see a map$/ do
-  check_element_exists("view:'MKMapView'")
+Then /^我应该看到地图$/ do
+  macro %Q|I should see a map|
 end
 
-Then /^I should see (?:the)? user location$/ do
-  check_element_exists("view:'MKUserLocationView'")
+Then /^我应该看到用户的位置$/ do
+  macro %Q|I should see the user location|
 end
 
 ### Date Picker ###
 
 # time_str can be in any format that Time can parse
-Then(/^I change the date picker time to "([^"]*)"$/) do |time_str|
-  target_time = Time.parse(time_str)
-  current_date = date_time_from_picker()
-  current_date = DateTime.new(current_date.year,
-                              current_date.mon,
-                              current_date.day,
-                              target_time.hour,
-                              target_time.min,
-                              0,
-                              target_time.gmt_offset)
-  picker_set_date_time current_date
-  sleep(STEP_PAUSE)
+Then(/^我修改日期选择器的时间为"([^"]*)"$/) do |time_str|
+  macro %Q|I change the date picker time to "#{time_str}"|
 end
 
 # date_str can be in any format that Date can parse
-Then(/^I change the date picker date to "([^"]*)"$/) do |date_str|
-  target_date = Date.parse(date_str)
-  current_time = date_time_from_picker()
-  date_time = DateTime.new(target_date.year,
-                           target_date.mon,
-                           target_date.day,
-                           current_time.hour,
-                           current_time.min,
-                           0,
-                           Time.now.sec,
-                           current_time.offset)
-  picker_set_date_time date_time
-  sleep(STEP_PAUSE)
+Then(/^我修改日期选择器的日期为"([^"]*)"$/) do |time_str|
+  macro %Q|I change the date picker date to "#{date_str}"|
 end
 
 # date_str can be in any format that Date can parse
-Then(/^I change the date picker date to "([^"]*)" at "([^"]*)"$/) do |date_str, time_str|
+Then(/^我修改日期选择器日期为"([^"]*)"，时间为"([^"]*)"$/) do |date_str, time_str|
   macro %Q|I change the date picker time to "#{time_str}"|
   macro %Q|I change the date picker date to "#{date_str}"|
 end

data/lib/calabash-cucumber-ios-cn/version.rb

@@ -2,8 +2,8 @@ module Calabash
   module Cucumber
     module IOS
       module CN
-        VERSION = '0.0.1'
-        FRAMEWORK_VERSION = '0.0.1'
+        VERSION = '0.0.2'
+        FRAMEWORK_VERSION = '0.0.2'
       end
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: calabash-cucumber-ios-cn
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Li Jie
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-05 00:00:00.000000000 Z
+date: 2014-05-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: calabash-cucumber