gametel 0.7 → 0.8

data/features/has_view.feature

@@ -3,7 +3,9 @@ Feature:  Determining whether or not a view exists
   Scenario:  Checking the existence of a view
     When I'm on the buttons screen
     Then we should know that the view with id "button_normal" exists
+    And we should know that the view with class "android.widget.Button" exists
 
   Scenario:  Checking the absence of a view
     When I'm on the buttons screen
     Then we should know that the view with id "checkbox_button" does not exist
+    And we should know that the view with class "android.widget.ListView" does not exist

data/features/step_definitions/checkbox_steps.rb

@@ -4,3 +4,8 @@ Then /^I should be able to click a checkbox by "(.*?)"$/ do |how|
     screen.send("checkbox_#{how}_view").should be_checked
   end
 end
+
+Then /^the checkbox identified by "(.*?)" should be checked$/ do |how|
+  on(ControlsScreen).send("checkbox_#{how}_checked?").should be_true
+end
+

data/features/step_definitions/has_view_steps.rb

@@ -1,12 +1,14 @@
-Then /^we should know that the view with id "(.*?)" exists$/ do |with_this_id|
+Then /^we should know that the view with (\w+) "(.*?)" exists$/ do |how, what|
   on(ButtonScreen) do |screen|
-    screen.should have_view(with_this_id)
+    locator = {}; locator[how.to_sym] = what
+    screen.should have_view(locator)
   end
 end
 
-Then /^we should know that the view with id "(.*?)" does not exist$/ do |with_this_id|
+Then /^we should know that the view with (\w+) "(.*?)" does not exist$/ do |how, what|
   on(ButtonScreen) do |screen|
-    screen.should_not have_view(with_this_id)
+    locator = {}; locator[how.to_sym] = what
+    screen.should_not have_view(locator)
   end
 end
 

data/features/step_definitions/webview_steps.rb

@@ -1,14 +1,83 @@
 Given(/^I have navigated to the webview screen$/) do
-  on(WebviewMainScreen).goto_webview
+  on(MainMenuScreen) do |screen|
+    screen.views
+    screen.wait_for_text 'Buttons'
+  end
+  on(ViewsMenuScreen).webview
 end
 
-When(/^I click the text "(.*?)"  in a webview$/) do |text|
-  on(WebviewScreen).click_on_text text
+When(/^I click the text "(.*?)" in a webview$/) do |text|
+  on(MixedWebviewScreen).click_on_text text
 end
 
 Then(/^I should see the text "(.*?)" in a webview$/) do |text|
+  on(MixedWebviewScreen).should have_text(text)
+end
+
+When(/^I look for elements in the webview$/) do
+  on(MixedWebviewScreen) do |screen|
+    screen.wait_for_text 'Welcome to Foundation'
+    @webview = screen.web_view
+  end
+end
+
+Then(/^I should know the following elements exist:$/) do |table|
+  table.hashes.each do |hsh|
+    @webview.should have_element(hsh['locator'], hsh['value'])
+  end
+end
+
+When(/^I click on the anchor with the text "(.*?)"$/) do |text|
+  @webview.click('textContent', text)
+end
+
+Then(/^I should be able to enter "(.*?)" into the text field$/) do |text|
+  on(MixedWebviewScreen).scroll_down
+  @webview.enter_text('id', 'tf', text)
+end
+
+Then(/^I should be able to type "(.*?)" into the text field$/) do |text|
+  on(MixedWebviewScreen).scroll_down
+  @webview.type_text('id', 'tf', text)
+end
+
+Then(/^I should be able to clear the text of the text field$/) do
+  @webview.clear_text('id', 'tf')
+end
+
+Then(/^I should be able to wait for the text field$/) do
+  @webview.wait_for_element('id', 'tf')
+end
+
+When(/^I click the text "(.*?)" in a webview screen$/) do |text|
+  on(WebviewScreen).click_on_text text
+end
+
+Then(/^I should see the text "(.*?)" in a webview screen$/) do |text|
+  on(WebviewScreen).should have_text(text)
+end
+
+When(/^I look for elements in the webview screen$/) do
+  on(WebviewScreen).wait_for_text 'Welcome to Foundation'
+end
+
+Then(/^I should know the following webview elements exist:$/) do |table|
+  table.hashes.each do |hsh|
+    on(WebviewScreen).should have_element(hsh['locator'], hsh['value'])
+  end
+end
+
+When(/^I click on the anchor with the text "Some Other Page" on that screen$/) do
+  on(WebviewScreen).some_other_page
+end
+
+Then(/^I should be able to enter "(.*?)" into the text field on that screen$/) do |text|
   on(WebviewScreen) do |screen|
-    screen.wait_for_text text
-    screen.has_text? text
+    screen.scroll_down
+    screen.address = text
   end
 end
+
+Then(/^I should be able to clear the text of the text field on that screen$/) do
+  on(WebviewScreen).clear_address
+end

data/features/support/env.rb

@@ -29,16 +29,11 @@ Gametel.keystore = {
 }
 
 
-Before('~@webview') do
+Before do
   Gametel.apk_path = 'features/support/ApiDemos.apk'
   @driver = Gametel.start('ApiDemos')
 end
 
-Before('@webview') do
-  Gametel.apk_path = 'webview_sample/bin/webview_sample-debug.apk'
-  driver = Gametel.start('MainActivity')
-end
-
 After do
   Gametel.stop
 end

data/features/support/screens/controls_screen.rb

@@ -6,6 +6,7 @@ class ControlsScreen
   text(:text_field_name, :content_description => 'Edit Description')
   view(:view_field_id, :id => 'edit')
   view(:view_field_text, :text => 'textColorPrimary')
+  view(:view_field_class, :class => 'android.widget.CheckBox', :index => 1)
   text(:button_field_id, :id => 'button')
   text(:button_disabled_field_id, :id => 'button_disabled')
   button(:enabled_save, :index => 0)

data/features/support/screens/midex_webview_screen.rb

@@ -0,0 +1,8 @@
+class MixedWebviewScreen
+  include Gametel
+
+  activity 'WebView1'
+  
+  webview(:web, :id => 'wv1')
+  
+end

data/features/support/screens/webview_screen.rb

@@ -1,6 +1,7 @@
 class WebviewScreen
-  include Gametel
+  include Gametel::Webview
 
-  webview(:web, :id => 'webView1')
+  link(:some_other_page, :text => 'Some Other Page')
+  text(:address, :id => 'tf')
   
 end

data/features/view.feature

@@ -5,6 +5,11 @@ Feature: Interacting with view elements
     And I choose the List Dialogs button by id
     Then I should see the "Command one" list item
 
+  Scenario: Clicking on views by their class
+    When I'm on the controls screen
+    Then I should be able to click a view by "class"
+    And the checkbox identified by "text" should be checked
+
   Scenario: Clicking on view by their text
     When I'm on the controls screen
     Then I should be able to click a view by "text"
@@ -19,3 +24,14 @@ Feature: Interacting with view elements
       | focused   | true  |
       | selected  | false |
       | shown     | true  |
+
+  Scenario: Determining properties of a view
+    When I'm on the controls screen
+    Then the "view" field identified by "class" can determine the following properties:
+      | property  | value |
+      | clickable | true  |
+      | enabled   | true  |
+      | focusable | true  |
+      | focused   | false |
+      | selected  | false |
+      | shown     | true  |

data/features/webview.feature

@@ -1,14 +1,69 @@
-@webview
 Feature: Adding support for webviews
 
   Background:
     Given I have navigated to the webview screen
 
+  Scenario: Clicking on text and checking if text exists
+    When I click the text "Some Other Page" in a webview
+    Then I should see the text "Welcome to Some Other Page" in a webview
+
+  Scenario: Checking for the existance of elements
+    When I look for elements in the webview
+    Then I should know the following elements exist:
+    | locator     | value       |
+    | className   | panel       |
+    | cssSelector | div.panel   |
+    | tagName     | p           |
+    | textContent | Six columns |
+
+  Scenario: Clicking on a web element
+    When I look for elements in the webview
+    And I click on the anchor with the text "Some Other Page"
+    Then I should see the text "Welcome to Some Other Page" in a webview
+
+  Scenario: Entering text in a web element
+    When I look for elements in the webview
+    Then I should be able to enter "Some Text" into the text field
+
+  Scenario: Typing text in a web element
+    When I look for elements in the webview
+    Then I should be able to type "Some Text" into the text field
+
 @focus
-  Scenario: Clicking a link in a WebView
-    When I click the text "Coffee"  in a webview
-    Then I should see the text "Starbucks" in a webview
+  Scenario: Clearing the text in a web welement
+    When I look for elements in the webview
+    Then I should be able to enter "Some Text" into the text field
+    And I should be able to clear the text of the text field
+
+  Scenario: Waiting for a web element
+    When I look for elements in the webview
+    Then I should be able to wait for the text field
 
+  Scenario: Clicking on text and checking if text exists on webview screen
+    When I click the text "Some Other Page" in a webview screen
+    Then I should see the text "Welcome to Some Other Page" in a webview screen
+
+  Scenario: Checking for the existance of elements on webview screen
+    When I look for elements in the webview screen
+    Then I should know the following webview elements exist:
+    | locator     | value       |
+    | className   | panel       |
+    | cssSelector | div.panel   |
+    | tagName     | p           |
+    | textContent | Six columns |
+
+  Scenario: Clicking on a web element on a webview screen
+    When I look for elements in the webview screen
+    And I click on the anchor with the text "Some Other Page" on that screen
+    Then I should see the text "Welcome to Some Other Page" in a webview screen
+
+  Scenario: Entering text in a web element on a webview screen
+    When I look for elements in the webview screen
+    Then I should be able to enter "Some Text" into the text field on that screen
+
+@focus
+  Scenario: Clearing the text in a web welement on a webview screen
+    When I look for elements in the webview screen
+    Then I should be able to enter "Some Text" into the text field on that screen
+    And I should be able to clear the text of the text field on that screen
 
-    
-    

data/lib/gametel.rb

@@ -6,14 +6,12 @@ require 'gametel/waiter'
 require 'gametel/version'
 require 'gametel/platforms/brazenhead_platform'
 require 'gametel/views'
+require 'gametel/webview'
+require 'gametel/webviewable'
 
 module Gametel
   include Gametel::Waiter
-
-  attr_reader :platform
-
-  ROBOTIUM_LEFT = 21
-  ROBOTIUM_RIGHT = 22
+  include Gametel::Webviewable
 
   def self.included(cls)
     cls.extend Gametel::Accessors
@@ -46,24 +44,6 @@ module Gametel
     default_server.stop
   end
 
-  def initialize(pform = :brazenhead)
-    @platform = Gametel::Platforms::BrazenheadPlatform.new if pform == :brazenhead
-  end
-
-  #
-  # click on the provided text
-  #
-  def click_on_text(text)
-    platform.click_on_text text
-  end
-
-  #
-  # Returns true if the provided text is found on the screen
-  #
-  def has_text?(text)
-    platform.has_text?(text)
-  end
-
   #
   # Returns true if the view is enabled
   #
@@ -109,41 +89,6 @@ module Gametel
     platform.enter
   end
 
-  #
-  # scroll down
-  #
-  def scroll_down
-    platform.scroll_down
-  end
-
-  #
-  # scroll up
-  #
-  def scroll_up
-    platform.scroll_up
-  end
-  
-  #
-  # scroll left
-  #
-  def scroll_left
-    platform.scroll_to_side ROBOTIUM_LEFT
-  end
-
-  #
-  # scroll right
-  #
-  def scroll_right
-    platform.scroll_to_side ROBOTIUM_RIGHT
-  end
-
-  #
-  # Wait for the provided text to appear
-  #
-  def wait_for_text(text_to_find)
-    platform.wait_for_text(text_to_find)
-    raise "Timed out waiting for the text '#{text_to_find}'" unless platform.last_json
-  end
 
 end
 

data/lib/gametel/accessors.rb

@@ -118,6 +118,9 @@ module Gametel
       define_method(name) do
         platform.click_checkbox(locator)
       end
+      define_method("#{name}_checked?") do
+        Gametel::Views::CheckBox.new(platform, locator).checked?
+      end
       define_method("#{name}_view") do
         Gametel::Views::CheckBox.new(platform, locator)
       end
@@ -157,6 +160,7 @@ module Gametel
     # The only valid keys are:
     #   * :id
     #   * :text
+    #   * :class (:index => 0 implied)
     #
     def view(name, locator)
       define_method(name) do
@@ -257,7 +261,9 @@ module Gametel
     end
 
     def webview(name, locator)
-
+      define_method("#{name}_view") do
+        Gametel::Views::WebView.new(platform, locator)
+      end
     end
 
     def action_item(name, locator)

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

@@ -16,27 +16,6 @@ module Gametel
           block.call device if block
         end
       end
-
-      def get_button_property_by_index(index, property)
-        get_button_by_index(index) do |device|
-          device.send "is_#{property}"
-        end
-        last_response.body
-      end
-
-      def get_button_property_by_id(id, property)
-        get_view_by_id(id) do |device|
-          device.send "is_#{property}"
-        end
-        last_response.body
-      end
-
-      def get_button_property_by_text(text, property)
-        get_button_by_text(text) do |device|
-          device.send "is_#{property}"
-        end
-        last_response.body
-      end
     end
   end
 end

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

@@ -10,6 +10,12 @@ module Gametel
         end
       end
 
+      def click_on_view_by_class(clazz, index)
+        get_view_by_index(clazz, index) do |device|
+          device.click_on_view('@@the_view@@', :target => 'Robotium')
+        end
+      end
+
       def get_view_by_id(id, &block)
         chain_calls do |device|
           device.id_from_name(id, :target => 'Brazenhead', :variable => '@@view_id@@')
@@ -21,8 +27,10 @@ module Gametel
       def get_view_by_index(clazz, index, &block)
         chain_calls do |device|
           device.get_class
-          device.for_name clazz, :variable => '@@the_type@@'
-          device.get_view '@@the_type@@', index, :target => 'Robotium', :variable  => '@@the_view@@'
+          device.get_class_loader :variable => '@@loader@@'
+          device.get_class
+          device.for_name clazz, false, '@@loader@@', :variable => '@@the_type@@'
+          device.get_view '@@the_type@@', index || 0, :target => 'Robotium', :variable  => '@@the_view@@'
           block.call device if block
         end
       end

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

@@ -0,0 +1,33 @@
+require 'brazenhead'
+
+module Gametel
+  module Platforms
+    module Webview
+
+      def click_on_webview(how, what, index=0, scroll=true)
+        find_web_element_by(how, what) do |device, by|
+          device.click_on_web_element(by, index, scroll, :target => :Robotium)
+        end
+      end
+
+      def enter_text_in_webview(how, what, text)
+        find_web_element_by(how, what) do |device, by|
+          device.enter_text_in_web_element(by, text, :target => :Robotium)
+        end
+      end
+
+      def clear_text_in_webview(how, what)
+        find_web_element_by(how, what) do |device, by|
+          device.clear_text_in_web_element(by, :target => :Robotium)
+        end
+      end
+
+      def find_web_element_by(how, what)
+        chain_calls do |device|
+          device.web_view_by(how, what, :variable => '@@by@@', :target => :Brazenhead)
+          yield device, '@@by@@'
+        end
+      end
+    end
+  end
+end

data/lib/gametel/platforms/brazenhead_platform.rb

@@ -7,6 +7,7 @@ require File.join(File.dirname(__FILE__), 'brazenhead', 'spinner')
 require File.join(File.dirname(__FILE__), 'brazenhead', 'text')
 require File.join(File.dirname(__FILE__), 'brazenhead', 'view')
 require File.join(File.dirname(__FILE__), 'brazenhead', 'list_item')
+require File.join(File.dirname(__FILE__), 'brazenhead', 'webview')
 
 
 module Gametel
@@ -21,6 +22,7 @@ module Gametel
       include Gametel::Platforms::View
       include Gametel::Platforms::ListItem
       include Gametel::Platforms::Menu
+      include Gametel::Platforms::Webview
 
       ENTER_KEY = 66
 
@@ -131,6 +133,7 @@ module Gametel
       def click_view(locator)
         result = click_on_text(locator[:text]) if locator[:text]
         result = click_on_view_by_id(locator[:id]) if locator[:id]
+        result = click_on_view_by_class(locator[:class], locator[:index]) if locator[:class]
       end
 
       #
@@ -146,7 +149,8 @@ module Gametel
       #
       def has_view?(locator)
         begin
-          result = get_view_by_id(locator)
+          result = get_view_by_id(locator[:id]) if locator[:id]
+          result = get_view_by_index(locator[:class], locator[:index]) if locator[:class]
           result.body.include? 'windowLocation'
         rescue Exception
           false

data/lib/gametel/version.rb

@@ -1,3 +1,3 @@
 module Gametel
-  VERSION = "0.7"
+  VERSION = "0.8"
 end

data/lib/gametel/views.rb

@@ -7,3 +7,4 @@ require 'gametel/views/progress'
 require 'gametel/views/spinner'
 require 'gametel/views/list_item'
 require 'gametel/views/image'
+require 'gametel/views/web_view'

data/lib/gametel/views/button.rb

@@ -4,26 +4,12 @@ module Gametel
       
       protected
 
-      def build_property_methods
-        metaclass = class << self; self; end
-        properties.each do |property|
-          metaclass.send(:define_method, "#{property}?".to_sym) do
-            
-            platform.get_view_by_id(locator[:id]) do |device|
-              device.send "is_#{property}"
-            end if locator[:id]
-            
-            platform.get_button_by_index(locator[:index]) do |device|
-              device.send "is_#{property}"
-            end if locator[:index]
+      def get_view_by_index(clazz, index, &block)
+        platform.get_button_by_index(index, &block)
+      end
 
-            platform.get_button_by_text(locator[:text]) do |device|
-              device.send "is_#{property}"
-            end if locator[:text]
-              
-            platform.last_response.body == "true"
-          end
-        end
+      def get_view_by_text(text, &block)
+        platform.get_button_by_text(text, &block)
       end
     end
   end

data/lib/gametel/views/image.rb

@@ -1,26 +1,8 @@
 module Gametel
   module Views
     class Image < View
-      IMAGE_VIEW_CLASS = 'android.widget.ImageView'
-
-      protected
-
-      def build_property_methods
-        metaclass = class << self; self; end
-        properties.each do |property|
-          metaclass.send(:define_method, "#{property}?".to_sym) do
-            
-            platform.get_view_by_id(locator[:id]) do |device|
-              device.send "is_#{property}"
-            end if locator[:id]
-            
-            platform.get_view_by_index(IMAGE_VIEW_CLASS, locator[:index]) do |device|
-              device.send "is_#{property}"
-            end if locator[:index]
-
-            platform.last_response.body == "true"
-          end
-        end
+      def view_class
+        'android.widget.ImageView'
       end
     end
   end

data/lib/gametel/views/progress.rb

@@ -2,28 +2,9 @@ module Gametel
   module Views
     class Progress < View
 
-      PROGRESS_BAR_CLASS = 'android.widget.ProgressBar'
-
-      protected
-
-      def build_property_methods
-        metaclass = class << self; self; end
-        properties.each do |property|
-          metaclass.send(:define_method, "#{property}?".to_sym) do
-            
-            platform.get_view_by_id(locator[:id]) do |device|
-              device.send "is_#{property}"
-            end if locator[:id]
-            
-            platform.get_view_by_index(PROGRESS_BAR_CLASS, locator[:index]) do |device|
-              device.send "is_#{property}"
-            end if locator[:index]
-
-            platform.last_response.body == "true"
-          end
-        end
+      def view_class
+        'android.widget.ProgressBar'
       end
-
       
     end
   end

data/lib/gametel/views/spinner.rb

@@ -2,28 +2,9 @@ module Gametel
   module Views
     class Spinner < View
 
-      SPINNER_CLASS = 'android.widget.Spinner'
-
-      protected
-
-      def build_property_methods
-        metaclass = class << self; self; end
-        properties.each do |property|
-          metaclass.send(:define_method, "#{property}?".to_sym) do
-            
-            platform.get_view_by_id(locator[:id]) do |device|
-              device.send "is_#{property}"
-            end if locator[:id]
-            
-            platform.get_view_by_index(SPINNER_CLASS, locator[:index]) do |device|
-              device.send "is_#{property}"
-            end if locator[:index]
-
-            platform.last_response.body == "true"
-          end
-        end
+      def view_class
+        'android.widget.Spinner'
       end
-
       
     end
   end

data/lib/gametel/views/view.rb

@@ -13,19 +13,36 @@ module Gametel
         'android.view.View'
       end
 
+      def raw_view(&block)
+        get_view_by_id(locator[:id], &block) if locator[:id]
+        get_view_by_index(view_class, locator[:index], &block) if locator[:index]
+        get_view_by_index(locator[:class], locator[:index] || 0, &block) if locator[:class]
+        get_view_by_text(locator[:text], &block) if locator[:text]
+      end
+
       protected
       
       def properties
         [:clickable, :enabled, :focusable, :focused, :selected, :shown]
       end
 
+      def get_view_by_id(id, &block)
+        platform.get_view_by_id(id, &block)
+      end
+
+      def get_view_by_index(clazz, index, &block)
+        platform.get_view_by_index(clazz, index, &block)
+      end
+
+      def get_view_by_text(text, &block)
+        raise NotImplementedError
+      end
+
       def build_property_methods
         metaclass = class << self; self; end
         properties.each do |property|
           metaclass.send(:define_method, "#{property}?".to_sym) do
-            query_property = lambda {|device| device.send "is_#{property}" }
-            platform.get_view_by_id(locator[:id], &query_property) if locator[:id]
-            platform.get_view_by_index(view_class, locator[:index], &query_property) if locator[:index]
+            raw_view {|device| device.send "is_#{property}" }
             platform.last_response.body == "true"
           end
         end

data/lib/gametel/views/web_view.rb

@@ -0,0 +1,44 @@
+module Gametel
+  module Views
+    class WebView < View
+
+      def click(how, what, index=0, scroll=true)
+        platform.click_on_webview(how, what, index, scroll)
+      end
+
+      def enter_text(how, what, text)
+        platform.enter_text_in_webview(how, what, text)
+      end
+
+      def type_text(how, what, text, index=0)
+        find_element_by(how, what) do |device, by| 
+          device.type_text_in_web_element(by, text, index, :target => :Robotium)
+        end
+      end
+
+      def clear_text(how, what)
+        platform.clear_text_in_webview(how, what)
+      end
+
+      def wait_for_element(how, what, timeout=20, scroll=true)
+        find_element_by(how, what) do |device, by|
+          device.wait_for_web_element(by, timeout, scroll, :target => :Robotium)
+        end
+      end
+
+      def has_element?(how, what)
+        platform.get_web_views_by(how, what, :target => :Brazenhead)
+        not platform.last_json.empty?
+      end
+      
+      protected
+
+      def find_element_by(how, what)
+        platform.chain_calls do |device|
+          device.web_view_by(how, what, :variable => '@@by@@', :target => :Brazenhead)
+          yield device, '@@by@@'
+        end
+      end
+    end
+  end
+end

data/lib/gametel/webview.rb

@@ -0,0 +1,19 @@
+require 'gametel/webviewable'
+require 'gametel/webview/accessors'
+
+module Gametel
+  module Webview
+    include Gametel::Webviewable
+
+    def self.included(cls)
+      cls.extend Gametel::Webview::Accessors
+    end
+
+
+    def has_element?(how, what)
+      platform.get_web_views_by(how, what, :target => :Brazenhead)
+      not platform.last_json.empty?
+    end
+
+  end
+end

data/lib/gametel/webview/accessors.rb

@@ -0,0 +1,55 @@
+require 'gametel/views/web_view'
+
+module Gametel
+  module Webview
+    module Accessors
+      
+      def link(name, locator)
+        index = value_or_default(locator, :index, 0)
+        locator = cleanup(locator)
+        define_method name  do
+          platform.click_on_webview(locator.first[0], locator.first[1], index)
+        end
+      end
+
+      def text(name, locator)
+        locator = cleanup(locator)
+        define_method "#{name}="  do |text|
+          platform.enter_text_in_webview(locator.first[0], locator.first[1], text)
+        end
+        define_method "clear_#{name}" do
+          platform.clear_text_in_webview(locator.first[0], locator.first[1])
+        end
+      end
+
+      private
+
+      def cleanup(locator)
+        loc = locator.first
+        key = nil
+        case loc[0]
+        when :text
+          locator.delete(:text)
+          key = :textContent
+        when :css
+          locator.delete(:css)
+          key = :cssSelector
+        when :class
+          locator.delete(:class)
+          key = :className
+        when :tag
+          locator.delete(:tag)
+          key = :tagName
+        end
+        locator[key] = loc[1] if key
+        locator
+      end
+
+      def value_or_default(locator, value, default)
+        locator[value] ? locator.delete(value) : default
+      end
+      
+    end
+  end
+end
+

data/lib/gametel/webviewable.rb

@@ -0,0 +1,67 @@
+module Gametel
+  module Webviewable
+
+    attr_reader :platform
+
+    ROBOTIUM_LEFT = 21
+    ROBOTIUM_RIGHT = 22
+
+
+    def initialize(pform = :brazenhead)
+      @platform = Gametel::Platforms::BrazenheadPlatform.new if pform == :brazenhead
+    end
+
+    #
+    # click on the provided text
+    #
+    def click_on_text(text)
+      platform.click_on_text text
+    end
+
+    
+    #
+    # Returns true if the provided text is found on the screen
+    #
+    def has_text?(text)
+      platform.has_text?(text)
+    end
+
+    
+    #
+    # Wait for the provided text to appear
+    #
+    def wait_for_text(text_to_find)
+      platform.wait_for_text(text_to_find)
+      raise "Timed out waiting for the text '#{text_to_find}'" unless platform.last_json
+    end
+
+    #
+    # scroll down
+    #
+    def scroll_down
+      platform.scroll_down
+    end
+
+    #
+    # scroll up
+    #
+    def scroll_up
+      platform.scroll_up
+    end
+    
+    #
+    # scroll left
+    #
+    def scroll_left
+      platform.scroll_to_side ROBOTIUM_LEFT
+    end
+
+    #
+    # scroll right
+    #
+    def scroll_right
+      platform.scroll_to_side ROBOTIUM_RIGHT
+    end
+
+  end
+end

data/spec/lib/gametel/accessors_spec.rb

@@ -22,6 +22,7 @@ class AccessorsSampleScreen
   radio_button(:radio_index, :index => 1)
   view(:view_id, :id => 'some_view_id')
   view(:view_text, :text => 'Any view text')
+  view(:view_class, :class => 'com.example.views.YourCustomView', :index => 0)
   spinner(:spinner_id, :id => 'spinner_id')
   spinner(:spinner_index, :index => 1)
   progress(:progress_id, :id => 'progress_id')
@@ -30,6 +31,15 @@ class AccessorsSampleScreen
   image(:image_id, :id => 'image_id')
 end
 
+RSpec::Matchers.define :load_the_class do |class_name|
+  match do |actual|
+    actual.should_receive(:get_class).ordered
+    actual.should_receive(:get_class_loader).with(:variable => '@@loader@@').ordered
+    actual.should_receive(:get_class).ordered
+    actual.should_receive(:for_name).with(class_name, false, '@@loader@@', :variable => '@@the_type@@').ordered
+  end
+end
+
 describe Gametel::Accessors do
   context "when using Brazenhead" do
     let(:screen) { AccessorsSampleScreen.new }
@@ -113,8 +123,7 @@ describe Gametel::Accessors do
       end
 
       it "should know how to get text by index" do
-        accumulator.should_receive(:get_class)
-        accumulator.should_receive(:for_name).with('android.widget.EditText', :variable => '@@the_type@@')
+        accumulator.should load_the_class('android.widget.EditText')
         accumulator.should_receive(:get_view).with('@@the_type@@', 2, :target => 'Robotium', :variable => '@@the_view@@')
         accumulator.should_receive(:get_text)
         accumulator.should_receive(:to_string)
@@ -464,11 +473,16 @@ describe Gametel::Accessors do
         screen.view_id
       end
 
-      it "should know how to be clicked by test" do
+      it "should know how to be clicked by text" do
         platform.should_receive(:click_on_text).with('Any view text')
         screen.view_text
       end
 
+      it "should know how to be clicked by class" do
+        platform.should_receive(:click_on_view_by_class).with('com.example.views.YourCustomView', 0)
+        screen.view_class
+      end
+
       context "when looking at properties" do
 
         it "should know if they are enabled" do
@@ -547,8 +561,7 @@ describe Gametel::Accessors do
 
       context "identified by index" do
         it "should be able to determine their selected item" do
-          accumulator.should_receive(:get_class)
-          accumulator.should_receive(:for_name).with('android.widget.Spinner', anything)
+          accumulator.should load_the_class('android.widget.Spinner')
           accumulator.should_receive(:get_view).with('@@the_type@@', 1, anything)
           accumulator.should_receive(:get_selected_item)
           accumulator.should_receive(:to_string)
@@ -663,25 +676,23 @@ describe Gametel::Accessors do
       end
 
       context "identified by index" do
+        before(:each) do
+          accumulator.should load_the_class('android.widget.ProgressBar')
+        end
+
         it "should be able to set the progress" do
-          accumulator.should_receive(:get_class)
-          accumulator.should_receive(:for_name).with('android.widget.ProgressBar', :variable => '@@the_type@@')
           accumulator.should_receive(:get_view).with('@@the_type@@', 1, :target => 'Robotium', :variable => '@@the_view@@')
           accumulator.should_receive(:set_progress_bar).with('@@the_view@@', 37, :target => 'Robotium')
           screen.progress_index = 37
         end
 
         it "should be able to set the secondary progress" do
-          accumulator.should_receive(:get_class)
-          accumulator.should_receive(:for_name).with('android.widget.ProgressBar', :variable => '@@the_type@@')
           accumulator.should_receive(:get_view).with('@@the_type@@', 1, :target => 'Robotium', :variable => '@@the_view@@')
           accumulator.should_receive(:set_secondary_progress).with(74)
           screen.progress_index_secondary = 74
         end
 
         it "should be able to get the progress" do
-          accumulator.should_receive(:get_class)
-          accumulator.should_receive(:for_name).with('android.widget.ProgressBar', :variable => '@@the_type@@')
           accumulator.should_receive(:get_view).with('@@the_type@@', 1, :target => 'Robotium', :variable => '@@the_view@@')
           accumulator.should_receive(:get_progress)
           result.should_receive(:body).and_return("37")
@@ -689,8 +700,6 @@ describe Gametel::Accessors do
         end
 
         it "should be able to get the secondary progress" do
-          accumulator.should_receive(:get_class)
-          accumulator.should_receive(:for_name).with('android.widget.ProgressBar', :variable => '@@the_type@@')
           accumulator.should_receive(:get_view).with('@@the_type@@', 1, :target => 'Robotium', :variable => '@@the_view@@')
           accumulator.should_receive(:get_secondary_progress)
           result.should_receive(:body).and_return("74")
@@ -698,8 +707,6 @@ describe Gametel::Accessors do
         end
 
         it "should be able to get the max" do
-          accumulator.should_receive(:get_class)
-          accumulator.should_receive(:for_name).with('android.widget.ProgressBar', :variable => '@@the_type@@')
           accumulator.should_receive(:get_view).with('@@the_type@@', 1, :target => 'Robotium', :variable => '@@the_view@@')
           accumulator.should_receive(:get_max)
           result.should_receive(:body).and_return("100")

data/spec/lib/gametel_spec.rb

@@ -70,16 +70,22 @@ describe Gametel do
       screen.should be_enabled('some_id')
     end
 
-    it "should know if a view exists" do
+    it "should know if a view exists by id" do
       result.should_receive(:body).and_return('windowLocation')
-      platform.should_receive(:get_view_by_id).and_return(result)
-      screen.should have_view('some_id')
+      platform.should_receive(:get_view_by_id).with('some_id').and_return(result)
+      screen.should have_view(:id => 'some_id')
     end
 
-    it "should know if a view does not exist" do
+    it "should know if a view exists by class" do
+      result.should_receive(:body).and_return('windowLocation')
+      platform.should_receive(:get_view_by_index).with('some_class', 0).and_return(result)
+      screen.should have_view(:class => 'some_class', :index => 0)
+    end
+
+    it "should know if a view does not exist by id" do
       result.should_receive(:body).and_return('')
-      platform.should_receive(:get_view_by_id).and_return(result)
-      screen.should_not have_view('some_id')
+      platform.should_receive(:get_view_by_id).with('some_id').and_return(result)
+      screen.should_not have_view(:id => 'some_id')
     end
 
 

metadata

@@ -1,7 +1,8 @@
 --- !ruby/object:Gem::Specification
 name: gametel
 version: !ruby/object:Gem::Version
-  version: '0.7'
+  version: '0.8'
+  prerelease: 
 platform: ruby
 authors:
 - Jeffrey S. Morgan
@@ -9,81 +10,92 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-08 00:00:00.000000000 Z
+date: 2013-08-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: brazenhead
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.4.7
+        version: 0.4.8
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.4.7
+        version: 0.4.8
 - !ruby/object:Gem::Dependency
   name: ADB
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.5.5
+        version: 0.5.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.5.5
+        version: 0.5.6
 - !ruby/object:Gem::Dependency
   name: page_navigation
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0.7'
+        version: '0.9'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0.7'
+        version: '0.9'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 2.13.0
+        version: 2.14.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 2.13.0
+        version: 2.14.0
 - !ruby/object:Gem::Dependency
   name: cucumber
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.2.0
+        version: 1.3.6
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.2.0
+        version: 1.3.6
 - !ruby/object:Gem::Dependency
   name: require_all
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -91,6 +103,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -131,9 +144,7 @@ files:
 - features/step_definitions/text_steps.rb
 - features/step_definitions/view_steps.rb
 - features/step_definitions/webview_steps.rb
-- features/support/ApiDemos.apk
 - features/support/core_ext/string.rb
-- features/support/debug.keystore
 - features/support/env.rb
 - features/support/hooks.rb
 - features/support/screens/action_bar.rb
@@ -150,10 +161,10 @@ files:
 - features/support/screens/image_view_screen.rb
 - features/support/screens/lists_menu_screen.rb
 - features/support/screens/main_menu_screen.rb
+- features/support/screens/midex_webview_screen.rb
 - features/support/screens/never_will_exist.rb
 - features/support/screens/seek_bar_screen.rb
 - features/support/screens/views_menu_screen.rb
-- features/support/screens/webview_main_screen.rb
 - features/support/screens/webview_screen.rb
 - features/text.feature
 - features/view.feature
@@ -170,6 +181,7 @@ files:
 - lib/gametel/platforms/brazenhead/spinner.rb
 - lib/gametel/platforms/brazenhead/text.rb
 - lib/gametel/platforms/brazenhead/view.rb
+- lib/gametel/platforms/brazenhead/webview.rb
 - lib/gametel/platforms/brazenhead_platform.rb
 - lib/gametel/version.rb
 - lib/gametel/views.rb
@@ -182,7 +194,11 @@ files:
 - lib/gametel/views/spinner.rb
 - lib/gametel/views/text.rb
 - lib/gametel/views/view.rb
+- lib/gametel/views/web_view.rb
 - lib/gametel/waiter.rb
+- lib/gametel/webview.rb
+- lib/gametel/webview/accessors.rb
+- lib/gametel/webviewable.rb
 - spec/lib/gametel/accessors/menu_spec.rb
 - spec/lib/gametel/accessors/text_spec.rb
 - spec/lib/gametel/accessors_spec.rb
@@ -191,27 +207,35 @@ files:
 - spec/lib/gametel_spec.rb
 - spec/spec_helper.rb
 homepage: http://github.com/leandog/gametel
-licenses: []
-metadata: {}
+licenses:
+- MIT
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 2311635935970847416
 required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 2311635935970847416
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 1.8.25
 signing_key: 
-specification_version: 4
+specification_version: 3
 summary: High level wrapper around android drivers
 test_files:
 - features/button.feature
@@ -242,9 +266,7 @@ test_files:
 - features/step_definitions/text_steps.rb
 - features/step_definitions/view_steps.rb
 - features/step_definitions/webview_steps.rb
-- features/support/ApiDemos.apk
 - features/support/core_ext/string.rb
-- features/support/debug.keystore
 - features/support/env.rb
 - features/support/hooks.rb
 - features/support/screens/action_bar.rb
@@ -261,10 +283,10 @@ test_files:
 - features/support/screens/image_view_screen.rb
 - features/support/screens/lists_menu_screen.rb
 - features/support/screens/main_menu_screen.rb
+- features/support/screens/midex_webview_screen.rb
 - features/support/screens/never_will_exist.rb
 - features/support/screens/seek_bar_screen.rb
 - features/support/screens/views_menu_screen.rb
-- features/support/screens/webview_main_screen.rb
 - features/support/screens/webview_screen.rb
 - features/text.feature
 - features/view.feature

checksums.yaml

@@ -1,15 +0,0 @@
----
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    NjEzOWQ4NTk3NWFmMDY3NmViMWY2NGI0YmUyZGNiNmEwMjRlNDI5Mg==
-  data.tar.gz: !binary |-
-    MDBhMDBhZjQ5MzZhODQyNzYzNmI2NzdiMGNmMjU5MTk4YTE1NGE3Yg==
-!binary "U0hBNTEy":
-  metadata.gz: !binary |-
-    NDhhZjlmY2NlYTQ3MDJiMDFlM2I0MGQwODdjNWE0MWE5NDhlNTRjZjNhY2Mx
-    OTFmZGY2NTVkZjcyODUwZDQ3YzQ5ODRhNjI3MTUwODdjMDk2ZDhkZjA4NzE2
-    ZDRkNTg3NDg2M2RjOWRiM2IxY2VhNGNlMTJkNzdlMTFmYzJmMjQ=
-  data.tar.gz: !binary |-
-    OTM4YTMzMjNjODhmNzdkMDEwOThmODIxM2QyYjJiMTk4ZWY5MTdkNWUwMTNl
-    NjUwY2Q5Y2UwNzU2YTBhMTQ5ZGRiNDJjNmU1YzY3NGM2OWNhZjc5NjQ0MmU4
-    NjY0ODZmOTk4Y2FmMGQxOTkzMTU2OTRhYTBlOGExZWNlZmYyODE=

data/features/support/screens/webview_main_screen.rb

@@ -1,8 +0,0 @@
-class WebviewMainScreen
-  include Gametel
-
-  activity 'MainActivity'
-
-  button(:goto_webview, :text => 'Go to http://www.google.com')
-  
-end