gametel 0.5.5 → 0.5.6

data/features/button.feature

@@ -52,7 +52,7 @@ Feature: Interacting with buttons
     Then the "button" field identified by "text" can determine the following properties:
       | property  | value |
       | clickable | true  |
-      | enabled   | false |
+      | enabled   | true  |
       | focusable | true  |
       | focused   | false |
       | selected  | false |

data/lib/gametel.rb

@@ -1,5 +1,6 @@
 require 'gametel/accessors'
 require 'gametel/navigation'
+require 'gametel/waiter'
 require 'gametel/version'
 require 'gametel/platforms/brazenhead_platform'
 require 'gametel/views'

data/lib/gametel/navigation.rb

@@ -13,6 +13,7 @@ module Gametel
     #
     def on(cls, &block)
       @current_screen = @current_page = cls.new
+      wait_until { @current_screen.active? } if @current_screen.respond_to?(:active?)
       block.call @current_screen if block
       @current_screen
     end

data/lib/gametel/platforms/brazenhead/list_item.rb

@@ -12,14 +12,16 @@ module Gametel
 
       def text_from_list_item(locator)
         list_item(locator) do |device|
-          device.get_current_text_views('@@the_view@@', :target => 'Robotium')
+          get_class(device, 'android.widget.TextView')
+          device.get_current_views('@@the_class@@', '@@the_view@@', :target => 'Robotium')
         end
         last_json.map { |text_view| text_view['text'] }
       end
 
       def list_item_has_image(locator)
         list_item(locator) do |device|
-          device.get_current_image_views('@@the_view@@', :target => 'Robotium')
+          get_class(device, 'android.widget.ImageView')
+          device.get_current_views('@@the_class@@', '@@the_view@@', :target => 'Robotium')
         end
         last_json[0]['hasDrawable'] if last_json[0]
       end
@@ -31,6 +33,11 @@ module Gametel
           block.call device if block
         end
       end
+
+      def get_class(device, class_name)
+        device.get_class
+        device.for_name class_name, :variable => '@@the_class@@'
+      end
     end
   end
 end

data/lib/gametel/version.rb

@@ -1,3 +1,3 @@
 module Gametel
-  VERSION = "0.5.5"
+  VERSION = "0.5.6"
 end

data/lib/gametel/waiter.rb

@@ -0,0 +1,16 @@
+module Gametel
+  module Waiter
+    class Timeout < StandardError; end
+
+    def wait_until(timeout=10, &block)
+      last_call = ::Time.now + timeout
+      while ::Time.now < last_call
+        stoppit = block.call if block
+        return if stoppit
+        sleep 0.1
+      end
+
+      raise Timeout
+    end
+  end
+end

data/spec/lib/gametel/navigation_spec.rb

@@ -0,0 +1,30 @@
+require 'spec_helper'
+
+include Gametel::Navigation
+
+class NavigationScreen
+end
+
+describe Gametel::Navigation do
+  let(:screen) { double 'gametel screen' }
+
+  before(:each) do
+    ::Time.stub(:now).and_return(0)
+    NavigationScreen.should_receive(:new).and_return(screen)
+  end
+
+  it "is cool, if you don't care about :active?" do
+    on(NavigationScreen)
+  end
+
+  it "cares about :active? if you do" do
+    screen.should_receive(:active?).and_return(true)
+    on(NavigationScreen)
+  end
+
+  it "will still wait on you, though" do
+    screen.stub(:active?).and_return(true)
+    self.should_receive(:wait_until)
+    on(NavigationScreen)
+  end
+end

data/spec/lib/gametel/waiter_spec.rb

@@ -0,0 +1,21 @@
+require 'spec_helper'
+
+include Gametel::Waiter
+
+describe Gametel::Waiter do
+  before(:each) do
+    ::Time.stub(:now).and_return(100)
+    self.stub(:sleep)
+  end
+
+  it "should wait for your condition" do
+    screen = double("fake screen")
+    screen.should_receive(:predicate?).and_return(false, false, true)
+    self.should_receive(:sleep).exactly(2)
+    wait_until(2) { screen.predicate? }
+  end
+
+  it "is not as forgiving if you make it wait" do
+    lambda { wait_until(0) }.should raise_error
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gametel
 version: !ruby/object:Gem::Version
-  version: 0.5.5
+  version: 0.5.6
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-27 00:00:00.000000000 Z
+date: 2013-03-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: brazenhead
@@ -19,7 +19,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.4.5
+        version: 0.4.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -27,7 +27,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.4.5
+        version: 0.4.6
 - !ruby/object:Gem::Dependency
   name: ADB
   requirement: !ruby/object:Gem::Requirement
@@ -35,7 +35,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.5.4
+        version: 0.5.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -43,7 +43,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.5.4
+        version: 0.5.5
 - !ruby/object:Gem::Dependency
   name: page_navigation
   requirement: !ruby/object:Gem::Requirement
@@ -51,7 +51,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0.3'
+        version: '0.7'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -59,7 +59,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0.3'
+        version: '0.7'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -179,7 +179,10 @@ files:
 - lib/gametel/views/spinner.rb
 - lib/gametel/views/text.rb
 - lib/gametel/views/view.rb
+- lib/gametel/waiter.rb
 - spec/lib/gametel/accessors_spec.rb
+- spec/lib/gametel/navigation_spec.rb
+- spec/lib/gametel/waiter_spec.rb
 - spec/lib/gametel_spec.rb
 - spec/spec_helper.rb
 homepage: http://github.com/leandog/gametel
@@ -194,15 +197,21 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 2214503716202349439
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 2214503716202349439
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 1.8.25
 signing_key: 
 specification_version: 3
 summary: High level wrapper around android drivers
@@ -250,5 +259,7 @@ test_files:
 - features/text.feature
 - features/view.feature
 - spec/lib/gametel/accessors_spec.rb
+- spec/lib/gametel/navigation_spec.rb
+- spec/lib/gametel/waiter_spec.rb
 - spec/lib/gametel_spec.rb
 - spec/spec_helper.rb