briar 0.1.3 → 0.1.4.b1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 01af1105eafa64b8a8e2763cf9f2e61196317422
-  data.tar.gz: 9fc4979cb92bf1d3045f99f2b685cd3c26b7e4cd
+  metadata.gz: f2de2d2410ddc9524589489604312c5b4a6512f1
+  data.tar.gz: 548da4584b0f8fbafa8d5fae39b469bef887cbfe
 SHA512:
-  metadata.gz: 16a81550bb111ba11b13c729e14fca3b357d7aadbc12f4acd7f357272766ccdc214e96354fadfe57b33aad2fe6b85fdcaf7720305cbff0e59310c1c14661c041
-  data.tar.gz: b37580bc3a4716308584c2d453a4b04744ea10b9d8d73da6e24467f22b16a54733ad6181e65b41049268873c652de9bc41b8e9540dd15c2238a470b0704476ec
+  metadata.gz: cc2e61cae457c7343a72fbccf4ba67491c786aea152734873dcda30419268e508c28eec564c6cf2a2eb7656fd0eb7c5beca0e3102190516644177720142b6b02
+  data.tar.gz: 62857537e5d132f602138a1f0cad5790e303edbd19914e9da6cfbb71ba656fece8025d2fe8759f93cd5768d61161f58c29d4ec538784872f748e9e4f6c0cea3e

data/bin/briar

@@ -18,12 +18,13 @@ require_relative './briar_rm'
 require_relative './briar_xtc'
 require_relative './briar_report'
 require_relative './briar_sim'
+require_relative './briar_tags'
 
 num_args = ARGV.length
 
 
 def briar_version
-  Briar::VERSION
+  puts "#{Briar::VERSION}"
 end
 
 if num_args == 0
@@ -63,6 +64,8 @@ if num_args == 2 and ARGV[0] == 'help'
       print_rm_help
     when 'sim'
       print_sim_help
+    when 'tags'
+      print_tags_help
     when 'version'
       print_version_help
     when '.xamarin'
@@ -95,6 +98,8 @@ case command
     briar_rm(args)
   when 'sim'
     briar_sim(args)
+  when 'tags'
+    briar_tags(args)
   when 'xtc'
     briar_xtc(args)
 

data/bin/briar_console.rb

@@ -1,6 +1,7 @@
 require_relative './briar_dot_xamarin'
 require_relative './briar_env'
 
+
 require 'ansi/logger'
 @log = ANSI::Logger.new(STDOUT)
 
@@ -34,16 +35,19 @@ def screenshot_path
   path
 end
 
+#noinspection RubyStringKeysInHashInspection
 def logging_level
   {'DEBUG' => ENV['DEBUG'] || '1',
    'CALABASH_FULL_CONSOLE_OUTPUT' => ENV['CALABASH_FULL_CONSOLE_OUTPUT'] || '1'}
 end
 
+#noinspection RubyStringKeysInHashInspection
 def simulator_variables(sdk_version)
   {'DEVICE_TARGET' => 'simulator',
    'SKD_VERSION' => sdk_version}
 end
 
+#noinspection RubyStringKeysInHashInspection
 def device_variables(device)
   {'DEVICE_TARGET' => read_device_info(device, :udid),
    'DEVICE_ENDPOINT' => read_device_info(device, :ip),
@@ -90,12 +94,16 @@ def console(device, opts={})
   # do not be tempted to use IRB.start
   # this can cause some terrible problems at > exit
   ##################
-
-default_opts = default_console_opts()
+  default_opts = default_console_opts()
   opts = default_opts.merge(opts)
   cmd = ios_console_cmd(device, opts)
   puts Rainbow(cmd).green
-  exec cmd
+
+  if RUBY_VERSION.start_with?('1.8')
+    raise 'not supported in ruby 1.8'
+  else
+    exec cmd
+  end
 end
 
 

data/bin/briar_env.rb

@@ -27,6 +27,7 @@ def expect_ideviceinstaller
     @log.fatal{ "expected it here '#{bin_path}'"}
     exit 1
   end
+  bin_path
 end
 
 def expect_ipa(ipa_path)

data/bin/briar_help.rb

@@ -26,6 +26,10 @@ def help_experimental
   Rainbow('EXPERIMENTAL').underline.magenta
 end
 
+def help_not_available_ruby18
+  Rainbow('RUBY > 1.8').underline.magenta
+end
+
 def help_deprecated(version, msg)
   ANSI.cyan { "DEPRECATED #{version} - #{msg}" }
 end
@@ -74,7 +78,6 @@ def help_see_xtc_profiles_help
   "see #{Rainbow('$ briar help xtc-profiles').yellow} for details"
 end
 
-
 def help_customize
   Rainbow('CUSTOMIZATION').green
 end
@@ -207,6 +210,7 @@ def print_console_help
 #{help_env_var('                       IRBRC', 'location of custom .irbrc file - defaults to ./.irbrc')}
 #{help_env_var('                 BUNDLE_EXEC', 'start console with bundle exec - defaults to 0')}
 
+#{help_not_available_ruby18}
 EOF
 end
 
@@ -309,17 +313,26 @@ def print_xtc_help
 #{help_command('xtc')}
   prints the available XTC device sets
 
-#{help_command('xtc <device-set> [profile]')} #{help_experimental} #{help_nyi}
-  submits a job to the XTC targeting devices specified in < device-set >
 
+#{help_command('xtc <device-set> [profile]')} #{help_experimental}
+  submits a job to the XTC targeting devices specified in < device-set >
   if no profile is set, the 'default' profile in the xtc-cucumber.yml will be used
 
+#{help_command('xtc <device-set> <profile> [build args]')} #{help_experimental}
+  submits a job to the XTC targeting devices specified in < device-set > using
+  the cucumber profile specified by < profile >.  you can optionally pass build
+  arguments to to control your xamarin build script.
+
   #{help_requires_env_vars}
-  #{help_env_var('             IPA', 'path to the .ipa you submitting')}
-  #{help_env_var('    XTC_PROFILES', 'cucumber profiles for the XTC')}
-  #{help_env_var('     XTC_ACCOUNT', 'name of a directory in ~/.xamarin/test-cloud/<account> that contains the api token')}
+  #{help_env_var('                 IPA', 'path to the .ipa you submitting')}
+  #{help_env_var('        XTC_PROFILES', 'cucumber profiles for the XTC')}
+  #{help_env_var('         XTC_ACCOUNT', 'name of a directory in ~/.xamarin/test-cloud/<account> that contains the api token')}
   #{help_example_comment('if a build script is defined, the .ipa will be built before submission')}
-  #{help_env_var('IPA_BUILD_SCRIPT', '(optional) script that generates the IPA')}
+  #{help_env_var('    IPA_BUILD_SCRIPT', '(optional) script that generates the IPA')}
+  #{help_example_comment('if you require other gems besides briar')}
+  #{help_env_var(' XTC_OTHER_GEMS_FILE', 'path to a file describing other gems that should be installed on the XTC')}
+  #{help_env_var('   XTC_BRIAR_GEM_DEV', "set to '1' to ensure the local version of briar will be uploaded to the XTC'")}
+  #{help_env_var('XTC_CALABASH_GEM_DEV', "set to '1' to ensure the local version of calabash will be uploaded to the XTC'")}
 
 EOF
 end
@@ -354,20 +367,31 @@ command, set the #{Rainbow('XTC_PROFILES').cyan} variable to your xtc-profiles.y
 EOF
 end
 
+def print_tags_help
+  puts <<EOF
+#{help_command('tags')} #{help_experimental}
+ generates a cucumber tag report
+
+ requires list_tags.rb in features/support/ directory
+
+EOF
+end
+
 def print_usage
   puts <<EOF
 #{Rainbow("Welcome to briar #{Briar::VERSION}!").cyan}
 
 briar help { command } for more information a command
 
- console { sim6 [simulator version] | sim7 [simulator version] | <device-name> }
+ console { sim6 [simulator version] | sim7 [simulator version] | <device-name> } #{help_experimental}
  install { calabash-server | <device-name> }
   report [device]
   resign #{help_experimental}
       rm { sim-targets | dups [project-name] }
-     sim [{quit | <simulator version>}]
+     sim [{quit | <simulator version>}] #{help_experimental}
+    tags #{help_experimental}
  version
-     xtc [<device-set> [profile]] #{help_experimental} #{help_nyi}
+     xtc { [<device-set> [profile]] | [<device-set> <profile> [build args] } #{help_experimental}
 
 #{Rainbow('ADDITIONAL HELP TOPICS').green}
      help .xamarin

data/bin/briar_ideviceinstaller.rb

@@ -2,6 +2,7 @@ require_relative './briar_dot_xamarin'
 require_relative './briar_rm'
 require_relative './briar_env'
 
+require 'rainbow'
 require 'ansi/logger'
 
 @log = ANSI::Logger.new(STDOUT)
@@ -10,7 +11,7 @@ def ideviceinstaller(device, cmd, opts={})
   default_opts = {:build_script => ENV['IPA_BUILD_SCRIPT'],
                   :ipa => ENV['IPA'],
                   :bundle_id => expect_bundle_id(),
-                  :ideviceinstaller => expect_ideviceinstaller()}
+                  :idevice_installer => expect_ideviceinstaller()}
   opts = default_opts.merge(opts)
 
   cmds = [:install, :uninstall, :reinstall]
@@ -23,17 +24,25 @@ def ideviceinstaller(device, cmd, opts={})
 
   udid =  read_device_info(device, :udid)
 
+  bin_path = opts[:idevice_installer]
+
   if cmd == :install
     if build_script
       system "#{build_script}"
       briar_remove_derived_data_dups
     end
+
     ipa = opts[:ipa]
     expect_ipa(ipa)
 
-    system "#{bin_path} -u #{udid} --install #{ipa}"
+    cmd = "#{bin_path} -u #{udid} --install #{ipa}"
+    puts "#{Rainbow(cmd).green}"
+    system cmd
   elsif cmd == :uninstall
-    system "#{bin_path} -u #{udid} --uninstall #{bundle_id}"
+    bundle_id = opts[:bundle_id]
+    cmd = "#{bin_path} -u #{udid} --uninstall #{bundle_id}"
+    puts "#{Rainbow(cmd).green}"
+    system cmd
   else
     ideviceinstaller(device, :uninstall)
     ideviceinstaller(device, :install)

data/bin/briar_rm.rb

@@ -13,19 +13,18 @@ def briar_remove_cal_targets
   cal_targets = []
   Find.find(sim_dir) do |path|
     if path =~  /.*\-cal.app/
-      @log.fatal { "found '#{File.basename(path)}' in '#{File.dirname(path)}'" }
+      @log.info { "found '#{File.basename(path)}' in '#{File.dirname(path)}'" }
       cal_targets << File.dirname(path)
       Find.prune
     end
   end
 
   if cal_targets.empty?
-    @log.fatal { "found no *-cal.app targets in '#{sim_dir}'" }
-    exit 0
-  end
-
-  cal_targets.each do |path|
-    FileUtils.rm_r path
+    @log.info { "found no *-cal.app targets in '#{sim_dir}'" }
+  else
+    cal_targets.each do |path|
+      FileUtils.rm_r path
+    end
   end
 end
 

data/bin/briar_sim.rb

@@ -53,6 +53,8 @@ def set_default_simulator(device_key)
     raise "#{device_key} was not one of '#{hash.keys}'"
   end
 
+  kill_simulator
+
   open_simulator
   current_device = default_simulated_device()
   unless current_device.eql?(device_key)

data/bin/briar_tags.rb

@@ -0,0 +1,19 @@
+require 'rainbow'
+require 'ansi/logger'
+
+
+@log = ANSI::Logger.new(STDOUT)
+
+
+def briar_tags(args)
+  arg_len = args.count
+
+  if arg_len != 0
+    @log.warn{ "expected no arguments but found '#{args}' - what can I do with that!?!" }
+    exit 1
+  end
+
+  cmd = 'cucumber -d -f Cucumber::Formatter::ListTags'
+  puts "#{Rainbow(cmd).green}"
+  system(cmd)
+end

data/bin/briar_xtc.rb

@@ -39,7 +39,12 @@ def briar_xtc_submit(device_set, profile, opts={})
   default_opts = {:build_script => ENV['IPA_BUILD_SCRIPT'],
                   :ipa => ENV['IPA'],
                   :profiles => ENV['XTC_PROFILES'],
-                  :account => expect_xtc_account()}
+                  :account => expect_xtc_account(),
+                  :other_gems => ENV['XTC_OTHER_GEMS_FILE'],
+                  :briar_dev => ENV['XTC_BRIAR_GEM_DEV'],
+                  :calabash_dev => ENV['XTC_CALABASH_GEM_DEV'],
+                  :rebuild => true}
+
 
   opts = default_opts.merge(opts)
 
@@ -47,25 +52,71 @@ def briar_xtc_submit(device_set, profile, opts={})
 
   if build_script
     expect_build_script(build_script)
-    system "#{build_script}"
+    if opts[:rebuild]
+      cmd = "#{build_script}"
+    else
+      cmd = "#{build_script} -"
+    end
+    system cmd
     briar_remove_derived_data_dups
   end
 
-  xtc_gemfile = './xamarin/Gemfile'
-
-  briar_path = `bundle show briar`.strip
-  calabash_path = `bundle show calabash-cucumber`.strip
-
-  File.open(xtc_gemfile, 'w') { |file|
-    file.write("source 'https://rubygems.org'\n")
-    file.write("gem 'calabash-cucumber', :path => '#{calabash_path}'\n")
-    file.write("gem 'briar', :path => '#{briar_path}'\n")
-    file.write("gem 'faker'\n")
-  }
-  
   account = opts[:account]
   api_key = read_api_token(account)
 
+  if opts[:briar_dev] == '1'
+    briar_path = `bundle show briar`.strip
+    system('gem uninstall briar --no-executables --ignore-dependencies --quiet',
+           :err => '/dev/null')
+    Dir.chdir(File.expand_path(briar_path)) do
+      system 'rake install'
+    end
+  end
+
+  if opts[:calabash_dev] == '1'
+    calabash_path = `bundle show calabash-cucumber`.strip
+    system('gem uninstall calabash-cucumber --no-executables --ignore-dependencies --quiet',
+           :err => '/dev/null')
+
+    Dir.chdir(File.expand_path(calabash_path)) do
+      system 'rake install'
+    end
+  end
+
+  other_gems = []
+  if opts[:other_gems]
+    path = File.expand_path(opts[:other_gems])
+    File.read(path).split("\n").each do |line|
+      # stay 1.8.7 compat
+      next if line.strip.length == 0 or line.chars.to_a.first.eql?('#')
+      other_gems << line.strip
+    end
+  end
+
+  if opts[:briar_dev] == '1' or opts[:calabash_dev] == '1'
+
+    xtc_gemfile = './xamarin/Gemfile'
+
+    File.open(xtc_gemfile, 'w') do |file|
+      file.write("source 'https://rubygems.org'\n")
+      if opts[:calabash_dev]
+        calabash_version = `bundle exec calabash-ios version`.strip
+        file.write("gem 'calabash-cucumber', '#{calabash_version}'\n")
+      end
+
+      if opts[:briar_dev]
+        briar_version = `bundle exec briar version`.strip
+        file.write("gem 'briar', '#{briar_version}'\n")
+      else
+        file.write("gem 'briar'")
+      end
+
+      other_gems.each do |gem|
+        file.write("#{gem}\n")
+      end
+    end
+
+  end
 
   sets = read_device_sets
   if sets[device_set]
@@ -76,15 +127,10 @@ def briar_xtc_submit(device_set, profile, opts={})
 
   ipa = File.basename(File.expand_path(expect_ipa(opts[:ipa])))
 
-  cmd = "bundle exec test-cloud submit #{ipa} #{api_key} -d #{device_set} -c cucumber.yml -p #{profile}"
+  cmd = "test-cloud submit #{ipa} #{api_key} -d #{device_set} -c cucumber.yml -p #{profile}"
   puts Rainbow("cd xamarin; #{cmd}").green
-  begin
-    Dir.chdir('./xamarin') do
-      system cmd
-    end
-  rescue
-    # probably useless
-    @log.fatal{ 'could not submit job' }
+  Dir.chdir('./xamarin') do
+    exec cmd
   end
 end
 
@@ -99,10 +145,22 @@ def briar_xtc(args)
   device_set = args[0]
   profile = arg_len == 1 ? nil : args[1]
 
-  if arg_len > 2
-    @log.warn{ "expected at most 2 args by found '#{args}' - ignoring extra input" }
+
+  if arg_len == 3
+    rebuild_arg = args[2]
+    unless rebuild_arg == '-'
+      @log.fatal { "unknown optional argument '#{rebuild_arg}' expected '-'" }
+      exit 1
+    end
+    opts = {:rebuild => false}
+  else
+    opts = {:rebuild => true}
+  end
+
+  if arg_len > 3
+    @log.warn{ "expected at most 3 args by found '#{args}' - ignoring extra input" }
   end
 
-  briar_xtc_submit(device_set, profile)
+  briar_xtc_submit(device_set, profile, opts)
 end
 

data/lib/briar.rb

@@ -42,7 +42,6 @@ require 'calabash-cucumber'
 require 'briar/version'
 require 'briar/briar_core'
 require 'briar/uia/briar_uia'
-require 'briar/uia/briar_ipad_emulation'
 
 require 'briar/alerts_and_sheets/alert_view'
 require 'briar/alerts_and_sheets/action_sheet'

data/lib/briar/cucumber.rb

@@ -5,7 +5,7 @@ require_relative '../briar'
 World(Briar)
 World(Briar::Core)
 World(Briar::UIA)
-World(Briar::UIA::IPadEmulation)
+#World(Briar::UIA::IPadEmulation)
 World(Briar::Alerts_and_Sheets)
 World(Briar::Bars)
 World(Briar::Control::Button)

data/lib/briar/irbrc.rb

@@ -34,10 +34,13 @@ require 'calabash-cucumber/operations'
 require 'calabash-cucumber/launch/simulator_helper'
 #noinspection RubyResolve
 require 'calabash-cucumber/launcher'
+#noinspection RubyResolve
+require 'calabash-cucumber/uia'
 
 SIM=Calabash::Cucumber::SimulatorHelper
 
 extend Calabash::Cucumber::Operations
+include Calabash::Cucumber::IPad
 
 #noinspection RubyUnusedLocalVariable
 def embed(x,y=nil,z=nil)
@@ -58,7 +61,6 @@ include Briar::Picker::DateManipulation
 include Briar::Picker::DateSteps
 include Briar::Core
 include Briar::UIA
-include Briar::UIA::IPadEmulation
 include Briar::Table
 include Briar::ImageView
 include Briar::Label

data/lib/briar/version.rb

@@ -1,3 +1,3 @@
 module Briar
-  VERSION = '0.1.3'
+  VERSION = '0.1.4.b1'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: briar
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4.b1
 platform: ruby
 authors:
 - Joshua Moody
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-10 00:00:00.000000000 Z
+date: 2014-02-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rbx-require-relative
@@ -145,6 +145,7 @@ files:
 - bin/briar_resign.rb
 - bin/briar_rm.rb
 - bin/briar_sim.rb
+- bin/briar_tags.rb
 - bin/briar_xtc.rb
 - briar.gemspec
 - features/step_definitions/alerts_and_sheets/action_sheet_steps.rb
@@ -199,7 +200,6 @@ files:
 - lib/briar/table.rb
 - lib/briar/text_field.rb
 - lib/briar/text_view.rb
-- lib/briar/uia/briar_ipad_emulation.rb
 - lib/briar/uia/briar_uia.rb
 - lib/briar/version.rb
 - spec/spec_helper.rb
@@ -219,14 +219,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: 1.8.7
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - '>'
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
-summary: briar-0.1.3
+summary: briar-0.1.4.b1
 test_files:
 - spec/spec_helper.rb

data/lib/briar/uia/briar_ipad_emulation.rb

@@ -1,174 +0,0 @@
-require 'calabash-cucumber'
-
-module Briar
-  module UIA
-    module IPadEmulation
-
-      class Cache
-
-        attr_accessor :window_index
-
-        def initialize
-          @window_index = nil
-        end
-
-
-      end
-      # use the apple localization codes
-      IPAD_1X_2X_BUTTON_LABELS = {
-            :en => {:emulated_1x => 'Switch to full screen mode',
-                    :emulated_2x => 'Switch to normal mode'}
-      }
-
-      def ensure_uia_and_ipad()
-        unless ipad?
-          screenshot_and_raise 'this function is only for the iPad'
-        end
-
-        unless ios7?
-          screenshot_and_raise 'this function only works on iOS 7'
-        end
-
-        unless uia_available?
-          screenshot_and_raise 'this function requires the app be launched with instruments'
-        end
-      end
-
-
-      def ipad_1x_2x_labels_hash(lang_code)
-        ht = IPAD_1X_2X_BUTTON_LABELS[lang_code]
-        if ht.nil?
-          screenshot_and_raise "did not recognize language code '#{lang_code}'"
-        end
-        ht
-      end
-
-      def ipad_1x_2x_labels_array(lang_code)
-        ht = ipad_1x_2x_labels_hash lang_code
-        [ht[:emulated_1x], ht[:emulated_2x]]
-      end
-
-      def uia_ipad_scale(opts={})
-        default_opts = {:language_code => :en,
-                        :ensure_uia_and_ipad => false,
-                        :cache => Cache.new}
-        opts = default_opts.merge(opts)
-
-        if opts[:ensure_uia_and_ipad]
-          ensure_uia_and_ipad()
-          opts[:ensure_uia_and_ipad] = false
-        end
-
-
-        idx = window_index_of_ipad_1x_2x_button opts
-
-        res = uia("UIATarget.localTarget().frontMostApp().windows()[#{idx}].buttons()[0].label()")
-        val = res['value']
-
-        candidates = ipad_1x_2x_labels_array(opts[:language_code])
-
-        if val.eql?(candidates[0])
-          :emulated_1x
-        else
-          :emulated_2x
-        end
-      end
-
-      def window_index_of_ipad_1x_2x_button(opts={})
-
-        default_opts = {:language_code => :en,
-                        :ensure_uia_and_ipad => false,
-                        :raise_if_not_found => true,
-                        :cache => Cache.new}
-        opts = default_opts.merge(opts)
-
-        cache = opts[:cache]
-        return cache.window_index unless cache.window_index.nil?
-
-
-        ensure_uia_and_ipad() if opts[:ensure_uia_and_ipad]
-
-        window_count = uia('UIATarget.localTarget().frontMostApp().windows().length')['value']
-        index = 0
-
-        lang_code = opts[:language_code]
-        candidates = ipad_1x_2x_labels_array(lang_code)
-        success = false
-        loop do
-          res = uia("UIATarget.localTarget().frontMostApp().windows()[#{index}].buttons()[0].label()")
-          if candidates.include?(res['value'])
-            success = true
-            break
-          end
-          index = index + 1
-          break unless index < window_count
-        end
-
-        unless success
-          if opts[:raise_if_not_found]
-            screenshot_and_raise "could not find window with button label '#{candidates[0]}' or '#{candidates[1]}' - is your an iphone app emulated on an ipad?"
-          end
-          index = -1
-        end
-        cache.window_index = index
-        index
-      end
-
-      def uia_tap_ipad_scale_button(opts={})
-        default_opts = {:language_code => :en,
-                        :ensure_uia_and_ipad => false,
-                        :step_pause_after_touch => BRIAR_STEP_PAUSE,
-                        :cache => Cache.new}
-        opts = default_opts.merge(opts)
-        ensure_uia_and_ipad() if opts[:ensure_uia_and_ipad]
-
-        idx = window_index_of_ipad_1x_2x_button(opts)
-        uia("UIATarget.localTarget().frontMostApp().windows()[#{idx}].buttons()[0].tap()")
-        sleep(opts[:step_pause_after_touch])
-      end
-
-
-      def ensure_ipad_emulation_scale(scale, opts={})
-        allowed = [:emulated_1x, :emulated_2x]
-        unless allowed.include?(scale)
-          screenshot_and_raise "'#{scale}' is not one of '#{allowed}' allowed args"
-        end
-
-        cache = Cache.new
-
-        return unless iphone_app_emulated_on_ipad?
-
-        default_opts = {:language_code => :en,
-                        :ensure_uia_and_ipad => false,
-                        :step_pause_after_touch => BRIAR_STEP_PAUSE,
-                        :cache => cache}
-        opts = default_opts.merge(opts)
-
-        actual_scale = uia_ipad_scale(opts)
-
-        if actual_scale != scale
-          uia_tap_ipad_scale_button opts
-        end
-      end
-
-      def ensure_ipad_emulation_1x(opts={})
-        default_opts = {:language_code => :en,
-                        :ensure_uia_and_ipad => false,
-                        :step_pause_after_touch => BRIAR_STEP_PAUSE,
-                        :cache => Cache.new}
-        opts = default_opts.merge(opts)
-        ensure_ipad_emulation_scale(:emulated_1x, opts)
-      end
-
-      def ensure_ipad_emulation_2x(opts={})
-        default_opts = {:language_code => :en,
-                        :ensure_uia_and_ipad => false,
-                        :step_pause_after_touch => BRIAR_STEP_PAUSE,
-                        :cache => Cache.new}
-        opts = default_opts.merge(opts)
-        ensure_ipad_emulation_scale(:emulated_2x, opts)
-      end
-
-    end
-  end
-end