lib/ilesspainfulclient-cucumber/operations.rb in ilesspainfulclient-cucumber-0.0.5 vs lib/ilesspainfulclient-cucumber/operations.rb in ilesspainfulclient-cucumber-0.0.6

@@ -56,15 +56,15 @@
     raise "could not find view to scroll: '#{uiquery}', args: #{number}" if views_touched.empty?
     views_touched
   end
 
   def pinch(in_out,options={})
-    options.merge!({:reverse=>in_out.to_sym==:out})
-    if ENV['OS'] == 'ios5'
-      options.merge!(:prototype => load_playback_data("pinch_in",{"OS" => "ios4"}))
+    file = "pinch_in"
+    if in_out.to_sym==:out
+      file = "pinch_out"
     end
-    playback("pinch_in", options)
+    playback(file, options)
   end
 
   def rotate(dir)
     @current_rotation = @current_rotation || :down
     rotate_cmd = nil
@@ -215,10 +215,10 @@
   def screenshot
     if !/localhost/.match(ENV['DEVICE_ENDPOINT'])
       f = %x[idevicescreenshot -u #{ENV['UUID']}]
       line=f.strip().split("\n").last
       filename=line.split(" ").last
-      outfile = "#{ENV['SCREENSHOT_PATH_PREFIX']}_#{Step_line}.png"
+      outfile = "#{ENV['SCREENSHOT_PATH_PREFIX']}_#{@@Step_line}.png"
       if File.exist?filename
         puts "converting screenshot: #{filename} to 1.png"
         system("convert #{filename} to #{outfile}")
       else
         raise "Error. Unable to screenshot for device #{ENV['UUID']}."