cs-bdd 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e520c9c43c7d3a85a0caa2b8f9ab6a906de0e882
-  data.tar.gz: bf35813d182a41587e491050199114e8de3e0381
+  metadata.gz: 782f256dd4f8fe8b62f8958790dd3411383aee3e
+  data.tar.gz: 7eb26ef8870aa9dc2cd2853f4b2aefbc06c6a873
 SHA512:
-  metadata.gz: be9e5f19148f6d64b59cc4142a209168bd590f54a6ad5cb7674b9d9b691d543779d18717d71f878c0c9436d379bd469a3f9a5b487cc6ae58116200b31b430783
-  data.tar.gz: 241a8fd3ff44a757bb1e36a82a6d51c9b006740cef07839d5a560e9acc2220b850a90dab9d09651bc4e5ee53a83af9f73955c9d464834d244668b6c9b4128c84
+  metadata.gz: 233fa3aa05454750be186319d4d4078151a68a1ac9879e8bb763f422bc6437881edc02375f8431b829815c86ce557303de6aa6c602e0f1aa9b418ac389c81206
+  data.tar.gz: 39c35ee90e150fa6e086a6bb7bd6eeb235d030dccaaf4792e14f6d04804ed454f186b3c262e04ee68bb6ee1b73fbe24577aeafcfde3cc64847d4acbbf5346388

data/README.md

@@ -1,6 +1,6 @@
 # CS::BDD
 
-A simple gem to generate all the files needed to create a project that will support calabash for Android and iOS.
+A simple gem to generate all files needed in a project that will support calabash for both Android and iOS.
 
 [Calabash](http://calaba.sh/) uses cucumber to support functional tests in Android and iOS and has one gem for each Platform:
 
@@ -8,15 +8,15 @@ A simple gem to generate all the files needed to create a project that will supp
   
   > calabash-cucumber (for iOS) [(link)](https://github.com/calabash/calabash-ios)
 
-The project structure is based on [this site](http://rubygemtsl.com/2014/01/06/designing-maintainable-calabash-tests-using-screen-objects-2). This structure is based on three layers: the features, the steps and the screens.
+The project structure is based on [this site](http://rubygemtsl.com/2014/01/06/designing-maintainable-calabash-tests-using-screen-objects-2). The structure is based on three layers: features, steps and screens.
 
-  1. Features: Contains all the features of the project, this features are Platform independent and will run when testing both Android and iOS;
-  2. Steps: Contains all the steps implementation of the features. This steps are Platform independent and will run when testing both Android and iOS;
-  3. Screens: Contains all the screens definition. A screen definition must contain an identification, the declaration of all the elements of the screen and the declaration of its actions. This layer is Platform dependent. This occurs because, in almost every project, the identification of the elements of the screens varies between the Platforms. One example is that in Android almost all elements have an id, but in iOS is most common to identify the elements by accessibility label. The Platform dependent screens must has the same name and same methods. This will allow your steps to be unique between platforms
+  1. Features: Contains all the features of the project, this features are Platform independent and will run for Android and iOS tests;
+  2. Steps: Contains all the steps implementations. This steps are Platform independent and will run for Android and iOS tests;
+  3. Screens: Contains all the Android and iOS screens. A screen must contain an identification, the declaration of all the elements of the screen and the declaration of its actions. This layer is Platform dependent. This occurs because, in almost every project, the identification of the elements varies between the Platforms. One example is that in Android almost all elements have an id, but in iOS the most common is to identify the elements by accessibility label. The Platform dependent screens must have the same name and same methods signatures. This will allow your steps to be unique between platforms
 
   > One example of this structure can be found in the generated files (see Usage) on the file base_steps.rb. This file implements some common steps to help you start your tests and show you how to uses the Platform dependent screens
   
-  > In my experience with tests I saw some cases that we will need to test features that are Platform dependent, like screens that send SMS which will only happen in Android. For this to happen, the generated structure has Features and Steps that are Platform dependent and can be found inside the folder `features/android` and `features/ios` of the generated project.
+  > In my experience with tests I saw some cases that we will need to test features that are Platform dependent, like screens that send SMS which will only apper in Android apps. When this happen, the generated structure has Features and Steps that are Platform dependent and can be found inside the folder `features/android` and `features/ios` of the generated project.
 
 ## Installation
 
@@ -26,7 +26,7 @@ Install it as:
 
 ## Usage
 
-This gem works only in the terminal, so for help, type:
+In the terminal, type for help:
 
 ```
   cs-bdd
@@ -39,70 +39,89 @@ To see the gem version type:
   cs-bdd version
 ```
 
-To generate a structure of one project that can support both Android and iOS features for Calabash type:
+To generate a project that support both Android and iOS features type:
 
 ```
   cs-bdd new ProjectName
 ```
 
-This command will create a folder named ProjectName in the current directory and will create all the files needed. This gem support localizations. To create a localized project, in Portuguese, type:
+This command will create a folder named ProjectName in the current directory and will create all the needed files. This gem support localizations. To create a localized project, in Portuguese, type:
 
 ```
   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 the generators accept only a little quantity of languages(see than in the folder: `lib/cs/bdd/locales`). 
+  > 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`). 
   
-  > **CS-BDD doesn't support your mother language?** No problem make a fork, 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.
+  > **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 know how to identify your yml file?** See the Gherkin supported languages [here](https://github.com/cucumber/gherkin/blob/master/lib/gherkin/i18n.json).
+  > **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.
 
-Once the project is created, opens the folder (`cd ProjectName`). 
+Once the project is created, open its folder (`cd ProjectName`). 
+
+
+**The generators commands ONLY WORK in the ROOT FOLDER of the project**.
 
-> **The generators commands ONLY WORK in the ROOT FOLDER of the project**.
 
 There are nine generators that are responsible to create the templates for Features, Step definitions and Screens.
 
-For Features you can type:
+####Features
 
 ```
   cs-bdd generate feature FeatureName
+```
+The feature generator will create a Platform independent feature and its files. So this command will create the FeatureName.feature file inside the folder `feature`, the file FeatureName_steps.rb inside the folder `features/step_definitions`, the files FeatureName_screen.rb inside the folders `features/android/screens` and `features/ios/screens`.
+  
+  
+```
   cs-bdd generate aFeature AndroidFeatureName
   cs-bdd generate iFeature iOSFeatureName
 ```
+The aFeature and iFeature generator will create an Platform dependent feature. For example, the aFeature generator will create the AndroidFeatureName.feature file inside the folder `features/android/features`, the file AndroidFeatureName_steps.rb inside the folder `features/androd/step_definitions` and the screen file AndroidFeatureName_screen.rb inside the folder `features/android/screens`.
 
-  > The feature generator will create a Platform independent feature and its files. So this command will create the FeatureName.feature file in the folder `feature`, the file FeatureName_steps.rb in the folder `features/step_definitions`, the the files FeatureName_screen.rb in the folders `features/android/screens` and `features/ios/screens`.
-
-  > The aFeature and iFeature generator will create and Platform dependent feature so, for example, the aFeature generator will create the AndroidFeatureName.feature file in the folder `features/android/features`, the file AndroidFeatureName_steps.rb in the folder `features/androd/step_definitions` and the screen file AndroidFeatureName_screen.rb in the folder `features/android/screens`.
 
 Don't forget about internationalization. All the generators accept the option `--lang=pt` or with some other language.
 
-For Steps definitions you can type:
+####Steps
 
 ```
   cs-bdd generate step StepName
+```
+The step generator will create a Platform independent step file named StepName_steps.rb in the folder `features/step_definitions`
+
+  
+```
   cs-bdd generate aStep AndroidStepName
+```
+The aStep generator will create an Android step file named AndroidStepName_steps.rb in the folder `features/android/step_definitions`
+
+
+```
   cs-bdd generate iStep iOSStepName
 ```
+The iStep generator will create an iOS step file name iOSStepName_steps.rb in the folder `features/ios/step_definitions`
+
 
-  > The step generator will create a Platform independent step file named StepName_steps.rb in the folder `features/step_definitions`
-  
-  > The aStep generator will create an Android step file named AndroidStepName_steps.rb in the folder `features/android/step_definitions`
-  
-  > The iStep generator will create an iOS step file name iOSStepName_steps.rb in the folder `features/ios/step_definitions`
 
-For Screens type:
+####Screens
 
 ```
   cs-bdd generate screen ScreenName
+```
+The screen generator will create both Platform dependent screens in the folders `features/android/screens` and `features/ios/screens`.
+
+
+```
   cs-bdd generate aScreen AndroidScreenName
   cs-bdd generate iScreen iOSScreenName
 ```
+The aScreen and iScreen will create only the Android and iOS dependent screens respectively.
 
-  > The screen generator will create both Platform dependent screens in the folders `features/android/screens` and `features/ios/screens`.
-  
-  > The aScreen and iScreen will create only the Android and iOS dependent screens respectively.
+## Continuous Integration (CI)
+
+The project contains a lot of scripts that will help you to configure you CI server.
 
+> Documentation under development.
 
 ## Contributing
 
@@ -110,4 +129,4 @@ For Screens type:
 2. Create your feature branch (`git checkout -b my-new-feature`)
 3. Commit your changes (`git commit -am 'Add some feature'`)
 4. Push to the branch (`git push origin my-new-feature`)
-5. Create a new Pull Request
+5. Create a new Pull Request

data/bin/cs-bdd

@@ -122,7 +122,14 @@ module CS
         directory File.join( File.dirname(__FILE__), '..', 'lib', 'skeleton' ), name
 
         # Copying base steps file with localization
-        template( "base_steps", File.join(name, 'features', 'step_definitions', 'base_steps.rb') )
+        template( "base_steps", File.join(name, 'features', 'step_definitions', 'base_steps.rb' ) )
+
+        # Copying android screen base file with localization
+        template( "android_screen_base", File.join(name, 'features', 'android', 'android_screen_base.rb' ) )
+
+        # Copying ios screen base file with localization
+        template( "ios_screen_base", File.join(name, 'features', 'ios', 'ios_screen_base.rb' ) )
+
       end
 
       desc "version", "Shows the gem version"
@@ -156,4 +163,4 @@ module CS
   end
 end
 
-CS::BDD::CsBddRunner.start
+CS::BDD::CsBddRunner.start

data/cs-bdd.gemspec

@@ -18,9 +18,10 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
-  spec.add_development_dependency "bundler", "~> 1.7"
-  spec.add_development_dependency "rake", "~> 10.0"
-  spec.add_development_dependency "thor", "~> 0.19.1"
-  spec.add_development_dependency "i18n", "~> 0.6.11"
-  spec.add_development_dependency "gherkin", "~> 2.12.2"
+  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/locales/en.yml

@@ -8,11 +8,16 @@ en:
     elements: "Declare all the elements of this screen"
     actions: "Declare all actions of this screen"
   steps:
-    drag_until: "I (?:drag|dragged) the screen (down|up|left|right) until I see the element"
-    page_contains: "I am on a page that contains"
+    drag_until: 'I (?:drag|dragged) the screen (down|up|left|right) until I see the element "(.*?)"'
+    page_contains: "I am on a page that contains '(.*?)'"
     drag_number_of_times: 'I drag the screen (left|right|down|up) (\d+) times'
     touch_element: 'I (?:touch|touched) the "(.*?)" element'
     drag_screen: "I drag the screen (down|up|left|right)"
     wait_progress_bar: "I (?:wait|waited) for the progress bar to vanish"
-    should_see_page: "I should see the page"
-    should_see_page_that_contains: "I should see a page that contains"
+    should_see_page: "I should see the page '(.*?)'"
+    should_see_page_that_contains: "I should see a page that contains '(.*?)'"
+  directions:
+    up: 'up'
+    down: 'down'
+    left: 'left'
+    right: 'right'

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

@@ -8,11 +8,16 @@ pt:
     elements: "Declare todos os elementos da tela"
     actions: "Declare todas as ações 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"
+    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 '(.*?)'"
     drag_number_of_times: 'Eu arrasto a tela para (esquerda|direita|baixo|cima) (\d+) vezes'
     touch_element: 'Eu (?:clico|cliquei) no elemento "(.*?)"'
     drag_screen: "Eu arrasto a tela para (baixo|cima|esquerda|direita)"
-    wait_progress_bar: "Eu (?:espero|esperei) até a barar de progresso sumir"
-    should_see_page: "Eu deveria ver a página"
-    should_see_page_that_contains: "Eu deveria ver uma página que contem"
+    wait_progress_bar: "Eu (?:espero|esperei) até a barra de progresso sumir"
+    should_see_page: "Eu deveria ver a página '(.*?)'"
+    should_see_page_that_contains: "Eu deveria ver uma página que contem '(.*?)'"
+  directions:
+    up: 'cima'
+    down: 'baixo'
+    left: 'esquerda'
+    right: 'direita'

data/lib/cs/bdd/version.rb

@@ -1,5 +1,5 @@
 module CS
   module BDD
-    VERSION = "0.1.1"
+    VERSION = "0.1.2"
   end
 end

data/lib/skeleton/README.md

@@ -24,14 +24,13 @@
   Install the following gems
 
   ```
-  gem install calabash-common
-  gem install calabash-android
+  gem install calabash-common calabash-android
   ```
 
   **Warning!**
   
-  The command **`gem install calabash-android`** installs the beta version of the cucumber gem.
-  This gem brokes the execution of the calabash. After the installation of calabash-android, install the stable version of the cucumber gem (command: `gem install cucumber`) and remove the beta version (command: `gem uninstall cucumber`).
+  The gem **`calabash-android`** can install the beta version of the cucumber gem.
+  This gem brokes the execution of the calabash. After the installation of calabash-android, check your installed gems with the command `gem list | grep cucumber` and install the stable version of the cucumber gem (command: `gem install cucumber`) and remove the beta version (command: `gem uninstall cucumber`), if that is the case.
 
 ## Running the tests
   To run the android tests, you need to:
@@ -96,8 +95,7 @@ To open the calabash terminal, you need to:
   Install the following gems
 
   ```
-  gem install calabash-common
-  gem install calabash-cucumber
+  gem install calabash-common calabash-cucumber
   ```
   
 ## Configuring the iOS project

data/lib/skeleton/config/email/template.html

@@ -0,0 +1,16 @@
+<html>
+  <head>
+    <meta charset="UTF-8">
+    <title>Project Name - BDD _OS_ - _STATUS_TITLE_</title>
+  </head>
+  <body>
+    <center>
+    <font face="Trebuchet MS" size="3">
+      <h1>Continuous Integration</h1>
+        <h2>Job Status: _JOB_NAME_, build number: #_BUILD_NUMBER_</h2>
+        Hello. I'm here to let you know that the tests <strong>_STATUS_</strong>.<br>
+        To view the reports, click <a href="http://jenkins_url/reports/_JOB_NAME_/_BUILD_NUMBER_">here.</a><br>
+    </font>
+    </center>
+  </body>                                                                                                                                  
+</html>

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

@@ -4,32 +4,38 @@
 # set -x
 #
 # $1 -> parameter with the name of the apk
-
+# $2 -> parameter to indicates the tapume to run. Can be null and can have other 2 values: must or should
 
 ## CODE BEGIN  #############################################################
-[ $# -ne 1 ] && echo "Wrong number of parameters." && exit 1
+[ $# -lt 1 ] && echo "Wrong number of parameters." && exit 1
+
+# Counting the number of lines returned from the command adb devices
+# This command will return at least 2 as result, because of one header line and one empty line at end
+# So if the result is less than or equal 2, it means that there are no devices or emulators connected
+number_of_devices=$(adb devices | wc -l)
+[ $number_of_devices -le 2 ] && echo "There are no devices or emulators connected!" && exit 1
 
 echo Inicio da execução: $(date)
 
-reports_path="/var/www/html/reports/$(date +"%Y%d%m")"
+# Creating the reports folder for the html format
+reports_path="$WORKSPACE/reports-cal"
+mkdir $reports_path
 
 for device in $(adb devices | grep "device$" | cut -f 1)
 do
-  rm -r "$reports_path"/"$device" &> /dev/null
-  mkdir -p "$reports_path"/"$device" &> /dev/null
-  echo $device | grep -q emulator
-  # SET THE IGNORE TAGS TRUE IF THE TEST ARE RUNNING IN A DEVICE
-  [ $? -ne 0 ] && ignore='--tags ~@ignore_if_test_in_device'
   cd $WORKSPACE
-  ADB_DEVICE_ARG=$device SCREENSHOT_PATH="$reports_path"/"$device"/ calabash-android run $1 -p android --format 'Calabash::Formatters::Html' --out "$reports_path"/"$device"/reports.html $ignore &
+  # Creates the reports folder
+  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"
+      # 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
+  }&
+
 done
 wait
 
-# 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
-for device in $(adb devices | grep "device$" | cut -f 1)
-do
-  sed -i 's|'"$reports_path"/"$device"/'||g' "$reports_path"/"$device"/reports.html
-done
 echo Fim da execução: $(date)
 ## CODE END  #############################################################

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

@@ -0,0 +1,52 @@
+#!/bin/bash
+# Author: Victor Nascimento
+
+bash stop_emulators.sh 
+
+# Suffix name of the AVD
+SUFFIX="CALABASH_AVD_4."
+
+# All $SUFFIX emulators are started
+for AVD in ${HOME}/.android/avd/${SUFFIX}*.avd
+do
+    # remove any locks that were left
+    rm "$AVD/*.lock" 2> /dev/null
+    # takes only the name of the AVD
+    echo $AVD
+    AVD="$(basename ${AVD/.avd/})" 
+    echo starting "$AVD"... 
+    emulator -gpu on -noaudio -scale 0.5 -no-boot-anim -accel on -avd "$AVD" -qemu -m 1024 -enable-kvm &
+done
+
+sleep 15
+# lists all emulators with adb and check for its online state
+
+# finds the port through adb emulator name
+for porta in $(adb devices -l | grep ^emulator | cut -d " " -f 1 | cut -d - -f 2)
+do
+    echo Searching for emulator PID for port: ${porta}
+    pid=$(netstat -tlnp 2> /dev/null | grep "$porta" | tr -s " " | cut -d " " -f 7 | cut -d "/" -f 1)
+    echo gets the AVD name from the exec command
+    avd=$(ps -ef | grep -v grep | grep "$pid" | egrep -o '\-avd .*' | cut -d " " -f 2)
+    echo AVD: ${avd}
+    # if name contains suffix
+    if echo "$avd" | grep -q "$SUFFIX"
+    then
+	echo Waiting for "emulator-${porta}:${avd}" to be ready
+
+	# Wait for online state with maximum 60 tries
+	COUNT=0
+	
+	while adb -s "emulator-${porta}" shell getprop dev.bootcomplete | grep -q error 
+	do
+	    if [ "$COUNT" -eq 60 ]
+	    then
+		echo "Emulator took too long to start up"
+		exit 1
+	    fi
+
+	    let COUNT++
+	    sleep 1
+	done
+    fi
+done

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

@@ -0,0 +1,13 @@
+#!/bin/bash
+# Author: Victor Nascimento
+
+SUFFIX=CALABASH_AVD_4.
+
+for AVD in $HOME/.android/avd/${SUFFIX}*.avd
+do 
+    AVD="$(basename ${AVD/.avd/})" 
+    echo chuck killing "$AVD"... 
+    pkill -9 -f "$AVD"
+done
+
+

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

@@ -0,0 +1,6 @@
+# Looking for errors on the report files and returns an error
+if [ $TESTS_RESULT == "Failed" ] 
+then
+    echo "Setting build as failed"
+    exit 1
+fi

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

@@ -0,0 +1,13 @@
+# Looking for errors on the report files and returns an error
+cd "$WORKSPACE/reports-cal"
+export TESTS_RESULT=""
+for folder in *
+do
+    if egrep '\([0-9]+ passed\)' "$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/build_app.sh

@@ -9,6 +9,7 @@
 #       When this script was created the available sdks were: 'iphoneos8.1' for 
 #       devices and iphonesimulator8.1 for simulator
 # $4 -> Configuration type. Ex.: 'Dev'
+# $5 -> The path to save the .app bundle
 
 ## CODE BEGIN  #############################################################
 
@@ -17,22 +18,25 @@
 # building problems
 # pod install
 
-[ $# -ne 4 ] && echo "Wrong number of parameters." && exit 1
+[ $# -ne 5 ] && echo "Wrong number of parameters." && exit 1
 
-echo "Building project for calabash"
+echo Inicio da execução: $(date)
+
+# Creating .app bundle path folder if it doesn't exists
+mkdir -p "$5"
 
-xcodebuild -workspace "$1" -scheme "$2" -sdk "$3" -configuration "$4" clean build
+# Changing relative to absolute path if that is the case
+original_path="$(pwd)" # Saving the original path where the command was executed
+cd "$5"
+path="$(pwd)"
+cd "$original_path" # Going back to the original path
 
-BUILT_PRODUCTS_DIR=`xcodebuild -workspace "$1" -scheme "$2" -sdk "$3" -showBuildSettings -configuration "$4" | 
-                    grep -i "\bbuilt_products_dir" | 
-                    cut -d "=" -f2 `
+echo "Building project for calabash"
 
-export APP_BUNDLE_PATH=`echo "$BUILT_PRODUCTS_DIR/$2.app" | 
-                        sed 's/^\ *//g' |
-                        sed 's/\ *$//g'`
+xcodebuild -workspace "$1" -scheme "$2" -sdk "$3" -configuration "$4" clean build CONFIGURATION_BUILD_DIR="$path"
 
-echo $APP_BUNDLE_PATH
+echo "APP_BUNDLE_PATH=$path/$2.app"
 
 echo End: $(date)
 echo 'Bye!'
-## CODE END  #############################################################
+## CODE END  #############################################################

data/lib/skeleton/config/scripts/ios/devices.txt

@@ -0,0 +1,4 @@
+# <DEVICE_TARGET (UUID)> | <DEVICE_ENDPOINT (IP)> | <DEVICE_NAME> | <DEVICE_TYPE> (Simulator or Device)
+000...000 | http://localhost:37265 | Device0 | Simulator
+111...111 | http://1.1.1.1:37265 | Device1 | Device
+# EOF - Never erase this comment or the script will have problems to read this file

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

@@ -3,45 +3,54 @@
 # Uncomment the next line to enable debug
 # set -x
 #
-# $1 -> parameter with the path of the .app bundle
+# $1 -> parameter with the path of the .app bundle for simulators
+# $2 -> parameter with the path of the .app bundle for devices
 
 ## CODE BEGIN  #############################################################
 
 echo Start: $(date)
 
 # Exits if the app path was not informed
-if [ -z $1 ]; then
-  echo "The first parameter must be the app path"
-  exit 1
-fi
-
-# Remember to install an application server to enable remote access to the reports
-# Remember to previous create the reports folder and give the appropriate permissions
-reports_path="/var/www/reports/$(date +"%Y%d%m")"
-
-# Reads the devices file line by line
-while read line
-do
-  # Ignoring all comments
-  echo $line | grep -q "^#" && continue
-
-  # Reading the informations of the device in the devices file
-  # The variables can't contain any kind of spaces, so we erase then off
-  target="$(echo $line | cut -d'|' -f1 | tr -d ' ')"
-  endpoint="$(echo $line | cut -d'|' -f2 | tr -d ' ')"
-  name="$(echo $line | cut -d'|' -f3 | tr -d ' ')"
-
-  # Cleaning the previous reports folder and ensuring its existence
-  rm -r "$reports_path"/"$name" &> /dev/null
-  mkdir -p "$reports_path"/"$name" &> /dev/null
-
-  # Navigating to the tests root folder
-  cd "$WORKSPACE"
-
-  # Executing calabash for the device
-  APP_BUNDLE_PATH="$1" DEVICE_TARGET="$target" DEVICE_ENDPOINT="$endpoint" SCREENSHOT_PATH="$reports_path"/"$name"/ cucumber -p ios --format 'Calabash::Formatters::Html' --out "$reports_path"/"$name/reports.html"
-
-done < config/scripts/ios/devices
+[ $# -lt 2 ] && echo "Wrong number of parameters." && exit 1
+
+# Creating the reports path
+reports_path="$WORKSPACE/reports-cal"
+mkdir $reports_path
+
+# Changing relative to absolute path if that is the case
+# The simulator path
+original_path="$(pwd)" # Saving the original path where the command was executed
+cd "$1"
+SIMULATOR_APP_PATH="$(pwd)"
+# The device path
+cd "$original_path"
+cd "$2"
+DEVICE_APP_PATH="$(pwd)"
+
+cd $WORKSPACE # All tests should run from the root folder of the tests project
+
+cat config/scripts/ios/devices.txt |  ## Reading the devices.txt file
+grep -v "#" | ## Removing the command lines
+tr -d " " | ## Trimming all the spaces
+while IFS='|' read UUID IP NAME TYPE ## Defining pipe as the separator char and reading the three variable fields
+do 
+    # Creating the report folder for this device or simulator
+    mkdir "$reports_path"/"$NAME"
+
+    if [ $TYPE == "Simulator" ]
+    then
+	APP_PATH=$SIMULATOR_APP_PATH
+    else
+	APP_PATH=$DEVICE_APP_PATH
+    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"
+
+    # 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"/"$NAME"/'||g' "$reports_path"/"$NAME"/reports.html
+done
 
 echo End: $(date)
 echo 'Bye!'

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

@@ -64,10 +64,9 @@ end
 # Install or reinstall the app on the device
 def reinstall_app
 
-  # If test is in a device
-  if( !ENV['APP_BUNDLE_PATH'].include?( "iphonesimulator" ) )
+  if !is_simulator? ENV['DEVICE_TARGET']
 
-    system( "echo 'Installing the app...'" )  
+    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"
@@ -81,29 +80,61 @@ def reinstall_app
       end
     end
 
-    system( "echo 'Installed.'" )
+    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)
+    %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...'" )
+    system "echo 'Installing the app...'"
     
     # Removing the app
-    %x(xcrun simctl uninstall #{ENV['DEVICE_TARGET']} #{ENV["APP_BUNDLE_ID"]} > /dev/null)
+    %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.'" )
+    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/android/android_screen_base.rb → templates/android_screen_base.tt}

@@ -2,8 +2,8 @@ require 'calabash-android/abase'
 
 class AndroidScreenBase < Calabash::ABase
 
-  def self.element element_name
-    define_method element_name.to_s
+  def self.element(element_name, &block)
+    define_method(element_name.to_s, *block)
   end
 
   class << self
@@ -16,7 +16,7 @@ class AndroidScreenBase < Calabash::ABase
 
   # The progress bar of the application is a custom view
   def wait_for_progress
-    wait_for_element_does_not_exist(loading_screen)
+    wait_for_element_does_not_exist("* id:'#{loading_screen}'", { :timeout => 10 } )
   end
 
   def drag_to direction
@@ -24,13 +24,13 @@ class AndroidScreenBase < Calabash::ABase
     positions = [0,0,0,0] # [ 'from_x', 'to_x', 'from_y', 'to_y' ]
 
     case(direction)
-    when :down
+    when :<%= (I18n.translate "directions.down").to_sym %>
       positions = [30,30,60,30]
-    when :up
+    when :<%= (I18n.translate "directions.up").to_sym %>
       positions = [80,80,60,90]
-    when :left
+    when :<%= (I18n.translate "directions.left").to_sym %>
       positions = [90,20,80,80]
-    when :right
+    when :<%= (I18n.translate "directions.right").to_sym %>
       positions = [20,90,80,80]
     end
 
@@ -69,12 +69,15 @@ class AndroidScreenBase < Calabash::ABase
     end
   end
 
-  def is_on_page? page_text
-
+  # Negation indicates that we want a page that doesn't has the message passed as parameter
+  def is_on_page? page_text, negation = ''
     begin
-      wait_for(:timeout => 5) { has_text? page_text }
+      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
+      raise "Unexpected Page. The page should not have: '${page_text}'" unless negation == ""
     rescue
-      raise "Unexpected Page. Expected was: '#{page_text}'"
+      # only raise exception if negation is nil, otherwise this is the expected behaviour
+      raise "Unexpected Page. Expected was: '#{page_text}'" if negation == ""
     end
   end
 
@@ -86,9 +89,30 @@ class AndroidScreenBase < Calabash::ABase
     end
   end
 
+  def touch_screen_element element, query = nil
+    query = "* id:'#{element}'" if query.nil?
+    wait_for(timeout: 5) { element_exists(query) }
+    touch(query)
+  end  
+
   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
+    clear_text_in("android.widget.EditText id:'#{field}'}")
+  end
+
+  def select_date_on_date_picker date, date_picker_field_id
+    # Touch the date picker field
+    touch "* id:'#{date_picker_field_id}'"
+
+    # Setting the date
+    set_date 'DatePicker', date.year, date.month, date.day
+
+    # Clicking in the Done button
+    touch "* id:'button1'"
+  end
+
 end

data/lib/templates/base_steps.tt

@@ -1,9 +1,9 @@
 ######### <%= I18n.translate( :given ).upcase %> #########
-<%= I18n.translate( :given ).capitalize %>(/^<%= I18n.translate( "steps.drag_until" ) %> "(.*?)"$/) do |direction, element|
+<%= I18n.translate( :given ).capitalize %>(/^<%= I18n.translate( "steps.drag_until" ) %>$/) do |direction, element|
   @page.drag_until_element_is_visible_with_special_query direction.to_sym, element
 end
 
-<%= I18n.translate( :given ).capitalize %>(/^<%= I18n.translate( "steps.page_contais" ) %> '(.*?)'$/) do |page_text|
+<%= I18n.translate( :given ).capitalize %>(/^<%= I18n.translate( "steps.page_contais" ) %>$/) do |page_text|
   @page.is_on_page? page_text
 end
 
@@ -29,10 +29,10 @@ end
   @page.wait_for_progress
 end
 
-<%= I18n.translate( :then ).capitalize %>(/^<%= I18n.translate "steps.should_see_page" %> '(.*?)'$/) do |page_text|
+<%= I18n.translate( :then ).capitalize %>(/^<%= I18n.translate "steps.should_see_page" %>$/) do |page_text|
   @page.is_on_page? page_text
 end
 
-<%= I18n.translate( :then ).capitalize %>(/^<%= I18n.translate "steps.should_see_page_that_contains" %> '(.*?)'$/) do |page_text|
+<%= I18n.translate( :then ).capitalize %>(/^<%= I18n.translate "steps.should_see_page_that_contains" %>$/) do |page_text|
   @page.is_on_page? page_text
 end

data/lib/{skeleton/features/ios/ios_screen_base.rb → templates/ios_screen_base.tt}

@@ -16,7 +16,7 @@ class IOSScreenBase < Calabash::IBase
 
   # The progress bar of the application is a custom view
   def wait_for_progress
-    wait_for { element_does_not_exist "* marked:'#{loading_screen}'" }
+    wait_for(:timeout => 10) { element_does_not_exist "* marked:'#{loading_screen}'" }
   end
 
   def has_text?(text)
@@ -32,14 +32,16 @@ class IOSScreenBase < Calabash::IBase
     # Setting swipe_opt that will define the swipe 'force'
     swipe_opt = nil
     case direction
-    when :left
+    when :<%= (I18n.translate "directions.left").to_sym %>
+      direction = :left
       swipe_opt = {:'swipe-delta' => {:horizontal=>{:dx => 280} }, :offset => { :x => 300, :y => 300 } }
-    when :right
+    when :<%= (I18n.translate "directions.right").to_sym %>
+      direction = :right
       swipe_opt = {:'swipe-delta' => {:horizontal=>{:dx => 250} }, :offset => { :x => 50, :y => 300 } }
-    when :up
+    when :<%= (I18n.translate "directions.up").to_sym %>
       direction = :down
       swipe_opt = {:'swipe-delta' => {:vertical=>{:dy => 200} }, :offset => { :x => 160, :y => 100 } }
-    when :down
+    when :<%= (I18n.translate "directions.down").to_sym %>
       direction = :up
       swipe_opt = {:'swipe-delta' => {:vertical=>{:dy => 200} }, :offset => { :x => 160, :y => 400 } }
     end
@@ -101,11 +103,15 @@ class IOSScreenBase < Calabash::IBase
     end
   end
 
-  def is_on_page? page_text
+  # Negation indicates that we want a page that doesn't has the message passed as parameter
+  def is_on_page?(page_text, negation = '')
     begin
-      wait_for(:timeout => 5) { has_text? page_text }
+      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
+      raise "Unexpected Page. The page should not have: '${page_text}'" unless negation == ""
     rescue
-      raise "Unexpected Page. Expected was: '#{page_text}'"
+      # only raise exception if negation is nil, otherwise this is the expected behaviour
+      raise "Unexpected Page. Expected was: '#{page_text}'" if negation == ""
     end
   end
 
@@ -114,8 +120,23 @@ class IOSScreenBase < Calabash::IBase
       query = "* marked:'#{element}'"
     end
 
+    begin
+      wait_for(:timeout => 5) { element_exists query }
+    rescue
+      # Just a better exception message
+      raise "Element '#{element}' not found on view!"
+    end
+
     touch query
-    sleep(1)
+    # Waits up to 20 seconds for the keyboard to show up
+    begin
+      wait_for(:timeout => 10) { element_exists("view:'UIKeyboardAutomatic'") }
+    rescue
+      # 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'") }
+    end
+
     keyboard_enter_text text
     done
   end
@@ -134,4 +155,25 @@ class IOSScreenBase < Calabash::IBase
     touch("* marked:'#{id}' index:#{index}")
   end
 
-end
+  def clear_text_field field
+    clear_text("textField marked:'#{field}'")
+  end
+
+  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
+      # Selecting 'date' on the date picker
+      picker_set_date_time date
+    end
+
+    # Touch the OK button
+    touch_screen_element  'Ok'
+    
+  end
+
+end

data/lib/templates/screen.tt

@@ -1,7 +1,7 @@
 class <%= config[:name] %>Screen < <%= config[:platform] %>ScreenBase
 
   # <%= I18n.translate 'comments.trait' %>
-  #trait(:trait)                 { "* marked:'#{layout_name}'" }
+  #trait(:trait)                 { "* <%= (config[:platform] == 'Android') ? 'id' : 'marked' %>:'#{layout_name}'" }
 
   # <%= I18n.translate 'comments.elements' %>
   #element(:layout_name)         {'insert_layout_identificator'}
@@ -9,7 +9,7 @@ class <%= config[:name] %>Screen < <%= config[:platform] %>ScreenBase
 
   # <%= I18n.translate 'comments.actions' %>
   # action(:touch_button) {
-  #   touch("* marked:'#{button}'")
+  #   touch("* <%= (config[:platform] == 'Android') ? 'id' : 'marked' %>:'#{button}'")
   # }
 
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cs-bdd
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Oscar Tanner
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-25 00:00:00.000000000 Z
+date: 2015-01-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -17,7 +17,7 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.7'
-  type: :development
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
@@ -31,7 +31,7 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '10.0'
-  type: :development
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
@@ -45,7 +45,7 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.19.1
-  type: :development
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
@@ -59,7 +59,7 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.6.11
-  type: :development
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
@@ -73,7 +73,7 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 2.12.2
-  type: :development
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
@@ -104,24 +104,31 @@ files:
 - lib/skeleton/.gitignore
 - lib/skeleton/README.md
 - lib/skeleton/config/cucumber.yml
+- lib/skeleton/config/email/template.html
 - 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
+- lib/skeleton/config/scripts/break_build_if_failed.sh
+- lib/skeleton/config/scripts/check_if_tests_failed.sh
 - lib/skeleton/config/scripts/ios/build_app.sh
-- lib/skeleton/config/scripts/ios/devices
+- lib/skeleton/config/scripts/ios/devices.txt
 - lib/skeleton/config/scripts/ios/run_tests_all_devices.sh
-- lib/skeleton/features/android/android_screen_base.rb
 - lib/skeleton/features/android/features/.gitkeep
+- lib/skeleton/features/android/screens/.gitkeep
 - lib/skeleton/features/android/step_definitions/.gitkeep
 - lib/skeleton/features/android/support/app_installation_hooks.rb
 - lib/skeleton/features/android/support/app_life_cycle_hooks.rb
 - lib/skeleton/features/android/support/hooks.rb
 - lib/skeleton/features/ios/features/.gitkeep
-- lib/skeleton/features/ios/ios_screen_base.rb
+- lib/skeleton/features/ios/screens/.gitkeep
 - lib/skeleton/features/ios/step_definitions/.gitkeep
 - 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/templates/android_screen_base.tt
 - lib/templates/base_steps.tt
 - lib/templates/feature.tt
+- lib/templates/ios_screen_base.tt
 - lib/templates/screen.tt
 - lib/templates/steps.tt
 homepage: https://github.com/CSOscarTanner/cs-bdd
@@ -144,7 +151,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.2
+rubygems_version: 2.4.3
 signing_key: 
 specification_version: 4
 summary: Generates an android and iOS calabash project.

data/lib/skeleton/config/scripts/ios/devices

@@ -1,4 +0,0 @@
-# <DEVICE_TARGET (UUID)> | <DEVICE_ENDPOINT (IP)> | <DEVICE_NAME>
-000...000 | http://0.0.0.0:37265 | Device0
-111...111 | http://1.1.1.1:37265 | Device1
-# EOF - Never erase this comment or the script will have problems to read this file