gametel 0.5.6 → 0.5.7

data/features/navigation.feature

@@ -12,3 +12,7 @@ Feature: Navigation through the screens of the application
     Given I am on the the ViewsMenuScreen
     When I continue navigating to the Controls screen 
     Then I should see the text "Checkbox 1" on the screen
+
+  Scenario: Waiting for screens to be active
+    When I wait for the "NeverWillExist" screen
+    Then the last error should tell me "Timed out waiting for NeverWillExist to be active"

data/features/step_definitions/navigation_steps.rb

@@ -13,3 +13,16 @@ end
 Given /^I am on the the ViewsMenuScreen$/ do
   navigate_to(ViewsMenuScreen)
 end
+
+When(/^I wait for the "(.*?)" screen$/) do |which|
+  begin
+    on(which.to_class)
+  rescue Exception => e
+    @last_error = e
+  end
+end
+
+Then(/^the last error should tell me "(.*?)"$/) do |what|
+  @last_error.message.should eq(what)
+end
+

data/features/support/core_ext/string.rb

@@ -0,0 +1,5 @@
+class String
+  def to_class
+    Object.const_get(self)
+  end
+end

data/features/support/screens/never_will_exist.rb

@@ -0,0 +1,7 @@
+class NeverWillExist
+  include Gametel
+
+  def active?
+    false
+  end
+end

data/lib/gametel.rb

@@ -13,7 +13,7 @@ module Gametel
   ROBOTIUM_RIGHT = 22
 
   def self.included(cls)
-    cls.extend Gametel::Accessors
+    cls.extend Gametel::Accessors, Gametel::Waiter
   end
 
   def initialize(pform = :brazenhead)

data/lib/gametel/navigation.rb

@@ -1,4 +1,5 @@
 require 'page_navigation'
+require 'gametel/waiter'
 
 module Gametel
   #
@@ -6,14 +7,15 @@ module Gametel
   # definitions.
   #
   module Navigation
-    include PageNavigation
+    include PageNavigation, Gametel::Waiter
 
     #
     # create a new screen given a class name
     #
     def on(cls, &block)
       @current_screen = @current_page = cls.new
-      wait_until { @current_screen.active? } if @current_screen.respond_to?(:active?)
+      waiting_for  = "#{cls} to be active"
+      wait_until(10, waiting_for) { @current_screen.active? } if @current_screen.respond_to?(:active?)
       block.call @current_screen if block
       @current_screen
     end

data/lib/gametel/version.rb

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

data/lib/gametel/waiter.rb

@@ -1,8 +1,18 @@
 module Gametel
   module Waiter
-    class Timeout < StandardError; end
+    class Timeout < StandardError
+      def initialize(waiting_for=nil)
+        super(waiting_for)
+        @waiting_for = waiting_for
+      end
+
+      def to_s
+        return super unless @waiting_for
+        "Timed out waiting for #{@waiting_for}"
+      end
+    end
 
-    def wait_until(timeout=10, &block)
+    def wait_until(timeout=10, message=nil, &block)
       last_call = ::Time.now + timeout
       while ::Time.now < last_call
         stoppit = block.call if block
@@ -10,7 +20,7 @@ module Gametel
         sleep 0.1
       end
 
-      raise Timeout
+      raise Timeout.new message
     end
   end
 end

data/spec/lib/gametel/navigation_spec.rb

@@ -27,4 +27,10 @@ describe Gametel::Navigation do
     self.should_receive(:wait_until)
     on(NavigationScreen)
   end
+
+  it "should say what we are waiting on" do
+    screen.stub(:active?).and_return(true)
+    self.should_receive(:wait_until).with(10, "NavigationScreen to be active")
+    on(NavigationScreen)
+  end
 end

data/spec/lib/gametel/waiter_spec.rb

@@ -18,4 +18,8 @@ describe Gametel::Waiter do
   it "is not as forgiving if you make it wait" do
     lambda { wait_until(0) }.should raise_error
   end
+
+  it "can be told what it is waiting on" do
+    lambda { wait_until(0, "something to happen") }.should raise_error "Timed out waiting for something to happen"
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gametel
 version: !ruby/object:Gem::Version
-  version: 0.5.6
+  version: 0.5.7
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-13 00:00:00.000000000 Z
+date: 2013-04-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: brazenhead
@@ -140,6 +140,7 @@ files:
 - features/step_definitions/text_steps.rb
 - features/step_definitions/view_steps.rb
 - features/support/ApiDemos.apk
+- features/support/core_ext/string.rb
 - features/support/debug.keystore
 - features/support/env.rb
 - features/support/hooks.rb
@@ -154,6 +155,7 @@ files:
 - features/support/screens/efficient_adapter_screen.rb
 - features/support/screens/lists_menu_screen.rb
 - features/support/screens/main_menu_screen.rb
+- features/support/screens/never_will_exist.rb
 - features/support/screens/seek_bar_screen.rb
 - features/support/screens/views_menu_screen.rb
 - features/text.feature
@@ -199,7 +201,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2214503716202349439
+      hash: -1788323344300920655
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -208,7 +210,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2214503716202349439
+      hash: -1788323344300920655
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.25
@@ -240,6 +242,7 @@ test_files:
 - features/step_definitions/text_steps.rb
 - features/step_definitions/view_steps.rb
 - features/support/ApiDemos.apk
+- features/support/core_ext/string.rb
 - features/support/debug.keystore
 - features/support/env.rb
 - features/support/hooks.rb
@@ -254,6 +257,7 @@ test_files:
 - features/support/screens/efficient_adapter_screen.rb
 - features/support/screens/lists_menu_screen.rb
 - features/support/screens/main_menu_screen.rb
+- features/support/screens/never_will_exist.rb
 - features/support/screens/seek_bar_screen.rb
 - features/support/screens/views_menu_screen.rb
 - features/text.feature