calabash-cucumber 0.9.96 → 0.9.100

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    calabash-cucumber (0.9.95)
+    calabash-cucumber (0.9.100)
       CFPropertyList
       bundler (~> 1.1)
       cucumber

data/features-skeleton/support/hooks.rb

@@ -1,17 +0,0 @@
-CALABASH_COUNT = {:step_index => 0, :step_line => nil}
-
-#TODO change this approach as it breaks scenario outlines
-Before do |scenario|
-  begin
-    CALABASH_COUNT[:step_index] = 0
-    CALABASH_COUNT[:step_line] = scenario.raw_steps[CALABASH_COUNT[:step_index]].line
-  rescue Exception => e
-    puts "#{Time.now} - Exception:#{e}"
-  end
-end
-
-AfterStep do |scenario|
-  CALABASH_COUNT[:step_index] = CALABASH_COUNT[:step_index] + 1
-  raw = scenario.raw_steps[CALABASH_COUNT[:step_index]]
-  CALABASH_COUNT[:step_line] = raw.line unless raw.nil?
-end

data/features-skeleton/support/launch.rb

@@ -60,7 +60,7 @@ def app_path
 end
 
 def calabash_notify
-  if self.respond_to?:on_launch
+  if self.respond_to?(:on_launch)
     self.on_launch
   end
 end

data/features/step_definitions/calabash_steps.rb

@@ -173,7 +173,7 @@ end
 
 Then /^(?:I\s)?take (?:picture|screenshot)$/ do
   sleep(STEP_PAUSE)
-  screenshot
+  screenshot_embed
 end
 
 Then /^I swipe (left|right|up|down)$/ do |dir|

data/lib/calabash-cucumber/tests_helpers.rb

@@ -33,27 +33,45 @@ module Calabash
         check_element_exists("view marked:'#{expected_mark}'")
       end
 
-      def screenshot_and_raise(msg, prefix=nil, name=nil)
-        screenshot(prefix, name)
+      def screenshot_and_raise(msg, options={:prefix => nil, :name => nil, :label => nil})
+        screenshot_embed(options)
         raise(msg)
       end
 
-      def fail(msg="Error. Check log for details.", prefix=nil, name=nil)
-        screenshot_and_raise(msg, prefix, name)
+      def fail(msg="Error. Check log for details.", options={:prefix => nil, :name => nil, :label => nil})
+        screenshot_and_raise(msg, options)
       end
 
-      def screenshot(prefix=nil, name=nil)
+
+      def screenshot_embed(options={:prefix => nil, :name => nil, :label => nil})
+        path = screenshot(options)
+        embed(path, "image/png", options[:label] || File.basename(path))
+      end
+
+      def screenshot(options={:prefix => nil, :name => nil})
+        prefix = options[:prefix]
+        name = options[:name]
+
+        @@screenshot_count ||= 0
         res = http({:method => :get, :path => 'screenshot'})
         prefix = prefix || ENV['SCREENSHOT_PATH'] || ""
-        name = "screenshot_#{CALABASH_COUNT[:step_line]}.png" if name.nil?
-        path = "#{prefix}#{name}"
+        if name.nil?
+          name = "screenshot"
+        else
+          if File.extname(name).downcase == ".png"
+            name = name.split(".png")[0]
+          end
+        end
+
+        path = "#{prefix}#{name}_#{@@screenshot_count}.png"
         File.open(path, 'wb') do |f|
           f.write res
         end
-        puts "Saved screenshot: #{path}"
+        @@screenshot_count += 1
         path
       end
 
+
     end
   end
 end

data/lib/calabash-cucumber/version.rb

@@ -1,6 +1,6 @@
 module Calabash
   module Cucumber
-    VERSION = "0.9.96"
-    FRAMEWORK_VERSION = "0.9.93"
+    VERSION = "0.9.100"
+    FRAMEWORK_VERSION = "0.9.100"
   end
 end

metadata

@@ -1,153 +1,151 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: calabash-cucumber
-version: !ruby/object:Gem::Version
-  version: 0.9.96
+version: !ruby/object:Gem::Version 
+  hash: 243
   prerelease: 
+  segments: 
+  - 0
+  - 9
+  - 100
+  version: 0.9.100
 platform: ruby
-authors:
+authors: 
 - Karl Krukow
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-21 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
+
+date: 2012-08-27 00:00:00 Z
+dependencies: 
+- !ruby/object:Gem::Dependency 
   name: cucumber
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: json
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
   type: :runtime
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
+  name: json
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: CFPropertyList
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
   type: :runtime
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
+  name: CFPropertyList
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: sim_launcher
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 0.3.8
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
   type: :runtime
+  version_requirements: *id003
+- !ruby/object:Gem::Dependency 
+  name: sim_launcher
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
+    requirements: 
+    - - "="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        - 3
+        - 8
         version: 0.3.8
-- !ruby/object:Gem::Dependency
-  name: slowhandcuke
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
   type: :runtime
+  version_requirements: *id004
+- !ruby/object:Gem::Dependency 
+  name: slowhandcuke
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: location-one
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.0.5
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
   type: :runtime
+  version_requirements: *id005
+- !ruby/object:Gem::Dependency 
+  name: location-one
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
+      - !ruby/object:Gem::Version 
+        hash: 21
+        segments: 
+        - 0
+        - 0
+        - 5
         version: 0.0.5
-- !ruby/object:Gem::Dependency
-  name: httpclient
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 2.2.7
   type: :runtime
+  version_requirements: *id006
+- !ruby/object:Gem::Dependency 
+  name: httpclient
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
+      - !ruby/object:Gem::Version 
+        hash: 9
+        segments: 
+        - 2
+        - 2
+        - 7
         version: 2.2.7
-- !ruby/object:Gem::Dependency
-  name: bundler
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '1.1'
   type: :runtime
+  version_requirements: *id007
+- !ruby/object:Gem::Dependency 
+  name: bundler
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: &id008 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
-        version: '1.1'
-description: calabash-cucumber drives tests for native iOS apps. You must link your
-  app with calabash-ios-server framework to execute tests.
-email:
+      - !ruby/object:Gem::Version 
+        hash: 13
+        segments: 
+        - 1
+        - 1
+        version: "1.1"
+  type: :runtime
+  version_requirements: *id008
+description: calabash-cucumber drives tests for native iOS apps. You must link your app with calabash-ios-server framework to execute tests.
+email: 
 - karl@lesspainful.com
-executables:
+executables: 
 - calabash-ios
 extensions: []
+
 extra_rdoc_files: []
-files:
+
+files: 
 - .gitignore
 - CHANGES.txt
 - Gemfile
@@ -257,27 +255,36 @@ files:
 - scripts/reset_simulator.scpt
 homepage: http://calaba.sh
 licenses: []
+
 post_install_message: 
 rdoc_options: []
-require_paths:
+
+require_paths: 
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement
+required_ruby_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
-required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
+required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
 requirements: []
+
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Client for calabash-ios-server for automated functional testing on iOS
-test_files:
+test_files: 
 - features/step_definitions/calabash_steps.rb