calabash-cucumber-ios-cn 0.0.3 → 0.0.4

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ZDk5Y2QzNDQ2NDJmOGFhY2FmM2Q1ZmI1YzhjNmQ3MmU3N2M5MWM1Ng==
+    ZGEwYmFiZWQyMTI2ZjI2ZmE3YzA2NjYzN2I4MWY0MTBiMGY2OTc4YQ==
   data.tar.gz: !binary |-
-    YTRhNjMxMmJiM2UwMzhlYjBlYjhlNjkyODdhYjg0OGFhMGMxYzQzZQ==
+    YThjNWUxY2ZhZjY4NDdiMTc2YWJjN2FkNWMwZmMyMGU5MDEwZWM1MQ==
 SHA512:
   metadata.gz: !binary |-
-    Mzg2MTUxYmMxODU0ZDQ4NGYyNDcwMDA2ZGVjYmJkM2NiMjg3ZWMyMGQyNzc3
-    Yzk3Y2MyMDRhYjYwMDYyZTE3MDVmNzZkYWM2NThkNTUzN2Q2MThhNDQzZDAw
-    ZTFlMzgxZTI1N2RhMGY5NDQ4YzA4MGRkOGJhOTYxYTkxNGM1NWQ=
+    YmQ5Zjg3Yjg2ZDU5NzNjNGE0M2ZkNzBiODcwZDI1MzhhM2RkYzAwNGFmNTBh
+    MDgxZDVmMzU2ZDYwY2UyMGIyYzZhODcxNDVjOWFlNmRhZmJjNThjMDRjODhm
+    NjBjYzNlZmQyMzQxZTAyZDdiNGEyNThiZWQwZjA1NjhiNDhkNjA=
   data.tar.gz: !binary |-
-    MzM5N2MyNWFkNjdhYmY2NjQzNzE3NzIxNGE3MWRlZmE3NTk0MDYyYzNjMDRh
-    Mjk2NDJkM2UyN2I0YzE0MmMzYmNiMTU0ODBhZmU2YTA0OGJiODI0ZGY4YjFl
-    NDUxMDc2Yjc2MzI5MGUwMGZhMmUwNjU5YzBiMTMxMGYyY2I2MjE=
+    OWRhMTY1Y2ZlNDkxMjEyZWZlOTBlYjEyMTNiY2ZkZDBkODZmNTY4MmJhY2Ri
+    ZjBkMjMzNzIxZmU4YThjOGFiOWY4M2U1NjRiNTM3MzA4MTFhYmNkZDM4Y2Q3
+    NGI2MzVjNjI3MTYwYzM0ZWE5YzM0OTllOGVjY2M2MGQ4NzA0MGE=

data/PredefinedSteps.md

@@ -0,0 +1,218 @@
+应用
+----
+
+```
+假如 应用正在运行
+```
+
+点按
+----
+
+```
+我点按屏幕左10上20
+
+我点按"登录"
+
+我点按"登录"右10%下10%
+
+我点按第3个按钮
+
+我点按"登录"按钮
+
+我点按第2个文本框
+
+我点按文本框"用户名"
+```
+
+列表视图说明：这里意思是第N个可见单元格！
+----
+
+```
+我点按第2个列表项
+
+我点按列表项"湖南"
+```
+
+```
+我切换开关
+
+我切换"推送"开关
+
+我点按用户的位置
+
+我点按完成
+我点按搜索
+我点按done
+我点按search
+```
+
+输入文字
+----
+
+```
+我在"username"中输入"username"
+
+我在文本框"username"中输入"username"
+```
+
+别名
+----
+
+```
+我在"username"中填写"username"
+
+我用软键盘在文本框"username"中输入"username"
+
+我在文本框中填写:
+  | field    | text         |
+  | username | bob          |
+  | password | bob_password |
+
+我在第2个文本框中输入"haha"
+
+我用软键盘在第2个文本框中输入"haha"
+
+我清除"username"
+
+我清除第2个文本框
+```
+
+看见
+----
+
+```
+我等到看见"登录"
+
+我等到看不见"加载中"
+
+我等到"登录"出现
+
+我等到"登录"按钮出现
+
+我等到看见标题是"设置"的导航条
+
+我等待"请输入用户名"文本框
+
+我等待2个文本框
+
+我等
+我等啊等
+我等啊等啊等...
+我等3秒
+
+我后退
+
+我截屏
+截屏
+
+我向左划
+我向右划
+我向上划
+我向下划
+
+我向左划第2个
+
+我向左划第2个的x:10,y:20
+
+我在"联系人"上向左划
+
+我划动第2个格子
+```
+
+捏手势
+----
+
+```
+我双指放大
+我双指缩小
+
+我在"content"上双指放大
+我在"content"上双指缩小
+```
+
+说明:上、左、右看起来在webview上丢失了
+---
+
+```
+我向上滚动
+我向下滚动
+我向左滚动
+我向右滚动
+
+我在"content"上向上滚动
+```
+
+回放
+----
+
+```
+我回放记录"filename"
+
+我在"content"上回放记录"filename"
+
+我在"content"上回放记录"filename"，偏移30,20
+
+我反向回放记录"filename"
+
+我在"content"上反向回放记录"filename"
+
+我在"content"上反向回放记录"filename"，偏移30,20
+```
+
+设备方向
+----
+
+```
+我向左旋转设备
+我向右旋转设备
+
+我把应用切到后台5秒
+```
+
+断言
+----
+
+```
+我应该看到"登录"
+
+我应该看不到"登录"
+
+我应该看到"登录"按钮
+
+我应该看不到"登录"按钮
+
+我看不到文字"用户名"
+
+我看不到"用户名"
+
+我看到文字"用户名"
+
+我看到"用户名"
+
+我应该看到以"用户"开头的文字
+
+我应该看到包含"用户"的文字
+
+我应该看到以"户名"结尾的文字
+
+我看到2个文本框
+
+我应该看到"请输入用户名"文本框
+
+我应该看不到"请输入用户名"文本框
+
+我应该看到地图
+
+我应该看到用户的位置
+```
+
+日期选择器
+----
+
+```
+我修改日期选择器的时间为"15:30:00"
+
+我修改日期选择器的日期为"2014-05-07"
+
+我修改日期选择器日期为"2014-05-07"，时间为"15:30:00"
+```

data/calabash-cucumber-ios-cn.gemspec

@@ -17,5 +17,6 @@ Gem::Specification.new do |s|
   s.licenses = ["BSD"]
 
   s.add_runtime_dependency 'calabash-cucumber', '~> 0.9', '>= 0.9.168'
+  s.add_runtime_dependency 'calabash-android', '~> 0.4', '>= 0.4.21'
 
 end

data/features/step_definitions/calabash_steps.rb

@@ -1,46 +1,53 @@
 # encoding: UTF-8
 
+# calabash-ios uses "touch" and "press", calabash-android uses "click" :-(
+if Calabash.const_defined?(:Android)
+  PRESS = 'click'
+else
+  PRESS = 'press'
+end
+
 Given /^应用正在运行$/ do
   macro %Q|the app is running|
 end
 
 # -- Touch --#
 Then /^我点按屏幕左(\d+)上(\d+)$/ do |x, y|
-  macro %Q|I press on screen #{x} from the left and #{y} from the top|
+  macro %Q|I #{PRESS} on screen #{x} from the left and #{y} from the top|
 end
 
 Then /^我点按"([^\"]*)"$/ do |name|
-  macro %Q|I press "#{name}"|
+  macro %Q|I #{PRESS} "#{name}"|
 end
 
 Then /^我点按"([^\"]*)"右(\d+)%下(\d+)$/ do |name,x,y|
-  macro %Q|I press #{x}% right and #{y}% down from "#{name}"|
+  macro %Q|I #{PRESS} #{x}% right and #{y}% down from "#{name}"|
 end
 
 Then /^我点按第(\d+)个按钮$/ do |index|
-  macro %Q|I press button number #{index}|
+  macro %Q|I #{PRESS} button number #{index}|
 end
 
 Then /^我点按"([^\"]*)"按钮$/ do |name|
-  macro %Q|I press the "#{name}" button|
+  macro %Q|I #{PRESS} the "#{name}" button|
 end
 
 Then /^我点按第(\d+)个文本框$/ do |index|
-  macro %Q|I press text field number #{index}|
+  macro %Q|I #{PRESS} text field number #{index}|
 end
 
 
 Then /^我点按文本框"([^\"]*)"$/ do |name|
-  macro %Q|I press the "#{name}" text field|
+  macro %Q|I #{PRESS} the "#{name}" text field|
 end
 
 #Note in tables views: this means visible cell index!
 Then /^我点按第(\d+)个列表项$/ do |index|
-  macro %Q|I press list item number #{index}|
+  macro %Q|I #{PRESS} list item number #{index}|
 end
 
 Then /^我点按列表项"([^\"]*)"$/ do |cell_name|
-  macro %Q|I press list item "#{cell_name}"|
+  macro %Q|I #{PRESS} list item "#{cell_name}"|
 end
 
 Then /^我切换开关$/ do
@@ -63,7 +70,11 @@ end
 ## -- Entering text -- ##
 
 Then /^我在"([^\"]*)"中输入"([^\"]*)"$/ do |field_name, text_to_type|
-  macro %Q|I enter "#{text_to_type}" into the "#{field_name}" field|
+  if Calabash.const_defined?(:Android)
+    macro %Q|I enter "#{text_to_type}" into "#{field_name}"|
+  else
+    macro %Q|I enter "#{text_to_type}" into the "#{field_name}" field|
+  end
 end
 
 Then /^我在文本框"([^\"]*)"中输入"([^\"]*)"$/ do |field_name, text_to_type|
@@ -84,7 +95,7 @@ Then /^我在文本框中填写:$/ do |table|
 end
 
 Then /^我在第(\d+)个文本框中输入"([^\"]*)"$/ do |index, text|
-  macro %Q|I enter "#{text}" into text field number #{index}|
+    macro %Q|I enter "#{text}" into input field number #{index}|
 end
 
 Then /^我用软键盘在第(\d+)个文本框中输入"([^\"]*)"$/ do |index, text_to_type|

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

@@ -2,8 +2,8 @@ module Calabash
   module Cucumber
     module IOS
       module CN
-        VERSION = '0.0.3'
-        FRAMEWORK_VERSION = '0.0.3'
+        VERSION = '0.0.4'
+        FRAMEWORK_VERSION = '0.0.4'
       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.3
+  version: 0.0.4
 platform: ruby
 authors:
 - Li Jie
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-06 00:00:00.000000000 Z
+date: 2014-05-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: calabash-cucumber
@@ -30,6 +30,26 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 0.9.168
+- !ruby/object:Gem::Dependency
+  name: calabash-android
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.4'
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.4.21
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.4'
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.4.21
 description: Chinese translation of calabash-cucumber.
 email:
 - cpunion@gmail.com
@@ -39,6 +59,7 @@ extra_rdoc_files: []
 files:
 - Gemfile
 - LICENSE
+- PredefinedSteps.md
 - README.md
 - calabash-cucumber-ios-cn.gemspec
 - features/step_definitions/calabash_steps.rb