cs-bdd 0.1.6 → 0.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 77788c60608eb5143e09cdb2e2adc8b4285f5334
-  data.tar.gz: 13607e4f59453700a6d4f5757a52edeb98fe45ee
+  metadata.gz: 4b6b20897fce7c934cbacf55b1b33bc5742ab46e
+  data.tar.gz: 4762ff8d2b22f2dd53aaa4751bc544d7485d18bf
 SHA512:
-  metadata.gz: c131b1b0fb8f9cb93a838048eef113bf74667222709def1128e074ac592015bbb234d48dca788a9843f0cb363d303c2ed2e61a60bef4f9fbf4fdaa23a929d7b5
-  data.tar.gz: cd77ac0ddf4d13a3685dcbe6e6745479eeffea5ded9518ef20f89107c2ba634220bbff7342c7ea0f5e19b40615d6a5a0af7fe7e260bc106cb9caca9c0ef42072
+  metadata.gz: eee698a839ea1aa8740027d7a00d0314d9f09013c3556609322e5194d3ffaaa8c925bda88f2bdb92aa7a6cda8e035d9f3956f91aade882dc1dcc5ac91cc058f5
+  data.tar.gz: 5bd7d5e102efdb0326dc15431b10fa9e852f55620d60f7955f56a2dacd2cd7997f870c036e8fb162446d82e268f98d249c855e7d60d3dc425fb63a9ecff9f144

data/README.md

@@ -54,17 +54,17 @@ This command will create a folder named ProjectName in the current directory and
   cs-bdd new ProjectName --lang=pt
 ```
 
-  > The default language is English ('en'). The elements of Gherkin such as Given, When, Than, And, Scenario will be translated to all Gherkin supported languages, but this gem has a little quantity of translation files (see than in folder: `lib/cs/bdd/locales`). 
+  > The default language is English ('en'). The elements of Gherkin such as Given, When, Then, And, Scenario will be translated to all Gherkin supported languages, but this gem has just a few translation files (see that in folder: `lib/cs/bdd/locales`). 
   
   > **CS-BDD doesn't support your mother language?** No problem. Fork it, create your yml translation file, uses the en.yml file as a template. Translate it and make a pull request. There are only 15 lines to be translated, this will take no time.
   
-  > **Don't you know how to name your translation yml file?** See the Gherkin supported languages [here](https://github.com/cucumber/gherkin/blob/master/lib/gherkin/i18n.json) for reference.
+  > **Want to know how to name your translation yml file?** See the Gherkin supported languages [here](https://github.com/cucumber/gherkin/blob/master/lib/gherkin/i18n.json) for reference.
 
 Once the project is created, open its folder (`cd ProjectName`) and run `bundle install`
 
   > This project supports both Android and iOS, so if you are on a PC you will not need the gems that are only for Macs, so you can run the command `bundle install --without mac_os`
   
-  > Remember to fix a calabash-cucumber version on the Gemfile. When updating the calabash-cucumber gem version you need to update the Calabash framework that was embeded on your iOS code. So I suggest doing the update manually. [In this page](https://github.com/calabash/calabash-ios/wiki/B1-Updating-your-Calabash-iOS-version) you can find more informations on how to update the Calabash framework.
+  > Remember to fix the calabash-cucumber version on the Gemfile. When updating the calabash-cucumber gem version you need to update the Calabash framework that was embedded on your iOS code. So, my suggestion is to update it manually. [In this page](https://github.com/calabash/calabash-ios/wiki/B1-Updating-your-Calabash-iOS-version) you can find more information on how to update the Calabash framework.
 
 
 There are nine generators that are responsible to create the templates for Features, Step definitions and Screens.

data/lib/cs/bdd/locales/en.yml

@@ -19,6 +19,7 @@ en:
     take_print: "take picture"
     been_in_page: "I am at (?:page|screen) '(.*?)'"
     move_to_page: "I went to (?:page|screen) '(.*?)'"
+    restart_app: "I restart the app"
   directions:
     up: 'up'
     down: 'down'

data/lib/cs/bdd/locales/pt.yml

@@ -19,6 +19,7 @@ pt:
     take_print: "faço um print"
     been_in_page: "que eu (?:estou|estava) na (?:página|tela)(?: de|) '(.*?)'"
     move_to_page: "eu (?:devo|deveria) estar na (?:página|tela)(?: de|) '(.*?)'"
+    restart_app: "(Eu |)reiniciar o aplicativo"
   directions:
     up: 'cima'
     down: 'baixo'

data/lib/cs/bdd/version.rb

@@ -1,5 +1,5 @@
 module CS
   module BDD
-    VERSION = '0.1.6'
+    VERSION = '0.1.7'
   end
 end

data/lib/skeleton/.gitignore

@@ -3,3 +3,7 @@ reports/*
 test_servers/*
 .DS_Store
 screenshot*.png
+screenshots/android/*
+!screenshots/android/.*
+screenshots/ios/*
+!screenshots/ios/.*

data/lib/skeleton/Gemfile

@@ -1,6 +1,6 @@
 # Gemfile to help setting up the initial development environment
 source 'https://rubygems.org'
 
-gem 'calabash-common', '~> 0.0.2'
-gem 'calabash-android', '~> 0.5.15'
-gem 'calabash-cucumber', '~> 0.17.1'
+gem 'calabash-common'
+gem 'calabash-android', '~> 0.7.0'
+gem 'calabash-cucumber', '~> 0.19.0'

data/lib/skeleton/config/cucumber.yml

@@ -1,7 +1,7 @@
 # config/cucumber.yml
 ##YAML Template
 ---
-android: PLATFORM=android -r features/support -r features/android -r features/step_definitions --exclude features/ios
+android: PLATFORM=android SCREENSHOT_PATH=screenshots/android/ -r features/support -r features/android -r features/step_definitions --exclude features/ios
 
 
-ios: PLATFORM=ios -r features/support -r features/ios -r features/step_definitions --exclude features/android
+ios: PLATFORM=ios SCREENSHOT_PATH=screenshots/ios/ -r features/support -r features/ios -r features/step_definitions --exclude features/android

data/lib/skeleton/config/scripts/android/run_tests_all_devices.sh

@@ -28,7 +28,7 @@ do
   mkdir "$reports_path"/"$device"
 
   {
-      ADB_DEVICE_ARG=$device SCREENSHOT_PATH="$reports_path"/"$device"/ calabash-android run $1 -p android -f 'Calabash::Formatters::Html' -o "$reports_path"/"$device"/reports.html -f junit -o "$reports_path"/"$device"
+      ADB_DEVICE_ARG=$device calabash-android run $1 -p android SCREENSHOT_PATH="$reports_path"/"$device"/ -f 'Calabash::Formatters::Html' -o "$reports_path"/"$device"/reports.html -f junit -o "$reports_path"/"$device"
       # Calabash has a problem with images relative path, the command above will replace all the images path on the
       # html report file to be a relative path
       sed -i.bak 's|'"$reports_path"/"$device"/'||g' "$reports_path"/"$device"/reports.html

data/lib/skeleton/config/scripts/ios/build_app.rb

@@ -26,16 +26,16 @@ if ARGV.length != 1
   exit 1
 end
 
-puts "Starting at #{Time.now.strftime('%H:%M:%S')}"
-
 if config[ARGV[0]].nil?
   puts 'Error: Wrong configuration environment!'
-  puts "Available Environments: #{config.keys}"
+  puts "Available Environments: #{config.keys.join(', ')}"
   exit 1
 else
   config = config[ARGV[0]]
 end
 
+puts "Starting at #{Time.now.strftime('%H:%M:%S')}"
+
 # Creating a folder name from the destination configuration parameter
 folder_name = config['destination'].gsub('platform=', '').gsub('name=', '')
               .tr(' ', '_').tr(',', '_')

data/lib/skeleton/config/scripts/ios/run_tests_all_devices.sh

@@ -45,7 +45,7 @@ do
     fi
     
     # Executing calabash for the device or simulator
-    APP_BUNDLE_PATH="$APP_PATH" DEVICE_TARGET="$UUID" DEVICE_ENDPOINT="$IP" SCREENSHOT_PATH="$reports_path"/"$NAME"/ cucumber -p ios -f 'Calabash::Formatters::Html' -o "$reports_path"/"$NAME/reports.html" -f junit -o "$reports_path"/"$NAME"
+    APP_BUNDLE_PATH="$APP_PATH" DEVICE_TARGET="$UUID" DEVICE_ENDPOINT="$IP" cucumber -p ios SCREENSHOT_PATH="$reports_path"/"$NAME"/ -f 'Calabash::Formatters::Html' -o "$reports_path"/"$NAME/reports.html" -f junit -o "$reports_path"/"$NAME"
 
     # Calabash has a problem with images relative path, the command above will replace all the images path on the
     # html report file to be a relative path

data/lib/skeleton/features/ios/support/01_launch.rb

@@ -54,21 +54,14 @@ Before do |scenario|
 
   FeatureMemory.feature = feature
   FeatureMemory.invocation = 1
-  unless launcher.calabash_no_launch?
-    launcher.relaunch(options)
-    launcher.calabash_notify(self)
-  end
-end
 
-After do
-  calabash_exit unless launcher.calabash_no_stop?
+  launcher.relaunch(options)
+  # Avoid resetting when is not necessary
+  options[:reset] = false
 end
 
-at_exit do
-  launcher = Calabash::Cucumber::Launcher.new
-  if launcher.simulator_target?
-    launcher.simulator_launcher.stop unless launcher.calabash_no_stop?
-  end
+After do
+  calabash_exit if launcher.quit_app_after_scenario?
 end
 
 def device?

data/lib/skeleton/features/support/exceptions.rb

@@ -0,0 +1,11 @@
+class UnexpectedPageError < StandardError
+end
+
+class TouchElementError < StandardError
+end
+
+class ElementNotFoundError < StandardError
+end
+
+class ElementFoundError < StandardError
+end

data/lib/templates/android_screen_base.tt

@@ -11,6 +11,51 @@ class AndroidScreenBase < Calabash::ABase
     alias_method :trait, :element
   end
 
+  def restart_app
+    shutdown_test_server
+    start_test_server_in_background
+  end
+
+  def method_missing(method, *args)
+    if method.to_s.start_with?('touch_')
+      # If method name starts with touch_, executes the touch
+      # screen element method using the element name which is the
+      # method name without the first 'touch_' chars
+      touch_screen_element public_send(method.to_s.sub('touch_', ''))
+    elsif method.to_s.start_with?('enter_')
+      # If method starts with enter_, execute the enter method using
+      # the field name, which is the method name without the initial
+      # 'enter_' chars and appended '_field' chars
+      enter args[0], public_send("#{method.to_s.sub('enter_', '')}_field")
+    elsif method.to_s.end_with?('_visible?')
+      # If method ends with _visible?, executes the visible? method
+      # The field name is the method name without de ending
+      # '_visible? chars
+      visible? public_send(method.to_s.sub('_visible?', ''))
+    elsif method.to_s.end_with?('_visible!')
+      # Do the same as the method above, but throws an exception
+      # if the field is not visible
+      field_name = method.to_s.sub('_visible!', '')
+                         .sub('_field', '')
+                         .sub('_', ' ')
+                         .capitalize
+      raise ElementNotFoundError, "ID: #{field_name}" unless
+        visible? public_send(method.to_s.sub('_visible!', ''))
+    else
+      super
+    end
+  end
+
+  def visible?(id, query = nil)
+    query = "* id:'#{id}'" if query.nil?
+    begin
+      wait_for(timeout: 3) { element_exists query }
+    rescue
+      return false
+    end
+    true
+  end
+
   element(:loading_screen)      { 'insert_loading_view_id' }
 
   # The progress bar of the application is a custom view

data/lib/templates/base_steps.tt

@@ -21,6 +21,10 @@ end
   @page.drag_to direction.to_sym
 end
 
+<%= I18n.translate( :when ).capitalize %>(/^<%= I18n.translate( "steps.restart_app" ) %>$/) do
+  @page.restart_app
+end
+
 ######### <%= I18n.translate( :then ).upcase %> #########
 
 <%= I18n.translate( :then ).capitalize %>(/^<%= I18n.translate "steps.wait_progress_bar" %>$/) do
@@ -41,5 +45,4 @@ end
 <%= I18n.translate( :then ).capitalize %>(/^<%= I18n.translate "steps.take_print" %>$/) do
   screenshot_embed
 end
-
 <% end %>

data/lib/templates/ios_screen_base.tt

@@ -11,6 +11,55 @@ class IOSScreenBase < Calabash::IBase
     alias_method :trait, :element
   end
 
+  def restart_app
+    # Relaunch options
+    options = { timeout: 3000 }
+
+    launcher.relaunch(options)
+    launcher.calabash_notify(self)
+  end
+
+  def method_missing(method, *args)
+    if method.to_s.start_with?('touch_')
+      # If method name starts with touch_, executes the touch
+      # screen element method using the element name which is the
+      # method name without the first 'touch_' chars
+      touch_screen_element public_send(method.to_s.sub('touch_', ''))
+    elsif method.to_s.start_with?('enter_')
+      # If method starts with enter_, execute the enter method using
+      # the field name, which is the method name without the initial
+      # 'enter_' chars and appended '_field' chars
+      enter args[0], public_send("#{method.to_s.sub('enter_', '')}_field")
+    elsif method.to_s.end_with?('_visible?')
+      # If method ends with _visible?, executes the visible? method
+      # The field name is the method name without de ending
+      # '_visible? chars
+      visible? public_send(method.to_s.sub('_visible?', ''))
+    elsif method.to_s.end_with?('_visible!')
+      # Do the same as the method above, but throws an exception
+      # if the field is not visible
+      field_name = method.to_s.sub('_visible!', '')
+                         .sub('_field', '')
+                         .sub('_', ' ')
+                         .capitalize
+      raise ElementNotFoundError, "ID: #{field_name}" unless
+        visible? public_send(method.to_s.sub('_visible!', ''))
+    else
+      super
+    end
+  end
+
+  def visible?(id, query = nil)
+    query = "* id:'#{id}'" if query.nil?
+    begin
+      wait_for(timeout: 3) { element_exists query }
+    rescue
+      return false
+    end
+    true
+  end
+
+
   element(:loading_screen)            { 'LOADING' }
 
   # The progress bar of the application is a custom view
@@ -26,6 +75,18 @@ class IOSScreenBase < Calabash::IBase
 
   def drag_to(direction, element = nil)
     element = 'tableView' if element.nil?
+
+    case(direction)
+    when :<%= (I18n.translate "directions.down").to_sym %>
+      direction = :down
+    when :<%= (I18n.translate "directions.up").to_sym %>
+      direction = :up
+    when :<%= (I18n.translate "directions.left").to_sym %>
+      positions = :left
+    when :<%= (I18n.translate "directions.right").to_sym %>
+      positions = :right
+    end
+
     scroll(element, direction)
     sleep(1)
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cs-bdd
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.1.7
 platform: ruby
 authors:
 - Oscar Tanner
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-09 00:00:00.000000000 Z
+date: 2016-06-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -128,6 +128,9 @@ files:
 - lib/skeleton/features/ios/support/01_launch.rb
 - lib/skeleton/features/ios/support/02_pre_stop_hooks.rb
 - lib/skeleton/features/support/env.rb
+- lib/skeleton/features/support/exceptions.rb
+- lib/skeleton/screenshots/android/.gitkeep
+- lib/skeleton/screenshots/ios/.gitkeep
 - lib/templates/android_screen_base.tt
 - lib/templates/base_steps.tt
 - lib/templates/feature.tt