briar 0.1.4.b1 → 0.1.4.b2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f2de2d2410ddc9524589489604312c5b4a6512f1
-  data.tar.gz: 548da4584b0f8fbafa8d5fae39b469bef887cbfe
+  metadata.gz: 62fe6beab3ccafca8f63ed1495401e1fd87fd655
+  data.tar.gz: 6640a39a83872ad212563db4d509519fa37a5b0f
 SHA512:
-  metadata.gz: cc2e61cae457c7343a72fbccf4ba67491c786aea152734873dcda30419268e508c28eec564c6cf2a2eb7656fd0eb7c5beca0e3102190516644177720142b6b02
-  data.tar.gz: 62857537e5d132f602138a1f0cad5790e303edbd19914e9da6cfbb71ba656fece8025d2fe8759f93cd5768d61161f58c29d4ec538784872f748e9e4f6c0cea3e
+  metadata.gz: 98f0247ebb873a2ff6f5d253512e9d472ed0fe349bf2c9217c618c89a97838572ae9ca8ee29732679a2988c464b773a2ab0db0d5eb66c7e069990eb109c0cf4e
+  data.tar.gz: 8593a9acd379968e2a26d08fd9e7c014e82f39f2cb10aa33985ef005d47a98293520e71b3a53b7f5888207da00bbdb7df6625615500a379f2fd55fd066b1579b

data/lib/briar.rb

@@ -97,4 +97,12 @@ if RUBY_VERSION.start_with?('1.8')
     end
 
   end
+
+  class Array
+
+    def sample(*args)
+      self.choice(args)
+    end
+
+  end
 end

data/lib/briar/bars/navbar.rb

@@ -19,7 +19,18 @@ module Briar
     end
 
     def navbar_has_back_button?
-      !query('navigationItemButtonView').empty?
+      res = query('navigationItemButtonView')
+      return false if res.empty?
+
+      # sometime the back button is there, but has zero rect
+      frame = res.first['frame']
+
+      ['x', 'y', 'width', 'height'].each { |key|
+        if frame[key] != 0
+          return true
+        end
+      }
+      false
     end
 
     def should_see_navbar_back_button
@@ -74,21 +85,33 @@ module Briar
     end
 
 
-    def should_not_see_navbar_button (name, is_ui_button=false)
-      if is_ui_button
-        qstr = "buttonLabel marked:'#{name}' parent navigationBar"
-        timeout = 1.0
-        msg = "waited for '#{timeout}' seconds but i still see '#{name}' in navigation bar"
+    # todo convert args to hash and mirror the should_see_navbar_button
+    #is_ui_button=false)
+    def should_not_see_navbar_button (mark, opts={})
+      if (not opts.is_a?(Hash)) and (not opts.nil?)
+        warn "\nWARN: deprecated 0.1.4 - you should no longer pass a Boolean '#{opts}' as an arg, pass opts hash instead"
+        button_type = opts ? :button : :bar_item
+        opts = {:bar_button_type => button_type}
+      end
+      default_opts = {:bar_button_type => :bar_item,
+                      :timeout => BRIAR_WAIT_TIMEOUT}
+      opts = default_opts.merge(opts)
+      if opts[:bar_button_type] == :button
+        queries = ["buttonLabel marked:'#{mark}' parent navigationBar",
+                   "button marked:'#{mark}' parent navigationBar"]
+        timeout = opts[:timeout]
+        msg = "waited for '#{timeout}' seconds but i still see '#{mark}' in navigation bar"
         wait_for(:timeout => timeout,
                  :retry_frequency => BRIAR_WAIT_RETRY_FREQ,
                  :post_timeout => BRIAR_WAIT_STEP_PAUSE,
                  :timeout_message => msg) do
-          element_does_not_exist qstr
+          queries.all? { |query| element_does_not_exist query }
         end
       else
-        idx = index_of_navbar_button name
+        idx = index_of_navbar_button mark
         unless idx.nil?
-          screenshot_and_raise "i should not see a navbar button named #{name}"
+          # check to see if it is a ui button
+          should_not_see_navbar_button mark, {:bar_button_type => :button}
         end
       end
     end

data/lib/briar/email.rb

@@ -82,20 +82,20 @@ module Briar
 
     def should_see_mail_view (opts = {:timeout => BRIAR_WAIT_TIMEOUT,
                                       :email_view_mark => 'compose email'})
-
-      {:timeout => BRIAR_WAIT_TIMEOUT, :email_view_mark => 'compose email'}.merge!(opts)
-
+      default_opts = {:timeout => BRIAR_WAIT_TIMEOUT,
+                      :email_view_mark => 'compose email'}
+      merged = default_opts.merge(opts)
 
       if email_not_testable?
         warn_about_no_ios5_email_view
         return
       end
 
-      timeout = opts[:timeout]
+      timeout = merged[:timeout]
       msg = "waited for '#{timeout}' seconds but did not see email compose view"
       #noinspection RubyParenthesesAfterMethodCallInspection
 
-      email_view_mark = opts[:email_view_mark]
+      email_view_mark = merged[:email_view_mark]
       wait_for(:timeout => timeout,
                :retry_frequency => BRIAR_WAIT_RETRY_FREQ,
                :post_timeout => BRIAR_WAIT_STEP_PAUSE,

data/lib/briar/keyboard/keyboard.rb

@@ -69,8 +69,10 @@ module Briar
 
 
     #noinspection RubyUnusedLocalVariable
-    def briar_clear_text(view_id, timeout=5)
-      _deprecated('0.1.1', "will remove 'timeout' argument in a future release", :warn)
+    def briar_clear_text(view_id, timeout=nil)
+      unless timeout.nil?
+        _deprecated('0.1.1', "will remove 'timeout' argument in a future release", :warn)
+      end
       clear_text("view marked:'#{view_id}'")
 
       # i really wanted this to work, but there are too many issues with the

data/lib/briar/table.rb

@@ -152,7 +152,9 @@ module Briar
 
     def briar_scroll_to_row_and_touch (row_id, opts={})
       if (not opts.is_a?(Hash)) and (not opts.nil?)
-        warn "WARN: deprecated 0.1.3 - you should no longer pass a view_id '#{opts}' as an arg, pass opts hash instead"
+        _deprecated('0.1.3',
+                    "you should no longer pass a view_id '#{opts}' as an arg, pass opts hash instead",
+                    :warn)
         opts = {:wait_for_id => opts}
       end
 

data/lib/briar/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: briar
 version: !ruby/object:Gem::Version
-  version: 0.1.4.b1
+  version: 0.1.4.b2
 platform: ruby
 authors:
 - Joshua Moody
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-19 00:00:00.000000000 Z
+date: 2014-03-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rbx-require-relative
@@ -227,6 +227,7 @@ rubyforge_project:
 rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
-summary: briar-0.1.4.b1
+summary: briar-0.1.4.b2
 test_files:
 - spec/spec_helper.rb
+has_rdoc: