briar 0.1.3.b7 → 0.1.3.b8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 64cfb8af1d1f6f49f08a52b1ad05ddea03652fa6
-  data.tar.gz: 153e16ff005812af6f6f7c6442ff1b169ad86a2b
+  metadata.gz: d41c3feb1feec357d18d6bf4309999c248b8d664
+  data.tar.gz: 83235a9761d72557bfe0527f6c10741fd1c0bd9c
 SHA512:
-  metadata.gz: eba1da164fd5b0d7e2f58c5a36432ea7a2119bc8f581be538c97aa21339868df381fa47dd9ac45108ec0f7500f8a555d0c1a01bb4b5fea38d47cdb0c05aa7021
-  data.tar.gz: 181817f3977856a0d2b9cb30171d1a77d42733be2e081275559987bf74ac1988f290ba61fab7de6ac4a218de5985fd59ee0b3f29a6adb42785cf3c4410be8b42
+  metadata.gz: 021631be2fb7f87bd3128da2990acecbae0cd4b56535dd9702483772e3fc719f3fb271a37311ba5fa5aab9673cfd62a9f579a53b3e4fb16fb59c838f7fec9800
+  data.tar.gz: 62a149922a64cf8e2ac6912cb2ef84b8152eaef9017389e1c3558c055189f613e31746389a2e8c9ef4d584810aa508693e3b677342ced1067e2b4da1f881fe18

data/README.md

@@ -33,6 +33,9 @@ require 'briar/cucumber'
 I18n.enforce_available_locales = false
 ```
 
+To integrate briar and your calabash-ios console see: https://github.com/jmoody/briar/wiki/Integrating-Briar-Into-Your-Calabash-Console
+
+
 ## Xamarin Test Cloud
 
 There is currently an issue with using briar predefined steps on the XTC:

data/briar.gemspec

@@ -25,10 +25,12 @@ Gem::Specification.new do |gem|
   gem.platform = Gem::Platform::RUBY
   gem.required_ruby_version = '>= 1.8.7'
 
-  gem.add_runtime_dependency 'rbx-require-relative', "~> 0.0.9"
+  gem.add_runtime_dependency 'rbx-require-relative', '~> 0.0.9'
   gem.add_runtime_dependency 'calabash-cucumber', '>= 0.9.164'
   gem.add_runtime_dependency 'rake', '~>10.1'
-  gem.add_runtime_dependency 'syntax', '~>1.2'
+  # downgrading to 1.0.0 from 1.2.0
+  # https://trello.com/c/YKREVfCX/630-lesspainfulformatter-should-depend-on-syntax-1-2-0
+  gem.add_runtime_dependency 'syntax', '~>1.0.0'
 
   gem.files = `git ls-files`.split("\n") - ['.gitignore']
   gem.executables = 'briar'

data/lib/briar.rb

@@ -75,3 +75,6 @@ require 'briar/scroll_view'
 require 'briar/table'
 require 'briar/text_field'
 require 'briar/text_view'
+
+require 'briar/page/briar_page_helpers'
+require 'briar/page/briar_page'

data/lib/briar/briar_core.rb

@@ -1,3 +1,4 @@
+#noinspection RubyResolve
 require 'calabash-cucumber'
 
 module Briar
@@ -49,6 +50,7 @@ module Briar
       }
     end
 
+    # todo refactor should_see_view_with_center to wait for view
     def should_see_view_with_center(view_id, center_ht)
       res = query("view marked:'#{view_id}'").first
       if res.nil?
@@ -69,13 +71,18 @@ module Briar
       end
     end
 
-    def touch_view_named(view_id)
+    def touch_view(view_id)
       wait_for_view view_id
       touch("view marked:'#{view_id}'")
     end
 
+    def touch_view_named(view_id)
+      _deprecated('0.1.3', "use 'touch_view' instead", :warn)
+      touch_view(view_id)
+    end
+
     def touch_and_wait_for_view(view_id, view_to_wait_for, timeout=BRIAR_WAIT_TIMEOUT)
-      touch_view_named(view_id)
+      touch_view(view_id)
       wait_for_view(view_to_wait_for, timeout)
     end
 
@@ -152,7 +159,7 @@ module Briar
     end
 
     def touch_and_wait_to_disappear(view_id, timeout=BRIAR_WAIT_TIMEOUT)
-      touch_view_named(view_id)
+      touch_view(view_id)
       wait_for_view_to_disappear view_id, timeout
     end
 

data/lib/briar/control/button.rb

@@ -68,8 +68,17 @@ module Briar
                  :timeout_message => msg) do
           button_exists? button_id
         end
-        should_see_button_with_title(button_id, title)
+        res = query("button descendant view {text LIKE '#{title}'")
+        if res.empty?
+          screenshot_and_raise "expected button '#{button_id}' to have title '#{title}'"
+        end
+      end
+
+      def touch_button_with_title(button_id, title, timeout=BRIAR_WAIT_TIMEOUT)
+        wait_for_button_with_title button_id, title, timeout
+        touch("button marked:'#{button_id}'")
       end
+
     end
   end
 end

data/lib/briar/cucumber.rb

@@ -27,30 +27,43 @@ World(Briar::ScrollView)
 World(Briar::Table)
 World(Briar::TextField)
 World(Briar::TextView)
+World(Briar::Page::Helpers)
 
+# briar predefined steps are not found during the XTC validation phase
+#
+# they are, however, correctly exposed because if you copy them to the
+# step_definitions directory as part of the XTC submission, you will see
+# Cucumber:Ambiguous errors
+#
+# so the strategy to is avoid loading the step definitions when running on the
+# XTC and copying them to the features/step_definitions directory during the
+# XTC job submission.
+#
+# see the xamarin-build.sh script
+unless ENV['XAMARIN_TEST_CLOUD'] == '1'
+  require_relative '../../features/step_definitions/alerts_and_sheets/action_sheet_steps'
+  require_relative '../../features/step_definitions/alerts_and_sheets/alert_view_steps'
 
-require_relative '../../features/step_definitions/alerts_and_sheets/action_sheet_steps'
-require_relative '../../features/step_definitions/alerts_and_sheets/alert_view_steps'
+  require_relative '../../features/step_definitions/bars/tabbar_steps'
+  require_relative '../../features/step_definitions/bars/navbar_steps'
+  require_relative '../../features/step_definitions/bars/toolbar_steps'
 
-require_relative '../../features/step_definitions/bars/tabbar_steps'
-require_relative '../../features/step_definitions/bars/navbar_steps'
-require_relative '../../features/step_definitions/bars/toolbar_steps'
+  require_relative '../../features/step_definitions/control/button_steps'
+  require_relative '../../features/step_definitions/control/segmented_control_steps'
+  require_relative '../../features/step_definitions/control/slider_steps'
 
-require_relative '../../features/step_definitions/control/button_steps'
-require_relative '../../features/step_definitions/control/segmented_control_steps'
-require_relative '../../features/step_definitions/control/slider_steps'
 
+  require_relative '../../features/step_definitions/picker/picker_steps'
+  require_relative '../../features/step_definitions/picker/date_picker_steps'
 
-require_relative '../../features/step_definitions/picker/picker_steps'
-require_relative '../../features/step_definitions/picker/date_picker_steps'
 
+  require_relative '../../features/step_definitions/email_steps'
+  require_relative '../../features/step_definitions/image_view_steps'
+  require_relative '../../features/step_definitions/keyboard_steps'
+  require_relative '../../features/step_definitions/label_steps'
+  require_relative '../../features/step_definitions/scroll_view_steps'
 
-require_relative '../../features/step_definitions/email_steps'
-require_relative '../../features/step_definitions/image_view_steps'
-require_relative '../../features/step_definitions/keyboard_steps'
-require_relative '../../features/step_definitions/label_steps'
-require_relative '../../features/step_definitions/scroll_view_steps'
-
-require_relative '../../features/step_definitions/table_steps'
-require_relative '../../features/step_definitions/text_field_steps'
-require_relative '../../features/step_definitions/text_view_steps'
+  require_relative '../../features/step_definitions/table_steps'
+  require_relative '../../features/step_definitions/text_field_steps'
+  require_relative '../../features/step_definitions/text_view_steps'
+end

data/lib/briar/email.rb

@@ -162,7 +162,7 @@ module Briar
                  :retry_frequency => BRIAR_WAIT_RETRY_FREQ,
                  :post_timeout => BRIAR_WAIT_STEP_PAUSE,
                  :timeout_message => msg) do
-          uia_element_exists?(:view, {:marked => 'Delete Draft'})
+            uia_element_exists?(:view, {:marked => 'Delete Draft'})
         end
 
         uia_tap_mark('Delete Draft')
@@ -180,11 +180,9 @@ module Briar
         screenshot_and_raise 'UIA needs to be available'
       end
 
-      res = uia_query(:view, {:marked => 'To:'}).first
-      rect = res['rect']
-      point = {:x => rect['x'] + (2 * rect['width']),
-               :y => rect['y']}
-      uia_touch_with_options(point)
+      # with predicate
+      # uia_tap(:textField, {[:label, :beginswith] => "'To:'"})
+      uia_tap(:textField, marked:'toField')
       uia_wait_for_keyboard if opts[:wait_for_keyboard]
     end
 

data/lib/briar/irbrc.rb

@@ -0,0 +1,199 @@
+require 'rubygems'
+require 'irb/completion'
+require 'irb/ext/save-history'
+require 'awesome_print'
+AwesomePrint.irb!
+
+require 'require_relative'
+
+#noinspection RubyUnusedLocalVariable
+def World(*world_modules, &proc)
+  world_modules.each { |mod|
+    include mod
+    puts "loaded '#{mod}'"
+  }
+end
+
+
+ARGV.concat [ '--readline',
+              '--prompt-mode',
+              'simple']
+
+# 25 entries in the list
+IRB.conf[:SAVE_HISTORY] = 50
+
+# Store results in home directory with specified file name
+IRB.conf[:HISTORY_FILE] = '.irb-history'
+
+require 'calabash-cucumber'
+require 'calabash-cucumber/operations'
+require 'calabash-cucumber/launch/simulator_helper'
+require 'calabash-cucumber/launcher'
+
+SIM=Calabash::Cucumber::SimulatorHelper
+
+extend Calabash::Cucumber::Operations
+
+def embed(x,y=nil,z=nil)
+  puts "Screenshot at #{x}"
+end
+
+puts 'loaded calabash'
+
+include Briar::Bars
+include Briar::Alerts_and_Sheets
+include Briar::Control::Button
+include Briar::Control::Segmented_Control
+include Briar::Control::Slider
+include Briar::Picker
+include Briar::Picker_Shared
+include Briar::Picker::DateCore
+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
+include Briar::Keyboard
+include Briar::UIAKeyboard
+include Briar::UIAKeyboard::Numeric
+include Briar::UIAKeyboard::Language
+include Briar::Email
+include Briar::TextField
+include Briar::TextView
+include Briar::Page::Helpers
+
+
+@ai=:accessibilityIdentifier
+@al=:accessibilityLabel
+
+def print_marks(marks, max_width)
+  counter = -1
+  marks.sort.each { |elm|
+    printf("%4s %#{max_width + 2}s => %s\n", "[#{counter = counter + 1}]", elm[0], elm[1])
+  }
+end
+
+def accessibility_marks(kind, opts={})
+  opts = {:print => true, :return => false}.merge(opts)
+
+  kinds = [:id, :label]
+  raise "'#{kind}' is not one of '#{kinds}'" unless kinds.include?(kind)
+
+  res = Array.new
+  max_width = 0
+  query('*').each { |view|
+    aid = view[kind.to_s]
+    unless aid.nil? or aid.eql?('')
+      cls = view['class']
+      len = cls.length
+      max_width = len if len > max_width
+      res << [cls, aid]
+    end
+  }
+  print_marks(res, max_width) if opts[:print]
+  opts[:return] ? res : nil
+end
+
+def text_marks(opts={})
+  opts = {:print => true, :return => false}.merge(opts)
+
+  indexes = Array.new
+  idx = 0
+  all_texts = query('*', :text)
+  all_texts.each { |view|
+    indexes << idx unless view.eql?('*****') or view.eql?('')
+    idx = idx + 1
+  }
+
+  res = Array.new
+
+  all_views = query('*')
+  max_width = 0
+  indexes.each { |index|
+    view = all_views[index]
+    cls = view['class']
+    text = all_texts[index]
+    len = cls.length
+    max_width = len if len > max_width
+    res << [cls, text]
+  }
+
+  print_marks(res, max_width) if opts[:print]
+  opts[:return] ? res : nil
+end
+
+
+def ids
+  accessibility_marks(:id)
+end
+
+def labels
+  accessibility_marks(:label)
+end
+
+def text
+  text_marks
+end
+
+def marks
+  opts = {:print => false, :return => true }
+  res = accessibility_marks(:id, opts).each { |elm|elm << :ai }
+  res.concat(accessibility_marks(:label, opts).each { |elm| elm << :al })
+  res.concat(text_marks(opts).each { |elm| elm << :text })
+  max_width = 0
+  res.each { |elm|
+    len = elm[0].length
+    max_width = len if len > max_width
+  }
+
+  counter = -1
+  res.sort.each { |elm|
+    printf("%4s %-4s => %#{max_width}s => %s\n",
+           "[#{counter = counter + 1}]",
+           elm[2], elm[0], elm[1])
+  }
+  nil
+end
+
+def nbl
+  query('navigationButton', :accessibilityLabel)
+end
+
+def row_ids
+  query('tableViewCell', @ai).compact.sort.each {|x| puts "* #{x}" }
+end
+
+def puts_calabash_environment
+
+  puts ''
+  puts "loaded #{Dir.pwd}/.irbrc"
+  puts ''
+  puts "             DEVICE_ENDPOINT => '#{ENV['DEVICE_ENDPOINT']}'"
+  puts "               DEVICE_TARGET => '#{ENV['DEVICE_TARGET']}'"
+  puts "                      DEVICE => '#{ENV['DEVICE']}'"
+  puts "                   BUNDLE_ID => '#{ENV['BUNDLE_ID']}'"
+  puts "                PLAYBACK_DIR => '#{ENV['PLAYBACK_DIR']}'"
+  puts "             SCREENSHOT_PATH => '#{ENV['SCREENSHOT_PATH']}'"
+  puts "                 SDK_VERSION => '#{ENV['SDK_VERSION']}'"
+  puts "CALABASH_FULL_CONSOLE_OUTPUT => '#{ENV['CALABASH_FULL_CONSOLE_OUTPUT']}'"
+  puts "                       DEBUG => '#{ENV['DEBUG']}'"
+  puts ''
+  puts '*** useful functions defined in .irbrc ***'
+  puts '> ids     => all accessibilityIdentifiers'
+  puts '> labels  => all accessibilityLabels'
+  puts '> text    => all text'
+  puts '> row_ids => all tableViewCell accessibilityIdentifiers'
+  puts ''
+end
+
+def briar_message_of_the_day
+  motd=["Let's get this done!", 'Ready to rumble.', 'Enjoy.', 'Remember to breathe.',
+        'Take a deep breath.', "Isn't it time for a break?", 'Can I get you a coffee?',
+        'What is a calabash anyway?', 'Smile! You are on camera!', 'Let op! Wild Rooster!',
+        "Don't touch that button!", "I'm gonna take this to 11.", 'Console. Engaged.',
+        'Your wish is my command.', 'This console session was created just for you.']
+  puts "#{motd.sample}"
+end

data/lib/briar/page/briar_page.rb

@@ -0,0 +1,55 @@
+require 'calabash-cucumber/ibase'
+
+# extends Calabash::IBase
+class BriarPage < Calabash::IBase
+
+  def initialize(world, transition_duration=BRIAR_WAIT_STEP_PAUSE)
+    super(world, transition_duration)
+  end
+
+  # returns a query string that can be used by +trait+ method to create a
+  # query string based on the mark
+  #
+  # accepts the following options:
+  #     +:ui_class+ - defaults to <tt>'view'</tt>
+  #     +:is_custom_class+ - defaults to +false+
+  #
+  # raises an exception if +:is_custom+ is +true+ and +:ui_class+ is
+  # <tt>'view'</tt> - set the +:ui_class+ to your custom class name
+  def qstr_for_trait(mark, opts={})
+    default_opts = {:ui_class => 'view',
+                    :is_custom => false}
+    opts = default_opts.merge(opts)
+
+    ui_class = opts[:ui_class]
+    is_custom = opts[:is_custom]
+
+    if is_custom and ui_class.eql?('view')
+      raise "if is_custom is 'true' than ui_class should not be '#{view}'"
+    end
+
+    if opts[:is_custom]
+      view = "view:'#{opts[:is_custom]}'"
+    else
+      view = ui_class
+    end
+
+    "#{view} marked:'#{mark}'"
+  end
+
+  # returns the mark for this page
+  #
+  # raises an exception if subclass does not implement
+  def mark
+    raise "subclasses must implement the 'mark' method"
+  end
+
+  def trait
+    qstr_for_trait(mark)
+  end
+
+  def page_visible?
+    view_exists?(mark)
+  end
+
+end

data/lib/briar/page/briar_page_helpers.rb

@@ -0,0 +1,35 @@
+module Briar
+  module Page
+    module Helpers
+
+      # returns +true+ if +current_page+ is an instance of +page_class+
+      #
+      # the +current_page+ argument defaults to the +@cp+ World variable
+      def cp_is?(page_class, current_page=@cp)
+        current_page.is_a?(page_class)
+      end
+
+      # raises a exception if the +current_page+ is not an instance of
+      # +page_class+
+      #
+      # the +current_page+ argument defaults to the +@cp+ World variable
+      def expect_current_page(page_class, current_page=@cp)
+        unless cp_is? page_class, current_page
+          screenshot_and_raise "expected current page to be '#{page_class}' but found '#{current_page}'"
+        end
+      end
+
+      # raises an exception if the +current_page+ is not an instance of any of
+      # +page_classes+
+      #
+      # the +current_page+ argument defaults to the +@cp+ World variable
+      def expect_current_page_is_one_of(page_classes, current_page=@cp)
+        res = page_classes.any? { |page_class| cp_is?(page_class, current_page) }
+        unless res
+          screenshot_and_raise "expected current page to be on of these '#{page_classes}' pages but found '#{current_page}'"
+        end
+      end
+
+    end
+  end
+end

data/lib/briar/uia/briar_ipad_emulation.rb

@@ -74,14 +74,6 @@ module Briar
         end
       end
 
-
-      def is_iphone_app_emulated_on_ipad?(cache=Cache.new)
-        return false unless ipad?
-        idx = window_index_of_ipad_1x_2x_button({:raise_if_not_found => false,
-                                                 :cache => cache})
-        idx != -1
-      end
-
       def window_index_of_ipad_1x_2x_button(opts={})
 
         default_opts = {:language_code => :en,
@@ -143,8 +135,8 @@ module Briar
         end
 
         cache = Cache.new
-        #noinspection RubyParenthesesAfterMethodCallInspection
-        return unless is_iphone_app_emulated_on_ipad?(cache)
+
+        return unless iphone_app_emulated_on_ipad?
 
         default_opts = {:language_code => :en,
                         :ensure_uia_and_ipad => false,

data/lib/briar/version.rb

@@ -1,3 +1,3 @@
 module Briar
-  VERSION = '0.1.3.b7'
+  VERSION = '0.1.3.b8'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: briar
 version: !ruby/object:Gem::Version
-  version: 0.1.3.b7
+  version: 0.1.3.b8
 platform: ruby
 authors:
 - Joshua Moody
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-15 00:00:00.000000000 Z
+date: 2014-01-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rbx-require-relative
@@ -58,14 +58,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: 1.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: 1.0.0
 description: extends calabash-ios steps
 email:
 - joshuajmoody@gmail.com
@@ -117,11 +117,14 @@ files:
 - lib/briar/cucumber.rb
 - lib/briar/email.rb
 - lib/briar/image_view.rb
+- lib/briar/irbrc.rb
 - lib/briar/keyboard/keyboard.rb
 - lib/briar/keyboard/uia_keyboard.rb
 - lib/briar/keyboard/uia_keyboard_language.rb
 - lib/briar/keyboard/uia_numeric_keyboard.rb
 - lib/briar/label.rb
+- lib/briar/page/briar_page.rb
+- lib/briar/page/briar_page_helpers.rb
 - lib/briar/picker/date_picker.rb
 - lib/briar/picker/date_picker_core.rb
 - lib/briar/picker/date_picker_manipulation.rb
@@ -159,6 +162,6 @@ rubyforge_project:
 rubygems_version: 2.2.1
 signing_key: 
 specification_version: 4
-summary: briar-0.1.3.b7
+summary: briar-0.1.3.b8
 test_files:
 - spec/spec_helper.rb