calabash-cucumber 0.9.169.pre5 → 0.9.169.pre6

data/lib/calabash-cucumber/version.rb

@@ -1,7 +1,7 @@
 module Calabash
   module Cucumber
-    VERSION = '0.9.169.pre5'
-    MIN_SERVER_VERSION = '0.9.169.pre2'
+    VERSION = '0.9.169.pre6'
+    MIN_SERVER_VERSION = '0.9.169.pre6'
 
     class Version
 

data/lib/calabash-cucumber/wait_helpers.rb

@@ -10,6 +10,8 @@ module Calabash
       include Calabash::Cucumber::Core
       include Calabash::Cucumber::TestsHelpers
 
+      CLIENT_TIMEOUT_ADDITION = 5
+
       class WaitError < RuntimeError
       end
 
@@ -114,8 +116,11 @@ module Calabash
       end
 
       def wait_for_condition(options = {})
-        options[:timeout] = options[:timeout] || 30
-        options[:query] = options[:query] || "view"
+        timeout = options[:timeout]
+        unless timeout && timeout > 0
+          timeout = 30
+        end
+        options[:query] = options[:query] || '*'
         if options.has_key?(:condition)
           opt_condition = options[:condition]
           if opt_condition.is_a?(Symbol)
@@ -127,22 +132,23 @@ module Calabash
         end
         options[:condition] = options[:condition] || CALABASH_CONDITIONS[:none_animating]
         options[:post_timeout] = options[:post_timeout] || 0
-        options[:frequency] = options[:frequency] || 0.3
-        retry_frequency = options[:retry_frequency] = options[:retry_frequency] || 0.3
-        options[:count] = options[:count] || 2
-        timeout_message = options[:timeout_message] = options[:timeout_message] || "Timeout waiting for condition (#{options[:condition]})"
-        screenshot_on_error = options[:screenshot_on_error] = options[:screenshot_on_error] || true
+
+        retry_frequency = options[:frequency] = options[:frequency] || 0.2
+        timeout_message = options[:timeout_message] = options[:timeout_message] || "Timeout waiting (#{options[:timeout]}) for condition (#{options[:condition]})"
+        screenshot_on_error = true
+        if options.key?(:screenshot_on_error)
+          screenshot_on_error = options[:screenshot_on_error]
+        end
 
         begin
-          Timeout::timeout(options[:timeout],WaitError) do
-            loop do
+          Timeout::timeout(timeout+CLIENT_TIMEOUT_ADDITION, WaitError) do
               res = http({:method => :post, :path => 'condition'},
                          options)
               res = JSON.parse(res)
-              break if res['outcome'] == 'SUCCESS'
-              sleep(options[:retry_frequency]) if options[:retry_frequency] > 0
-            end
-            sleep(options[:post_timeout]) if options[:post_timeout] > 0
+              unless res['outcome'] == 'SUCCESS'
+                raise WaitError.new(res['reason'])
+              end
+              sleep(options[:post_timeout]) if options[:post_timeout] > 0
           end
         rescue WaitError => e
           msg = timeout_message || e
@@ -158,7 +164,7 @@ module Calabash
             raise wait_error(msg)
           end
         rescue Exception => e
-          handle_error_with_options(e,nil, options[:screenshot_on_error])
+          handle_error_with_options(e,nil, screenshot_on_error)
         end
       end
 

data/spec/bin/calabash_ios_sim_spec.rb

@@ -18,7 +18,7 @@ describe 'calabash ios sim cli' do
 
   it 'should be able to reset the content and settings of the simulator' do
     calabash_sim_reset
-    expect(simulator_support_sdk_dirs.count).to be == 1
+    expect(existing_simulator_support_sdk_dirs.count).to be == 1
   end
 
 end

data/spec/launcher_spec.rb

@@ -1,21 +1,25 @@
 require 'spec_helper'
 require 'calabash-cucumber/launcher'
+require 'run_loop'
 
 describe 'Calabash Launcher' do
 
+  UDID = '66h3hfgc466836ehcg72738eh8f322842855d2fd'
+  IPHONE_4IN_R_64 = 'iPhone Retina (4-inch 64-bit) - Simulator - iOS 7.1'
   before(:each) do
     @launcher = Calabash::Cucumber::Launcher.new
   end
 
-  describe 'simulator_target? should respond correctly to DEVICE_TARGET' do
+  before(:each) do
+    ENV['DEVICE_TARGET'] = nil
+    ENV['DETECT_CONNECTED_DEVICE'] = nil
+  end
 
-    before(:each) do
-      ENV['DEVICE_TARGET'] = nil
-    end
+  def set_device_target(val)
+    ENV['DEVICE_TARGET'] = val
+  end
 
-    def set_device_target(val)
-      ENV['DEVICE_TARGET'] = val
-    end
+  describe 'simulator_target? should respond correctly to DEVICE_TARGET' do
 
     it 'should return true if DEVICE_TARGET is nil' do
       expect(@launcher.simulator_target?).to be == false
@@ -33,7 +37,7 @@ describe 'Calabash Launcher' do
 
     it 'should return false if DEVICE_TARGET is udid' do
       # noinspection SpellCheckingInspection
-      set_device_target('66h3hfgc466836ehcg72738eh8f322842855d2fd')
+      set_device_target(UDID)
       expect(@launcher.simulator_target?).to be == false
     end
 
@@ -60,7 +64,7 @@ describe 'Calabash Launcher' do
       hash = {:device_target => 'device'}
       expect(@launcher.simulator_target?(hash)).to be == false
 
-      hash = {:device_target => '66h3hfgc466836ehcg72738eh8f322842855d2fd'}
+      hash = {:device_target => UDID}
       expect(@launcher.simulator_target?(hash)).to be == false
 
       hash = {:device_target => 'foobar'}
@@ -73,4 +77,90 @@ describe 'Calabash Launcher' do
     end
 
   end
-end
+
+  describe 'default launch args should respect DEVICE_TARGET' do
+
+    it "it should return 'simulator' if DEVICE_TARGET nil" do
+      args = @launcher.default_launch_args
+      expect(args[:device_target]).to be == 'simulator'
+    end
+
+    describe 'running with instruments' do
+
+      it 'should be running against instruments' do
+        args = @launcher.default_launch_args
+        expect(args[:launch_method]).to be == :instruments
+      end
+
+      describe 'running against devices' do
+
+        describe 'when DEVICE_TARGET = < udid >' do
+          before(:each) do
+            ENV['DEVICE_TARGET'] = UDID
+          end
+
+          it 'it should return udid if DEVICE_TARGET is a udid' do
+            args = @launcher.default_launch_args
+            expect(args[:device_target]).to be == UDID
+            expect(args[:udid]).to be == UDID
+          end
+        end
+
+        describe 'when DEVICE_TARGET = device' do
+          before(:each) do
+            ENV['DEVICE_TARGET'] = 'device'
+          end
+
+          describe 'detecting connected devices' do
+            describe "when DETECT_CONNECTED_DEVICE == '1'" do
+              it 'should return a udid if DEVICE_TARGET=device if a device is connected and simulator otherwise' do
+                ENV['DETECT_CONNECTED_DEVICE'] = '1'
+                args = @launcher.default_launch_args
+                target = args[:device_target]
+                detected = RunLoop::Core.detect_connected_device
+
+                if detected
+                  expect(target).to be == detected
+                  expect(args[:udid]).to be == detected
+                else
+                  pending('this behavior is needs verification')
+                  expect(target).to be == 'simulator'
+                end
+              end
+
+              describe "when DETECT_CONNECTED_DEVICE != '1'" do
+                it 'should return a udid if DEVICE_TARGET=device if a device is connected and simulator otherwise' do
+                  args = @launcher.default_launch_args
+                  target = args[:device_target]
+                  expect(target).to be == 'device'
+                  expect(args[:udid]).to be == 'device'
+                end
+              end
+            end
+          end
+        end
+      end
+
+      describe 'running against simulators' do
+
+        describe 'DEVICE_TARGET is an iphone in Xcode 5.1 format' do
+          before(:each) do
+            ENV['DEVICE_TARGET'] =  IPHONE_4IN_R_64
+          end
+
+          it 'should return the correct simulator' do
+            args = @launcher.default_launch_args
+            expect(args[:device_target]).to be == IPHONE_4IN_R_64
+          end
+
+        end
+
+      end
+    end
+
+    describe 'running without instruments' do
+
+
+    end
+  end
+end

data/spec/simulator_accessibility_spec.rb

@@ -12,7 +12,7 @@ describe 'simulator accessibility tool' do
     expect(File.exist?(path)).to be == true
   end
 
-  it 'should be able open and close the simulator' do
+  it 'should be able to open and close the simulator' do
     cmd = "ps auxw | grep \"iPhone Simulator.app/Contents/MacOS/iPhone Simulator\" | grep -v grep"
 
     quit_simulator
@@ -24,12 +24,73 @@ describe 'simulator accessibility tool' do
     expect(`#{cmd}`.split("\n").count).to be == 1
   end
 
+  it 'should be able to return a path a com.apple.Accessibility.plist for an SDK' do
+    sdk = "#{simulator_app_support_dir}/7.1"
+    expected = "#{sdk}/Library/Preferences/com.apple.Accessibility.plist"
+    actual = plist_path_with_sdk_dir(sdk)
+    expect(actual).to be == expected
+  end
+
+  # brittle because some users will not have installed 6.1 or 7.0, but hey, why
+  # are them gem dev'ing or gem testing?
+  it 'should be able to return possible SDKs' do
+    actual = possible_simulator_sdks
+    instruments_version = instruments(:version)
+
+    if instruments_version == '5.1' or instruments_version == '5.1.1'
+      expected = ['6.1', '7.0.3', '7.0.3-64', '7.1', '7.1-64']
+      expect(actual).to be == expected
+    else
+      pending("Xcode version '#{instruments_version}' is not supported by this test - gem needs update!")
+    end
+  end
+
+  # brittle because some users will not have installed 6.1 or 7.0, but hey, why
+  # are them gem dev'ing or gem testing?
+  it 'should be able to return Simulator Support SDK dirs' do
+    actual = possible_simulator_support_sdk_dirs
+    instruments_version = instruments(:version)
+    if instruments_version == '5.1' or instruments_version == '5.1.1'
+      expect(actual.count).to be == 5
+    else
+      pending("Xcode version '#{instruments_version}' is not supported by this test - gem needs update!")
+    end
+  end
+
+  it 'should be able to find existing simulator support sdk dirs' do
+    mocked_support_dir = File.expand_path(File.join(__FILE__, '..', 'resources/enable-accessibility/'))
+    self.should_receive(:simulator_app_support_dir).and_return(mocked_support_dir)
+    actual = existing_simulator_support_sdk_dirs
+    expect(actual.count).to be == 5
+  end
+
+
   describe 'enabling accessibility' do
 
     before(:each) do
       @sim_launcher = SimLauncher::Simulator.new
       @sdk_detector = SimLauncher::SdkDetector.new(@sim_launcher)
       quit_simulator
+
+      @latest_sdk = @sdk_detector.latest_sdk_version
+      @device_target = "iPhone Retina (4-inch) - Simulator - iOS #{@latest_sdk}"
+      @launch_args =
+            {
+                  :launch_method => :instruments,
+                  :reset => false,
+                  :bundle_id => nil,
+                  :device => 'iphone',
+                  :no_stop => false,
+                  :no_launch => false,
+                  :sdk_version => @latest_sdk,
+                  :app => lp_simple_example,
+                  :timeout => 30,
+                  :device_target => @device_target,
+                  :launch_retries => 1
+            }
+
+      @launcher = Calabash::Cucumber::Launcher.new
+
     end
 
     def lp_simple_example
@@ -47,59 +108,12 @@ describe 'simulator accessibility tool' do
       end
     end
 
-    def repopulate_sim_app_support_all
-      @sdk_detector.available_sdk_versions.each do |sdk|
-        repopulate_sim_app_support_for_sdk(sdk)
-      end
-    end
-
-    describe 'interacting with simulator app support sdk directories' do
-      it 'should be able to find all the sdk directories' do
-        repopulate_sim_app_support_all
-
-        expected = @sdk_detector.available_sdk_versions
-        actual = simulator_support_sdk_dirs
-
-        calabash_info("sdks = '#{expected}'")
-        actual.each { |path|
-          calabash_info("sdk path = '#{path}'")
-        }
-
-        expect(actual.count).to be == expected.count
-      end
-    end
-
-    describe 'enable accessibility with no AXInspector' do
+    describe 'on existing SDK directories' do
 
       before(:each) do
         reset_simulator_content_and_settings
-
-        @latest_sdk = @sdk_detector.latest_sdk_version
-        @device_target = "iPhone Retina (4-inch) - Simulator - iOS #{@latest_sdk}"
-        @launch_args =
-              {
-                    :launch_method => :instruments,
-                    :reset => false,
-                    :bundle_id => nil,
-                    :device => 'iphone',
-                    :no_stop => false,
-                    :no_launch => false,
-                    :sdk_version => @latest_sdk,
-                    :app => lp_simple_example,
-                    :timeout => 10,
-                    :device_target => @device_target,
-                    :launch_retries => 1
-              }
-
-        @launcher = Calabash::Cucumber::Launcher.new
-      end
-
-      it 'should not fail if the com.apple.Accessibility.plist does not exist' do
-        dir = File.join(simulator_app_support_dir, "#{@latest_sdk}")
-        expect(enable_accessibility_in_sdk_dir(dir, {:verbose => true})).to be == false
       end
 
-
       it 'should not be able to launch LPSimpleExample-app b/c accessibility is not enabled' do
         msgs =
               [
@@ -111,34 +125,82 @@ describe 'simulator accessibility tool' do
                     '',
                     'AFAICT there is nothing to be done about this.']
         calabash_warn(msgs.join("\n"))
-        expect { @launcher.new_run_loop(@launch_args) }.to raise_error(Calabash::Cucumber::Launcher::StartError)
+        begin
+          expect { @launcher.new_run_loop(@launch_args) }.to raise_error(Calabash::Cucumber::Launcher::StartError)
+        ensure
+          @launcher.stop
+        end
       end
 
       it 'should be able to enable accessibility for the latest sdk' do
         repopulate_sim_app_support_for_sdk(@latest_sdk)
 
-        # i am not sure we need these tests
-        # the are checking the state of the 'clean' accessibility plist
-        # which is subject to change
-        # plist = File.join(simulator_app_support_dir, "#{@latest_sdk}", 'Library/Preferences/com.apple.Accessibility.plist')
-        # hash = accessibility_properties_hash()
+        dir = File.join(simulator_app_support_dir, "#{@latest_sdk}")
+        enable_accessibility_in_sdk_dir(dir)
+
+        begin
+          expect(@launcher.new_run_loop(@launch_args)).to be_a(Hash)
+        ensure
+          @launcher.stop
+        end
 
-        # expect(plist_read(hash[:access_enabled], plist)).to be == 'true'
-        # expect(plist_read(hash[:app_access_enabled], plist)).to be == 'true'
+      end
+    end
 
-        # flickers depending on the state - not a crucial test
-        # expect(plist_read(hash[:automation_enabled], plist)).to be == 'true'
-        # expect(plist_read(hash[:inspector_showing], plist)).to be == 'false'
-        # expect(plist_key_exists?(hash[:inspector_full_size], plist)).to be == false
+    describe 'on non-existing SDK directories' do
+      before(:each) do
+        quit_simulator
+        sleep(2)
+        existing_simulator_support_sdk_dirs.each do |dir|
+           FileUtils.rm_rf(dir)
+        end
 
-        # flickers depending on the state - not a crucial test
-        # expect(plist_key_exists?(hash[:inspector_frame], plist)).to be == false
+        reset_simulator_content_and_settings
 
-        dir = File.join(simulator_app_support_dir, "#{@latest_sdk}")
-        enable_accessibility_in_sdk_dir(dir)
+        quit_simulator
+        # let the iOS Simulator do what it needs to do at shut-down
+        sleep(2)
+      end
 
-        expect(@launcher.new_run_loop(@launch_args)).to be_a(Hash)
+      it 'should be able to enable accessibility on all possible simulators' do
+        enable_accessibility_on_simulators
+        @launch_args[:sdk_version] = nil
+        @launch_args[:timeout] = 20
+        @launch_args[:launch_retries] = 3
+
+        # these configurations correspond to iOS/Hardware configurations that
+        # do not exist.  As an example, there is no iOS 6.1 64-bit implementation,
+        # so a simulator like:
+        #
+        # 'iPhone Retina (4-inch 64-bit) - Simulator - iOS 6.1'
+        #
+        # does not even make sense.
+        #
+        # ditto for 'iPhone - Simulator - iOS 7.0' - there is no non-retina
+        # iOS 7 hardware
+        # -1 Apple
+        excluded = [
+              'iPhone - Simulator - iOS 7.0',
+              'iPhone - Simulator - iOS 7.1',
+              'iPhone Retina (4-inch 64-bit) - Simulator - iOS 6.1',
+              'iPad Retina (64-bit) - Simulator - iOS 6.1'
+        ]
+        instruments(:sims).each do |simulator|
+          if excluded.include?(simulator)
+            calabash_warn("skipping simulator '#{simulator}' - instruments passed us an invalid configuration!")
+          else
+            @launch_args[:device_target] = simulator
+            calabash_info("starting simulator '#{simulator}'")
+            begin
+              expect(@launcher.new_run_loop(@launch_args)).to be_a(Hash)
+            ensure
+              @launcher.stop
+              sleep(2)
+            end
+          end
+        end
       end
+
     end
   end
-end
+end