gametel 0.5.1 → 0.5.2

data/features/navigation.feature

@@ -0,0 +1,14 @@
+Feature: Navigation through the screens of the application
+
+  Scenario: Navigating to a screen using the default route
+    When I navigate to the Controls screen 
+    Then I should see the text "Checkbox 1" on the screen
+
+  Scenario: Navigating to a screen using a named route
+    When I navigate to the Buttons screen using the "button_route" route
+    Then I should see the text "Views/Buttons" on the screen
+
+  Scenario: Navigating to a screen starting with a current screen
+    Given I am on the the ViewsMenuScreen
+    When I navigate to the Controls screen 
+    Then I should see the text "Checkbox 1" on the screen

data/features/spinners.feature

@@ -7,3 +7,14 @@ Feature:  Working with Spinners
   Scenario: Retrieving the selected Spinner text by index
     When I'm on the controls screen
     Then I can see the spinner value referenced by "index" is "Mercury"
+
+  Scenario: Setting the selected item in a Spinner by id
+    When I'm on the controls screen
+    And I select item number "3" from the spinner using "id"
+    Then I can see the spinner value referenced by "id" is "Mars"
+
+  Scenario: Setting the select item in a Spinner by index
+    When I'm on the controls screen
+    And I select item number "3" from the spinner using "index"
+    Then I can see the spinner value referenced by "index" is "Mars"
+

data/features/step_definitions/navigation_steps.rb

@@ -0,0 +1,12 @@
+When /^I navigate to the Controls screen$/ do
+  navigate_to(ControlsScreen)
+end
+
+When /^I navigate to the Buttons screen using the "(.*?)" route$/ do |route|
+  navigate_to(ButtonScreen, :using => route.to_sym)
+end
+
+Given /^I am on the the ViewsMenuScreen$/ do
+  on(MainMenuScreen).views
+  on(ViewsMenuScreen)
+end

data/features/step_definitions/spinners_steps.rb

@@ -3,3 +3,8 @@ Then /^I can see the spinner value referenced by "(.*?)" is "(.*?)"$/ do |how, t
     screen.send("spinner_#{how}").should eq(the_selected_value)
   end
 end
+
+When /^I select item number "(.*?)" from the spinner using "(.*?)"$/ do |num, how|
+  on(ControlsScreen).send "select_spinner_#{how}", num.to_i
+end
+

data/features/support/env.rb

@@ -1,10 +1,10 @@
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '../../', 'lib'))
 
 require 'rspec/expectations'
+require 'require_all'
 require 'brazenhead'
 require 'brazenhead/server'
 require 'gametel'
-require 'gametel/navigation'
 
 World(Gametel::Navigation)
 
@@ -17,6 +17,19 @@ keystore = {
 
 server = Brazenhead::Server.new('features/support/ApiDemos.apk', keystore)
 
+require_rel '/screens'
+
+Gametel::Navigation.routes = {
+  :default => [[MainMenuScreen, :views],
+               [ViewsMenuScreen, :controls],
+               [ControlsMenuScreen, :light_theme],
+               [ControlsScreen, :button_field_id]],
+  :button_route => [[MainMenuScreen, :views],
+                    [ViewsMenuScreen, :buttons],
+                    [ButtonScreen, :normal_id]]
+}
+
+
 class Driver
   include Brazenhead
 end

data/lib/gametel/accessors.rb

@@ -194,6 +194,9 @@ module Gametel
       define_method(name) do
         platform.get_spinner_value(locator)
       end
+      define_method("select_#{name}") do |value|
+        platform.select_spinner_value(locator, value)
+      end
     end
   end
 end

data/lib/gametel/navigation.rb

@@ -1,9 +1,58 @@
 module Gametel
+  #
+  # Module to facilitate create new gametel screen objects in
+  # definitions.
+  #
   module Navigation
+
+    class << self
+      attr_reader :navigation_routes
+
+      def routes=(routes)
+        @navigation_routes = routes
+      end
+    end
+
+    #
+    # create a new screen given a class name
+    #
     def on(cls, &block)
       @current_screen = cls.new
       block.call @current_screen if block
       @current_screen
     end
+
+    #
+    # Navigate to a specific screen following a predefined path.
+    #
+    def navigate_to(screen_cls, how = {:using => :default}, &block)
+      path = path_for how
+      from = @current_screen ? @current_screen.class : path[0][0]
+      from_index = find_index_for(path, from)
+      to_index = find_index_for(path, screen_cls) - 1
+      navigate_through_pages(path[from_index..to_index])
+      on(screen_cls, &block)
+    end
+
+    private
+
+    def path_for(how)
+      path = Gametel::Navigation.navigation_routes[how[:using]]
+      fail("Gametel::Navigation route :#{how[:using].to_s} not found") unless path
+      path
+    end
+
+    def find_index_for(path, item)
+      path.each_with_index { |each, index| return index if each[0] == item}
+    end
+
+    def navigate_through_pages(pages)
+      pages.each do |cls, method|
+        page = on(cls)
+        fail("Navigation method not specified on #{cls}.  Please call the ") unless page.respond_to? method
+        page.send method
+      end
+    end
+
   end
 end

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

@@ -17,7 +17,13 @@ module Gametel
           device.to_string
         end
       end
-      
+
+      def select_spinner_value_by_id(id, index)
+        chain_calls do |device|
+          device.id_from_name id, :variable => '@@the_id@@', :target => 'Brazenhead'
+          device.press_spinner_item_by_id '@@the_id@@', index, :target => 'Brazenhead'
+        end
+      end
     end
   end
 end

data/lib/gametel/platforms/brazenhead_platform.rb

@@ -25,7 +25,7 @@ module Gametel
       #
       def get_text(locator)
         result = get_text_by_id(locator[:id])
-        strip_quotes_from result.body
+        last_json
       end
 
       #
@@ -33,7 +33,7 @@ module Gametel
       #
       def get_text_hint(locator)
         result = get_text_hint_by_id(locator[:id])
-        strip_quotes_from result.body
+        last_json
       end
 
       #
@@ -41,7 +41,7 @@ module Gametel
       #
       def get_text_description(locator)
         result = get_text_description_by_id(locator[:id])
-        strip_quotes_from result.body
+        last_json
       end
 
       #
@@ -102,7 +102,15 @@ module Gametel
       def get_spinner_value(locator)
         result = get_spinner_value_by_id(locator[:id]) if locator[:id]
         result = get_spinner_value_by_index(locator[:index]) if locator[:index]
-        strip_quotes_from result.body
+        last_json
+      end
+
+      #
+      # select the spinner value using the item's index
+      #
+      def select_spinner_value(locator, index)
+        result = select_spinner_value_by_id(locator[:id], index) if locator[:id]
+        result = press_spinner_item(locator[:index], index) if locator[:index]
       end
 
       #
@@ -151,11 +159,6 @@ module Gametel
         result = send_key ENTER_KEY
       end
 
-      private
-
-      def strip_quotes_from(value)
-        value.gsub('"', '')
-      end
     end
   end
 end

data/lib/gametel/version.rb

@@ -1,3 +1,3 @@
 module Gametel
-  VERSION = "0.5.1"
+  VERSION = "0.5.2"
 end

data/spec/lib/gametel/accessors_spec.rb

@@ -511,6 +511,12 @@ describe Gametel::Accessors do
           result.should_receive(:body).and_return('the text value')
           screen.spinner_id.should eq('the text value')
         end
+
+        it "shuld be able to select an item" do
+          accumulator.should_receive(:id_from_name)
+          accumulator.should_receive(:press_spinner_item_by_id)
+          screen.select_spinner_id 4
+        end
       end
 
       context "identified by index" do
@@ -523,6 +529,11 @@ describe Gametel::Accessors do
           result.should_receive(:body).and_return('the text value')
           screen.spinner_index.should eq('the text value')
         end
+
+        it "should be able to select an item" do
+          platform.should_receive(:press_spinner_item).with(1, 4)
+          screen.select_spinner_index 4
+        end
       end
     end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gametel
 version: !ruby/object:Gem::Version
-  version: 0.5.1
+  version: 0.5.2
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-25 00:00:00.000000000 Z
+date: 2012-09-30 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.1
+        version: 0.4.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -27,7 +27,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.4.1
+        version: 0.4.2
 - !ruby/object:Gem::Dependency
   name: ADB
   requirement: !ruby/object:Gem::Requirement
@@ -76,6 +76,22 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: require_all
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: High level wrapper around android drivers
 email:
 - jeff.morgan@leandog.com
@@ -90,6 +106,7 @@ files:
 - features/is_enabled.feature
 - features/list_item.feature
 - features/main_screen.feature
+- features/navigation.feature
 - features/progress.feature
 - features/radio_button.feature
 - features/spinners.feature
@@ -100,6 +117,7 @@ files:
 - features/step_definitions/is_enabled_steps.rb
 - features/step_definitions/list_item_steps.rb
 - features/step_definitions/main_screen_steps.rb
+- features/step_definitions/navigation_steps.rb
 - features/step_definitions/progress_steps.rb
 - features/step_definitions/radio_button_steps.rb
 - features/step_definitions/spinners_steps.rb
@@ -153,12 +171,18 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: -226284468373359732
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: -226284468373359732
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24
@@ -172,6 +196,7 @@ test_files:
 - features/is_enabled.feature
 - features/list_item.feature
 - features/main_screen.feature
+- features/navigation.feature
 - features/progress.feature
 - features/radio_button.feature
 - features/spinners.feature
@@ -182,6 +207,7 @@ test_files:
 - features/step_definitions/is_enabled_steps.rb
 - features/step_definitions/list_item_steps.rb
 - features/step_definitions/main_screen_steps.rb
+- features/step_definitions/navigation_steps.rb
 - features/step_definitions/progress_steps.rb
 - features/step_definitions/radio_button_steps.rb
 - features/step_definitions/spinners_steps.rb