cs-bdd 0.1.4 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c75093ffe2bf4ae13702d257de216ab921eba9fd
-  data.tar.gz: 7530e6d6a895dd9d0d7ae5a21e9e4ecf51be39fb
+  metadata.gz: 083aada0c6d56dc360cb8d8edc5e4b22051ce66d
+  data.tar.gz: e1dae588adee75ca80bbe0561dfb97cf5c9996ef
 SHA512:
-  metadata.gz: 7987646f23fe6bf2fd9eac39e87afe05c50f334e0234d5fec842014126b80518dc00dfc2500ebaabcf6c3a61dcd6cf33eccdb17df4f28e8e1c351291575ae339
-  data.tar.gz: 0c1baa47ccf26ffae4c10cc178d624e3c8e1ef316d27ed8af3dcf1d09916b1b085d976d80c70b1e81ecdf0c89c7906dd9162622dc3e52d9ae453f47442c2bfcb
+  metadata.gz: 00cd5a0d3823e74a8e608bf0640d54bfc318a23113e6b2e182984800d1e54afe1c63921c010bb0cee1e6ecc46c10c15cc7ddc18e07597b29ad3ad7fa1d0abf8e
+  data.tar.gz: 3a9c49162395cd0cc3519022aa07cdfa6f56e549e778e908010df6bbc66230d0434f5e0997c25c8c1fe996e71af58ad9b38d79e25a0b1b3a08635942e27ab226

data/.gitignore

@@ -12,3 +12,5 @@
 *.o
 *.a
 mkmf.log
+.irb-history
+.DS_Store

data/Rakefile

@@ -1,2 +1 @@
-require "bundler/gem_tasks"
-
+require 'bundler/gem_tasks'

data/bin/cs-bdd

@@ -17,7 +17,9 @@ module CS
       include Thor::Actions
 
       desc 'feature [RESOURCE_NAME]', 'Generates an OS independent feature'
-      option :lang, banner: 'any of the gherkin supported languages', default: :en
+      option :lang,
+             banner: 'any of the gherkin supported languages',
+             default: :en
       def feature(name)
         I18n.config.default_locale = options[:lang]
         in_root_project_folder?
@@ -29,7 +31,9 @@ module CS
       end
 
       desc 'aFeature [RESOURCE_NAME]', 'Generates an Android dependent feature'
-      option :lang, banner: 'any of the gherkin supported languages', default: :en
+      option :lang,
+             banner: 'any of the gherkin supported languages',
+             default: :en
       def aFeature(name)
         I18n.config.default_locale = options[:lang]
         in_root_project_folder?
@@ -40,7 +44,9 @@ module CS
       end
 
       desc 'iFeature [RESOURCE_NAME]', 'Generates an iOS dependent feature'
-      option :lang, banner: 'any of the gherkin supported languages', default: :en
+      option :lang,
+             banner: 'any of the gherkin supported languages',
+             default: :en
       def iFeature(name)
         I18n.config.default_locale = options[:lang]
         in_root_project_folder?
@@ -51,7 +57,9 @@ module CS
       end
 
       desc 'step [RESOURCE_NAME]', 'Generates an OS independent step'
-      option :lang, banner: 'any of the gherkin supported languages', default: :en
+      option :lang,
+             banner: 'any of the gherkin supported languages',
+             default: :en
       def step(name)
         I18n.config.default_locale = options[:lang]
         in_root_project_folder?
@@ -59,7 +67,9 @@ module CS
       end
 
       desc 'aStep [RESOURCE_NAME]', 'Generates an Android dependent step'
-      option :lang, banner: 'any of the gherkin supported languages', default: :en
+      option :lang,
+             banner: 'any of the gherkin supported languages',
+             default: :en
       def aStep(name)
         I18n.config.default_locale = options[:lang]
         in_root_project_folder?
@@ -67,15 +77,20 @@ module CS
       end
 
       desc 'iStep [RESOURCE_NAME]', 'Generates an iOS dependent step'
-      option :lang, banner: 'any of the gherkin supported languages', default: :en
+      option :lang,
+             banner: 'any of the gherkin supported languages',
+             default: :en
       def iStep(name)
         I18n.config.default_locale = options[:lang]
         in_root_project_folder?
         create_steps_file name, 'IOS'
       end
 
-      desc 'screen [RESOURCE_NAME]', 'Generates the Android and iOS dependent screens'
-      option :lang, banner: 'any of the gherkin supported languages', default: :en
+      desc 'screen [RESOURCE_NAME]',
+           'Generates the Android and iOS dependent screens'
+      option :lang,
+             banner: 'any of the gherkin supported languages',
+             default: :en
       def screen(name)
         I18n.config.default_locale = options[:lang]
         in_root_project_folder?
@@ -84,7 +99,9 @@ module CS
       end
 
       desc 'aScreen [RESOURCE_NAME]', 'Generates an Android dependent screen'
-      option :lang, banner: 'any of the gherkin supported languages', default: :en
+      option :lang,
+             banner: 'any of the gherkin supported languages',
+             default: :en
       def aScreen(name)
         I18n.config.default_locale = options[:lang]
         in_root_project_folder?
@@ -92,7 +109,9 @@ module CS
       end
 
       desc 'iScreen [RESOURCE_NAME]', 'Generates an iOS dependent screen'
-      option :lang, banner: 'any of the gherkin supported languages', default: :en
+      option :lang,
+             banner: 'any of the gherkin supported languages',
+             default: :en
       def iScreen(name)
         I18n.config.default_locale = options[:lang]
         in_root_project_folder?
@@ -117,12 +136,20 @@ module CS
 
       default_task :help
 
-      register CS::BDD::Generate, 'generate', 'generate [GENERATOR] [RESOURCE_NAME]', 'Generates various resources'
-      register CS::BDD::Generate, 'g', 'g [GENERATOR] [RESOURCE_NAME]', 'Generates various resources'
-
-      desc 'new PROJECT_NAME', 'Generates the structure of a new project that uses Calabash in both Android and iOS apps'
-      option :lang, banner: 'any of the gherkin supported languages', default: :en
-      def new name
+      register CS::BDD::Generate, 'generate',
+               'generate [GENERATOR] [RESOURCE_NAME]',
+               'Generates various resources'
+      register CS::BDD::Generate, 'g',
+               'g [GENERATOR] [RESOURCE_NAME]',
+               'Generates various resources'
+
+      desc 'new PROJECT_NAME',
+           'Generates the structure of a new project that uses '\
+           'Calabash in both Android and iOS apps'
+      option :lang,
+             banner: 'any of the gherkin supported languages',
+             default: :en
+      def new(name)
         I18n.config.default_locale = options[:lang]
         # Thor will be responsible to look for identical
         # files and possibles conflicts
@@ -156,18 +183,32 @@ module CS
       def initialize(*args)
         super
         # Loading gherkin accepted translations
-        translations_file_path = File.join(Gem.loaded_specs['gherkin'].full_gem_path, 'lib', 'gherkin', 'i18n.json')
+        translations_file_path = File.join(
+          Gem.loaded_specs['gherkin'].full_gem_path,
+          'lib',
+          'gherkin',
+          'i18n.json'
+        )
         # Parsing the JSON file
         # Removing the sequence *| and all the alternative
         # options for the gherkin translations
-        translations_json = JSON.parse(File.read(translations_file_path).gsub(/\*\|/, '').gsub(/\|.*\"/, '"'))
+        translations_json = JSON.parse(
+          File.read(translations_file_path)
+          .gsub(/\*\|/, '')
+          .gsub(/\|.*\"/, '"'))
         # Converting the translations to YAML and storing in a temp file
         translations_temp_file = Tempfile.new(['translations', '.yml'])
         File.write(translations_temp_file, translations_json.to_yaml)
         # Loading the translations from gherkin and from the
         # locales folder of this gem
-        locales_folder_path = File.join(File.dirname(__FILE__),'..', 'lib', 'cs', 'bdd', 'locales')
-        I18n.load_path = Dir[translations_temp_file, File.join(locales_folder_path, '*.yml')]
+        locales_folder_path = File.join(
+          File.dirname(__FILE__),
+          '..', 'lib', 'cs', 'bdd', 'locales'
+        )
+        I18n.load_path = Dir[
+          translations_temp_file,
+          File.join(locales_folder_path, '*.yml')
+        ]
         I18n.backend.load_translations
         I18n.config.enforce_available_locales = true
       end

data/bin/cs-bdd-helpers.rb

@@ -1,68 +1,77 @@
-def create_feature_file name, platform = nil
-
+def create_feature_file(name, platform = nil)
   # options used to generate the file in the template function
-  opts = {:name => camelize(name)}
+  opts = { name: camelize(name) }
 
   # If platform is not nil than the feature is OS dependent
-  file_path = ""
+  file_path = ''
   if platform.nil?
-    file_path = File.join( FileUtils.pwd, "features", "#{name.downcase}.feature" )
-    opts[:platform] = ""
+    file_path = File.join(FileUtils.pwd, 'features', "#{name.downcase}.feature")
+    opts[:platform] = ''
   else
-    file_path = File.join( FileUtils.pwd, "features", platform.downcase, "features", "#{name.downcase}.feature" )
+    file_path = File.join(
+      FileUtils.pwd, 'features', platform.downcase, 'features',
+      "#{name.downcase}.feature"
+    )
     opts[:platform] = platform
   end
 
   # Thor creates a file based on the templates/feature.tt template
-  template( "feature", file_path, opts )
+  template('feature', file_path, opts)
 end
 
-def create_steps_file name, platform = nil
-
+def create_steps_file(name, platform = nil)
   # options used to generate the file in the template function
-  opts = {:name => camelize(name)}  
+  opts = { name: camelize(name) }
 
   # If platform is not nil than the step is OS dependent
   file_path = nil
   if platform.nil?
-    file_path = File.join( FileUtils.pwd, "features", "step_definitions", "#{name.downcase}_steps.rb" )
-    opts[:platform] = ""
+    file_path = File.join(
+      FileUtils.pwd, 'features', 'step_definitions',
+      "#{name.downcase}_steps.rb"
+    )
+    opts[:platform] = ''
   else
-    file_path = File.join( FileUtils.pwd, "features", platform.downcase, "step_definitions", "#{name.downcase}_steps.rb" )
+    file_path = File.join(
+      FileUtils.pwd, 'features', platform.downcase, 'step_definitions',
+      "#{name.downcase}_steps.rb"
+    )
     opts[:platform] = platform
   end
 
   # Thor creates a file based on the templates/steps.tt template
-  template( "steps", file_path, opts )
+  template('steps', file_path, opts)
 end
 
-def create_screen_file name, platform
-
+def create_screen_file(name, platform)
   # options used to generate the file in the template function
-  opts = {:name => camelize(name), :platform => platform}
+  opts = { name: camelize(name), platform: platform }
 
   # Thor creates a file based on the templates/screen.tt template
-  template( "screen", File.join( FileUtils.pwd, "features", platform.downcase, "screens", "#{name.downcase}_screen.rb"), opts )
+  template('screen',
+           File.join(
+             FileUtils.pwd, 'features', platform.downcase, 'screens',
+             "#{name.downcase}_screen.rb"),
+           opts)
 end
 
-def camelize string
+def camelize(string)
+  camelized = ''
 
-  camelized = ""
-
-  string.split("_").each do |s|
-    camelized = camelized + s.capitalize
+  string.split('_').each do |s|
+    camelized += s.capitalize
   end
 
-  return camelized
+  camelized
 end
 
 def in_root_project_folder?
   # Looks if the user is in the root folder of the project
-  if !Dir.exists? File.join(FileUtils.pwd, "features", "android", "features") or 
-     !Dir.exists? File.join(FileUtils.pwd, "features", "ios", "features")
-    puts "Please run this command on the root folder of the project"
+  if !Dir.exist?(File.join(FileUtils.pwd, 'features', 'android', 'features')) ||
+     !Dir.exist?(File.join(FileUtils.pwd, 'features', 'ios', 'features'))
+    puts 'Please run this command on the root folder of the project'
     exit 1
   end
 
-  return true
-end
+  true
+end

data/cs-bdd.gemspec

@@ -4,24 +4,23 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'cs/bdd/version'
 
 Gem::Specification.new do |spec|
-  spec.name          = "cs-bdd"
+  spec.name          = 'cs-bdd'
   spec.version       = CS::BDD::VERSION
-  spec.authors       = ["Oscar Tanner"]
-  spec.email         = ["oscar.tanner@concretesolutions.com.br"]
-  spec.summary       = %q{Generates an android and iOS calabash project.}
+  spec.authors       = ['Oscar Tanner']
+  spec.email         = ['oscar.tanner@concretesolutions.com.br']
+  spec.summary       = 'Generates an android and iOS calabash project.'
   spec.description   = %q{A simple gem to generate all files needed in a project that will support Calabash for both Android and iOS.}
-  spec.homepage      = "https://github.com/CSOscarTanner/cs-bdd"
-  spec.license       = "MIT"
+  spec.homepage      = 'https://github.com/CSOscarTanner/cs-bdd'
+  spec.license       = 'MIT'
 
   spec.files         = `git ls-files -z`.split("\x0")
-  spec.executables   = ["cs-bdd"]
+  spec.executables   = ['cs-bdd']
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
-  spec.require_paths = ["lib"]
-
-  spec.add_runtime_dependency "bundler", "~> 1.7"
-  spec.add_runtime_dependency "rake", "~> 10.0"
-  spec.add_runtime_dependency "thor", "~> 0.19.1"
-  spec.add_runtime_dependency "i18n", "~> 0.6.11"
-  spec.add_runtime_dependency "gherkin", "~> 2.12.2"
+  spec.require_paths = ['lib']
 
+  spec.add_runtime_dependency 'bundler', '~> 1.7'
+  spec.add_runtime_dependency 'rake', '~> 10.0'
+  spec.add_runtime_dependency 'thor', '~> 0.19.1'
+  spec.add_runtime_dependency 'i18n', '~> 0.6.11'
+  spec.add_runtime_dependency 'gherkin', '~> 2.12.2'
 end

data/lib/cs/bdd.rb

@@ -1,6 +1,7 @@
-require "cs/bdd/version"
+require 'cs/bdd/version'
 
 module CS
+  # Your docs goes here...
   module BDD
     # Your code goes here...
   end

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

@@ -6,7 +6,7 @@ pt:
     trait: "Identificador da tela"
     insert_steps: "Insira os passos"
     elements: "Declare todos os elementos da tela"
-    actions: "Declare todas as ações da tela"
+    actions: "Declare todas as acoes da tela"
   steps:
     drag_until: 'que Eu (?:arrastei|arrasto) a tela para (baixo|cima|esquerda|direita) até ver o elemento "(.*?)"'
     page_contains: "que Eu estou em uma página que contem '(.*?)'"

data/lib/cs/bdd/version.rb

@@ -1,5 +1,5 @@
 module CS
   module BDD
-    VERSION = '0.1.4'
+    VERSION = '0.1.5'
   end
 end

data/lib/skeleton/.gitignore

@@ -2,3 +2,4 @@
 reports/*
 test_servers/*
 .DS_Store
+screenshot*.png

data/lib/skeleton/Gemfile

@@ -1,15 +1,14 @@
 # Gemfile to help setting up the initial development environment
-source "https://rubygems.org"
+source 'https://rubygems.org'
 
 gem 'calabash-common', '~> 0.0.1'
-gem 'calabash-android', '~> 0.5.5'
+gem 'calabash-android', '~> 0.5.14'
 
 # Gems that will only be used with the computer is a Mac
 group :mac_os do
-  # Rementer to fix a calabash-cucumber version. The update of this gem is a proccess
-  # that you need to update de Calabash Server on your iOS application code. So I suggest
-  # doing the update manually
-  gem 'calabash-cucumber', '~> 0.12.2'
+  # Remenber to fix the calabash-cucumber version. The update of this gem is
+  # a proccess that you need to update the Calabash Server on your iOS
+  # application code. So I suggest doing the update manually
+  gem 'calabash-cucumber', '~> 0.16.4'
   gem 'cocoapods', '~> 0.35.0'
 end
-

data/lib/skeleton/config/load_classes.rb

@@ -0,0 +1,19 @@
+# Choosing the platform using the current context LOAD PATH
+# and looking for the gems of calabash
+platform = ''
+$LOAD_PATH.each do |path|
+  platform = 'android' if path.include? 'calabash-android'
+  platform = 'ios' if path.include? 'calabash-cucumber'
+end
+
+platform_path = File.join(File.expand_path('.', Dir.pwd), 'features', platform)
+
+# Loading all ruby files in the base screen path
+Dir[File.join(platform_path, '*.rb')].each do |file|
+  load file
+end
+
+# Loading all screens files
+Dir[File.join(platform_path, 'screens', '*.rb')].each do |screen|
+  load screen
+end

data/lib/skeleton/config/scripts/check_if_tests_failed.sh

@@ -1,13 +1,11 @@
 # Looking for errors on the report files and returns an error
 cd "$WORKSPACE/reports-cal"
-export TESTS_RESULT=""
+
+export TESTS_RESULT="Ok"
 for folder in *
 do
-    if egrep '\([0-9]+ passed\)' "$folder/reports.html"
+    if egrep '[0-9]+ failed' "$folder/reports.html"
     then
-	[ "$TESTS_RESULT" == "Failed" ] && continue
-	export TESTS_RESULT="Ok"
-    else
 	export TESTS_RESULT="Failed"
     fi
 done

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

@@ -7,7 +7,7 @@
 # $2 -> parameter with the path of the .app bundle for devices
 
 ## CODE BEGIN  #############################################################
-
+export LC_ALL="en_US.UTF-8"
 echo Start: $(date)
 
 # Exits if the app path was not informed

data/lib/skeleton/features/android/support/app_installation_hooks.rb

@@ -1,33 +1,32 @@
 require 'calabash-android/management/app_installation'
 
-AfterConfiguration do |config|
+AfterConfiguration do
   FeatureNameMemory.feature_name = nil
 end
 
-Before('@reinstall') do |scenario|
+Before('@reinstall') do
   uninstall_apps
-  install_app(ENV["TEST_APP_PATH"])
-  install_app(ENV["APP_PATH"])
+  install_app(ENV['TEST_APP_PATH'])
+  install_app(ENV['APP_PATH'])
 end
 
 Before do |scenario|
-  @scenario_is_outline = (scenario.class == Cucumber::Ast::OutlineTable::ExampleRow)
-  if @scenario_is_outline 
-    scenario = scenario.scenario_outline 
-  end 
+  @scenario_is_outline =
+    (scenario.class == Cucumber::Ast::OutlineTable::ExampleRow)
+  scenario = scenario.scenario_outline if @scenario_is_outline
 
   feature_name = scenario.feature.title
-  if FeatureNameMemory.feature_name != feature_name \
-      or ENV["RESET_BETWEEN_SCENARIOS"] == "1"
-    if ENV["RESET_BETWEEN_SCENARIOS"] == "1"
-      log "New scenario - reinstalling apps"
+  if FeatureNameMemory.feature_name != feature_name ||
+     ENV['RESET_BETWEEN_SCENARIOS'] == '1'
+    if ENV['RESET_BETWEEN_SCENARIOS'] == '1'
+      log 'New scenario - reinstalling apps'
     else
-      log "First scenario in feature - reinstalling apps"
+      log 'First scenario in feature - reinstalling apps'
     end
-    
+
     uninstall_apps
-    install_app(ENV["TEST_APP_PATH"])
-    install_app(ENV["APP_PATH"])
+    install_app(ENV['TEST_APP_PATH'])
+    install_app(ENV['APP_PATH'])
 
     FeatureNameMemory.feature_name = feature_name
     FeatureNameMemory.invocation = 1
@@ -40,4 +39,4 @@ FeatureNameMemory = Class.new
 class << FeatureNameMemory
   @feature_name = nil
   attr_accessor :feature_name, :invocation
-end
+end

data/lib/skeleton/features/android/support/app_life_cycle_hooks.rb

@@ -1,13 +1,11 @@
 require 'calabash-android/management/adb'
 require 'calabash-android/operations'
 
-Before do |scenario|
+Before do
   start_test_server_in_background
 end
 
 After do |scenario|
-  if scenario.failed?
-    screenshot_embed
-  end
+  screenshot_embed if scenario.failed?
   shutdown_test_server
-end
+end

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

@@ -14,43 +14,34 @@
 
 require 'calabash-cucumber/launcher'
 
-# APP_BUNDLE_PATH = "~/Library/Developer/Xcode/DerivedData/??/Build/Products/Calabash-iphonesimulator/??.app"
-# You may uncomment the above to overwrite the APP_BUNDLE_PATH
-# However the recommended approach is to let Calabash find the app itself
-# or set the environment variable APP_BUNDLE_PATH
+Before do |scenario|
+  @calabash_launcher = Calabash::Cucumber::Launcher.new
 
-Before('@reinstall') do |scenario|
-  reinstall_app
-end
+  @scenario_is_outline =
+    (scenario.class == Cucumber::Ast::OutlineTable::ExampleRow)
+  scenario = scenario.scenario_outline if @scenario_is_outline
 
-Before do |scenario|
-  
-  # If the scenario is outline, to get the feature title we have to access a different attribute of the variable scenario,
-  # so this function changes the value of the scenario variable so we don't have to do this on the verification step below 
-  @scenario_is_outline = (scenario.class == Cucumber::Ast::OutlineTable::ExampleRow)
-  if @scenario_is_outline 
-    scenario = scenario.scenario_outline 
-  end
-  # Looks if is a new feature that will be executed
-  if ENV['FEATURE_NAME'] != scenario.feature.title # ENV['FEATURE_NAME'] is just an aux created to store the feature name
-    reinstall_app # always reinstall the app before a the execution of a new feature
+  scenario_tags = scenario.source_tag_names
+  # Resetting the app between scenarios
+  # ENV['FEATURE_NAME'] is just an aux created to store the feature name
+  if ENV['FEATURE_NAME'] != scenario.feature.title ||
+     ENV['RESET_BETWEEN_SCENARIOS'] == '1' ||
+     scenario_tags.include?('@reinstall')
+
+    @calabash_launcher.reset_app_jail
     ENV['FEATURE_NAME'] = scenario.feature.title
-  end 
+  end
 
-  @calabash_launcher = Calabash::Cucumber::Launcher.new
   unless @calabash_launcher.calabash_no_launch?
-    @calabash_launcher.relaunch({:timeout => 300})
+    @calabash_launcher.relaunch
     @calabash_launcher.calabash_notify(self)
   end
-
 end
 
-After do |scenario|
+After do
   unless @calabash_launcher.calabash_no_stop?
     calabash_exit
-    if @calabash_launcher.active?
-      @calabash_launcher.stop
-    end
+    @calabash_launcher.stop if @calabash_launcher.active?
   end
 end
 
@@ -60,81 +51,3 @@ at_exit do
     launcher.simulator_launcher.stop unless launcher.calabash_no_stop?
   end
 end
-
-# Install or reinstall the app on the device
-def reinstall_app
-
-  if !is_simulator? ENV['DEVICE_TARGET']
-
-    system "echo 'Installing the app...'"   
-
-    # Trying to reinstall the app
-    success = system "ios-deploy -r -b #{ENV['APP_BUNDLE_PATH']} -i #{ENV['DEVICE_TARGET']} -t 5 > /dev/null"
-
-    # If the app is not installed the above command will throw an error
-    # So we just install the app
-    if !success
-      success = system "ios-deploy -b #{ENV['APP_BUNDLE_PATH']} -i #{ENV['DEVICE_TARGET']} -t 5 > /dev/null"
-      if !success # If there is any error raises an exception
-        raise 'Error. Could not install the app.'
-      end
-    end
-
-    system "echo 'Installed.'"
-
-    sleep(3) # Gives to the iphone a time to finish the installation of the app
-  else # If test is in a simulator
-
-    # Shutdown all the booted simulators to avoid problems with the switch of simulatores
-    # on the automated tests (like when on jenkins)
-    shutdown_booted_simulators
-
-    # APP_BUNDLE_ID must be set in order to uninstall the app from the simulator
-    # You can either pass it as a parameter in the cucumber command or set it here
-    #ENV["APP_BUNDLE_ID"] = "bundle_id"
-
-    # Booting the device to avoid problems with the app installation
-    %x(open -a 'iOS Simulator' --args -CurrentDeviceUDID #{ENV['DEVICE_TARGET']} > /dev/null)
-    sleep(7)
-
-    # Reinstalling the app using terminal commands
-    system "echo 'Installing the app...'"
-    
-    # Removing the app
-    %x(xcrun simctl uninstall #{ENV['DEVICE_TARGET']} #{ENV['APP_BUNDLE_ID']} > /dev/null)
-
-    # Installing the app
-    %x(xcrun simctl install #{ENV['DEVICE_TARGET']} #{ENV['APP_BUNDLE_PATH']} > /dev/null)
-
-    system "echo 'Installed.'"
-
-  end
-
-end
-
-# Checks if the UUID belongs to a Device or a Simulator
-def is_simulator? uuid
-  # Check if UUID is from a device or a simulator
-  # Getting all the simulator's UUID
-  uuids = `xcrun simctl list`
-  return true if uuids.include? uuid
-  return false
-end
-
-# Kill all simulators process, lists all the booted simulators and shut them down
-def shutdown_booted_simulators
-
-  # Closing all Simulators running
-  %x(killall "iOS Simulator")
-  
-  # Listing all the booted devices
-  booted_simulators = `xcrun simctl list | grep 'Booted'`
-
-  # Getting the UUIDs
-  booted_simulators.split("\n").each do |simulator|
-    uuid = simulator.split("(")[1].gsub(")", "").gsub(" ","")
-    # Shuting the simulator down
-    %x(xcrun simctl shutdown #{uuid})
-  end
-    
-end

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

@@ -1,5 +1,5 @@
 if ENV['PLATFORM'] == 'ios'
- require 'calabash-cucumber/cucumber'
+  require 'calabash-cucumber/cucumber'
 elsif ENV['PLATFORM'] == 'android'
   require 'calabash-android/cucumber'
-end
+end

data/lib/templates/android_screen_base.tt

@@ -1,27 +1,27 @@
 require 'calabash-android/abase'
 
 class AndroidScreenBase < Calabash::ABase
-
   def self.element(element_name, &block)
     define_method(element_name.to_s, *block)
   end
 
   class << self
-    alias :value :element
-    alias :action :element
-    alias :trait :element
+    alias_method :value, :element
+    alias_method :action, :element
+    alias_method :trait, :element
   end
 
-  element(:loading_screen)      {"insert_loading_view_id"}
+  element(:loading_screen)      { 'insert_loading_view_id' }
 
   # The progress bar of the application is a custom view
   def wait_for_progress
-    wait_for_element_does_not_exist("* id:'#{loading_screen}'", { :timeout => 10 } )
+    sleep(2)
+    wait_for_element_does_not_exist("* id:'#{loading_screen}'",
+                                    timeout: 10)
   end
 
-  def drag_to direction
-
-    positions = [0,0,0,0] # [ 'from_x', 'to_x', 'from_y', 'to_y' ]
+  def drag_to(direction)
+    positions = [0, 0, 0, 0] # [ 'from_x', 'to_x', 'from_y', 'to_y' ]
 
     case(direction)
     when :<%= (I18n.translate "directions.down").to_sym %>
@@ -34,20 +34,22 @@ class AndroidScreenBase < Calabash::ABase
       positions = [20,90,80,80]
     end
 
-    # perform_action( 'action', 'from_x', 'to_x', 'from_y', 'to_y', 'number of steps (in this case, velocity of drag' )
-    perform_action('drag', positions[0], positions[1], positions[2], positions[3], 15)
-    
+    # perform_action( 'action', 'from_x', 'to_x', 'from_y', 'to_y',
+    # 'number of steps (in this case, velocity of drag' )
+    perform_action('drag', positions[0], positions[1],
+                   positions[2], positions[3], 15)
     sleep(1)
   end
 
-  def drag_until_element_is_visible_with_special_query direction, element
-    drag_until_element_is_visible direction, element, "* {text CONTAINS[c] '#{element}'}"
+  def drag_until_element_is_visible_with_special_query(direction, element)
+    drag_until_element_is_visible direction, element,
+                                  "* {text CONTAINS[c] '#{element}'}"
   end
 
-  def drag_until_element_is_visible direction, element, query = nil, limit = 15
+  def drag_until_element_is_visible(direction, element, query = nil, limit = 15)
     i = 0
 
-    element_query = ""
+    element_query = ''
     if query.nil?
       element_query = "* marked:'#{element}'"
     else
@@ -55,62 +57,73 @@ class AndroidScreenBase < Calabash::ABase
     end
 
     sleep(2)
-    while( !element_exists(element_query) and i < limit) do
+    while !element_exists(element_query) && i < limit
       drag_to direction
-      i = i + 1
+      i += 1
     end
 
-    raise ("Executed #{limit} moviments #{direction.to_s} and the element '#{element}' was not found on this view!") unless i < limit
+    fail "Executed #{limit} moviments #{direction} and "\
+          "the element '#{element}' was not found on this view!" unless
+      i < limit
   end
 
-  def drag_for_specified_number_of_times direction, times
+  def drag_for_specified_number_of_times(direction, times)
     times.times do
       drag_to direction
     end
   end
 
-  # Negation indicates that we want a page that doesn't has the message passed as parameter
-  def is_on_page? page_text, negation = ''
+  # Negation indicates that we want a page that doesn't
+  # has the message passed as parameter
+  def is_on_page?(page_text, negation = '')
     should_not_have_exception = false
     should_have_exception = false
     begin
       wait_for(timeout: 5) { has_text? page_text }
-      # If negation is not nil, we should raise an error if this message was found on the view
+      # If negation is not nil, we should raise an error
+      # if this message was found on the view
       should_not_have_exception = true unless negation == ''
     rescue
-      # only raise exception if negation is nil, otherwise this is the expected behaviour
+      # only raise exception if negation is nil,
+      # otherwise this is the expected behaviour
       should_have_exception = true if negation == ''
     end
 
-    raise "Unexpected Page. The page should not have: '#{page_text}'" if should_not_have_exception
+    fail "Unexpected Page. The page should not have: '#{page_text}'" if
+      should_not_have_exception
 
-    raise "Unexpected Page. Expected was: '#{page_text}'" if should_have_exception
+    fail "Unexpected Page. Expected was: '#{page_text}'" if
+      should_have_exception
   end
 
-  def enter text, element, query = nil
+  def enter(text, element, query = nil)
     if query.nil?
-      query( "* marked:'#{element}'", {:setText => text} )
+      query("* marked:'#{element}'", setText: text)
     else
-      query( query, {:setText => text} )
+      query(query, setText: text)
     end
   end
 
-  def touch_screen_element element, query = nil
+  def touch_screen_element(element, query = nil)
     query = "* id:'#{element}'" if query.nil?
-    wait_for(timeout: 5) { element_exists(query) }
-    touch(query)
-  end  
+    begin
+      wait_for(timeout: 5) { element_exists(query) }
+      touch(query)
+    rescue => e
+      raise "Problem in touch screen element: '#{element}'\nError Message: #{e.message}"
+    end
+  end
 
-  def touch_element_by_index id, index
-    wait_for(:timeout => 5) { element_exists("* id:'#{id}' index:#{index}") }
+  def touch_element_by_index(id, index)
+    wait_for(timeout: 5) { element_exists("* id:'#{id}' index:#{index}") }
     touch("* id:'#{id}' index:#{index}")
   end
 
-  def clear_text_field field
+  def clear_text_field(field)
     clear_text_in("android.widget.EditText id:'#{field}'}")
   end
 
-  def select_date_on_date_picker date, date_picker_field_id
+  def select_date_on_date_picker(date, date_picker_field_id)
     # Touch the date picker field
     touch "* id:'#{date_picker_field_id}'"
 
@@ -120,5 +133,4 @@ class AndroidScreenBase < Calabash::ABase
     # Clicking in the Done button
     touch "* id:'button1'"
   end
-
 end

data/lib/templates/ios_screen_base.tt

@@ -1,53 +1,32 @@
 require 'calabash-cucumber/ibase'
 
 class IOSScreenBase < Calabash::IBase
-
   def self.element(element_name, &block)
     define_method(element_name.to_s, *block)
   end
 
   class << self
-    alias :value :element
-    alias :action :element
-    alias :trait :element
+    alias_method :value, :element
+    alias_method :action, :element
+    alias_method :trait, :element
   end
 
   element(:loading_screen)            { 'LOADING' }
 
   # The progress bar of the application is a custom view
   def wait_for_progress
-    wait_for(:timeout => 10) { element_does_not_exist "* marked:'#{loading_screen}'" }
+    sleep(2)
+    wait_for(timeout: 10) { element_does_not_exist "* marked:'#{loading_screen}'" }
   end
 
   def has_text?(text)
-    !query("* {text CONTAINS[c] '#{text}'}").empty? or !query("* {accessibilityLabel CONTAINS[c] '#{text}'}").empty?
-  end
-
-  def drag_to direction
-
-    # iOS swipe command doesn't work.
-    # For a workaround we need to use the scroll function, but it only work after a swipe command
-
-    # iOS swipe :up and :down are the opposite of the Android directions
-    # Setting swipe_opt that will define the swipe 'force'
-    swipe_opt = nil
-    case direction
-    when :<%= (I18n.translate "directions.left").to_sym %>
-      direction = :left
-      swipe_opt = {:'swipe-delta' => {:horizontal=>{:dx => 280} }, :offset => { :x => 300, :y => 300 } }
-    when :<%= (I18n.translate "directions.right").to_sym %>
-      direction = :right
-      swipe_opt = {:'swipe-delta' => {:horizontal=>{:dx => 250} }, :offset => { :x => 50, :y => 300 } }
-    when :<%= (I18n.translate "directions.up").to_sym %>
-      direction = :down
-      swipe_opt = {:'swipe-delta' => {:vertical=>{:dy => 200} }, :offset => { :x => 160, :y => 100 } }
-    when :<%= (I18n.translate "directions.down").to_sym %>
-      direction = :up
-      swipe_opt = {:'swipe-delta' => {:vertical=>{:dy => 200} }, :offset => { :x => 160, :y => 400 } }
-    end
-
-    swipe(direction, swipe_opt)
+    !query("* {text CONTAINS[c] '#{text}'}").empty? ||
+      !query("* {accessibilityLabel CONTAINS[c] '#{text}'}").empty?
+  end
 
+  def drag_to(direction, element = nil)
+    element = 'tableView' if element.nil?
+    scroll(element, direction)
     sleep(1)
   end
 
@@ -55,79 +34,79 @@ class IOSScreenBase < Calabash::IBase
   # so this function looks for these two properties on the screen. When the query
   # looks for just a part of the text (CONTAINS[c]) then we need to specify if
   # we will look in accessibilityLabel or in any other propertie (marked)
-  def ios_element_exists? query
+  def ios_element_exists?(query)
     second_query = nil
 
-    if query.include? "CONTAINS[c]"
-      if query.include? "marked"
-        second_query = query.gsub( 'marked', 'accessibilityLabel' )
+    if query.include? 'CONTAINS[c]'
+      if query.include? 'marked'
+        second_query = query.gsub('marked', 'accessibilityLabel')
       end
-      if query.include? "accessibilityLabel"
-        second_query = query.gsub( 'accessibilityLabel', 'marked' )
+      if query.include? 'accessibilityLabel'
+        second_query = query.gsub('accessibilityLabel', 'marked')
       end
     end
 
     if second_query.nil?
       return element_exists(query)
     else
-      element_exists(query) or element_exists(second_query)
+      element_exists(query) || element_exists(second_query)
     end
   end
 
-  def drag_until_element_is_visible_with_special_query direction, element
-    drag_until_element_is_visible direction, element, "* {accessibilityLabel CONTAINS[c] '#{element}'}"
+  def drag_until_element_is_visible_with_special_query(direction, element)
+    drag_until_element_is_visible direction, element,
+                                  "* {accessibilityLabel CONTAINS[c] '#{element}'}"
   end
 
-  def drag_until_element_is_visible direction, element, query = nil, limit = 15
+  def drag_until_element_is_visible(direction, element, query = nil, limit = 15)
     i = 0
 
-    element_query = ""
-    if query.nil?
-      element_query = "* marked:'#{element}'"
-    else
-      element_query = query
-    end
+    query = "* marked:'#{element}'" if query.nil?
 
     sleep(1)
-    while( !ios_element_exists?(element_query) and i < limit) do
+    while !ios_element_exists?(query) && i < limit
       drag_to direction
-      i = i + 1
+      i += 1
     end
 
-    raise ("Executed #{limit} moviments #{direction.to_s} and the element '#{element}' was not found on this view!") unless i < limit
+    fail "Executed #{limit} moviments #{direction} and the "\
+         "element '#{element}' was not found on this view!" unless i < limit
   end
 
-  def drag_for_specified_number_of_times direction, times
+  def drag_for_specified_number_of_times(direction, times)
     times.times do
       drag_to direction
     end
   end
 
-  # Negation indicates that we want a page that doesn't has the message passed as parameter
+  # Negation indicates that we want a page that doesn't has
+  # the message passed as parameter
   def is_on_page?(page_text, negation = '')
     should_not_have_exception = false
     should_have_exception = false
     begin
       wait_for(timeout: 5) { has_text? page_text }
-      # If negation is not nil, we should raise an error if this message was found on the view
+      # If negation is not nil, we should raise an error
+      # if this message was found on the view
       should_not_have_exception = true unless negation == ''
     rescue
-      # only raise exception if negation is nil, otherwise this is the expected behaviour
+      # only raise exception if negation is nil,
+      # otherwise this is the expected behaviour
       should_have_exception = true if negation == ''
     end
 
-    raise "Unexpected Page. The page should not have: '#{page_text}'" if should_not_have_exception
+    fail "Unexpected Page. The page should not have: '#{page_text}'" if
+      should_not_have_exception
 
-    raise "Unexpected Page. Expected was: '#{page_text}'" if should_have_exception
+    fail "Unexpected Page. Expected was: '#{page_text}'" if
+      should_have_exception
   end
 
-  def enter text, element, query = nil
-    if query.nil?
-      query = "* marked:'#{element}'"
-    end
+  def enter(text, element, query = nil)
+    query = "* marked:'#{element}'" if query.nil?
 
     begin
-      wait_for(:timeout => 5) { element_exists query }
+      wait_for(timeout: 5) { element_exists query }
     rescue
       # Just a better exception message
       raise "Element '#{element}' not found on view!"
@@ -136,50 +115,69 @@ class IOSScreenBase < Calabash::IBase
     touch query
     # Waits up to 20 seconds for the keyboard to show up
     begin
-      wait_for(:timeout => 10) { element_exists("view:'UIKeyboardAutomatic'") }
+      wait_for(timeout: 10) { element_exists("view:'UIKeyboardAutomatic'") }
     rescue
-      # If the keyboard didn't show up, tries another time before rainsing the error message
+      # If the keyboard didn't show up, tries another time
+      # before rainsing the error message
       touch query
-      wait_for(:timeout => 5) { element_exists("view:'UIKeyboardAutomatic'") }
+      wait_for(timeout: 5) { element_exists("view:'UIKeyboardAutomatic'") }
     end
 
     keyboard_enter_text text
-    done
   end
 
-  def touch_screen_element element
+  def touch_screen_element(element, query = nil)
+    query = "* marked:'#{element}'" if query.nil?
     begin
-      wait_for(:timeout => 5) { element_exists("* marked:'#{element}'") }
-      touch "* marked:'#{element}'"
-    rescue
-      raise "Element #{element} not found on the view"
+      wait_for(timeout: 5) { element_exists(query) }
+      touch query
+    rescue => e
+      raise "Problem in touch screen element: '#{element}'\nError Message: #{e.message}"
     end
   end
 
-  def touch_element_by_index id, index
-    wait_for(:timeout => 5) { element_exists("* marked:'#{id}' index:#{index}") }
-    touch("* marked:'#{id}' index:#{index}")
+  def touch_element_by_index(id, index)
+    query = "* marked:'#{id}' index:#{index}"
+    wait_for(timeout: 5) { element_exists(query) }
+    touch(query)
   end
 
-  def clear_text_field field
+  def clear_text_field(field)
     clear_text("textField marked:'#{field}'")
   end
 
-  def select_date_on_date_picker date, date_picker_field_id
+  def select_date_on_date_picker(date, date_picker_field_id)
     # Touch the date picker element
     touch_screen_element date_picker_field_id
     # Waiting for the date picker to show up
     wait_for(timeout: 5) { element_exists("view:'UIDatePicker'") }
 
     # If date is today, then we have nothing to do
-    if date.year != DateTime.now.year || date.month != DateTime.now.month || date.day != DateTime.now.day
+    if date.year != DateTime.now.year ||
+       date.month != DateTime.now.month ||
+       date.day != DateTime.now.day
       # Selecting 'date' on the date picker
       picker_set_date_time date
     end
 
     # Touch the OK button
-    touch_screen_element  'Ok'
-    
+    touch_screen_element 'Ok'
   end
 
+  def touch_picker_item_by_index(index)
+    label = query('pickerView', :delegate,
+                  [{ pickerView: nil }, { titleForRow: index },
+                   { forComponent: 0 }])
+
+    # Exception if element no found
+    fail "Picker item index #{index} not found." if label.nil?
+    # Label is an array of 1 element. Just picking the first.
+    label = label.first
+
+    # Touching the first item using it's text and Javascript function
+    uia(%[uia.selectPickerValues('{0 "#{label}"}')])
+
+    # Touching the OK button to close the Picker
+    touch "* marked:'OK'"
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cs-bdd
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5
 platform: ruby
 authors:
 - Oscar Tanner
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-26 00:00:00.000000000 Z
+date: 2015-10-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -106,6 +106,7 @@ files:
 - lib/skeleton/README.md
 - lib/skeleton/config/cucumber.yml
 - lib/skeleton/config/email/template.html
+- lib/skeleton/config/load_classes.rb
 - lib/skeleton/config/scripts/android/run_tests_all_devices.sh
 - lib/skeleton/config/scripts/android/start_emulators.sh
 - lib/skeleton/config/scripts/android/stop_emulators.sh