page-object 0.5.2 → 0.5.3

data/.rspec

@@ -1 +1,2 @@
---color --format doc
+--color 
+--format Fuubar

data/ChangeLog

@@ -1,3 +1,11 @@
+=== Version 0.5.3
+* Enhancements
+  * Added new module PagePopulator with single method populate_page_with
+  * Updated to use selenium-webdriver 2.15.0
+  * Updated to use watir-webdriver 0.4.1
+* Fixes
+  * Updated prompt method to make it compatible with latest dependencies
+
 === Version 0.5.2 / 2011-11-30
 * Enhancements
   * Added ability to find image buttons by src

data/Gemfile

@@ -2,5 +2,7 @@ source "http://rubygems.org"
 
 # adding rake so travis-ci will build properly
 gem 'rake'
+gem 'fuubar'
+gem 'fuubar-cucumber'
 
 gemspec

data/cucumber.yml

@@ -1,7 +1,9 @@
-default: DRIVER=WATIR --no-source --color --format pretty
-watir: DRIVER=WATIR --no-source --color --format pretty --tags ~@selenium_only
-selenium: DRIVER=SELENIUM --no-source --color --format pretty --tags ~@watir_only
-watir_focus: DRIVER=WATIR --no-source --color --format pretty --tags @focus --tags ~@selenium_only
-selenium_focus: DRIVER=SELENIUM --no-source --color --format pretty --tags @focus --tags ~@watir_only
-autotest: DRIVER=WATIR --no-source --color --format pretty --tags ~@selenium_only
+<%
+std_opts = "--no-source --color --format Cucumber::Formatter::Fuubar"
+%>
+
+default: DRIVER=WATIR <%= std_opts %>
+watir: DRIVER=WATIR <%= std_opts %> --tags ~@selenium_only
+selenium: DRIVER=SELENIUM <%= std_opts %> --tags ~@watir_only
+autotest: DRIVER=WATIR <%= std_opts %> --tags ~@selenium_only
 

data/lib/page-object.rb

@@ -3,6 +3,7 @@ require 'page-object/accessors'
 require 'page-object/platforms'
 require 'page-object/element_locators'
 require 'page-object/nested_elements'
+require 'page-object/page_populator'
 
 #
 # Module that when included adds functionality to a page object.  This module
@@ -35,6 +36,7 @@ require 'page-object/nested_elements'
 module PageObject
   include LoadsPlatform
   include ElementLocators
+  include PagePopulator
   
   # @return [Watir::Browser or Selenium::WebDriver::Driver] the platform browser passed to the constructor
   attr_reader :browser

data/lib/page-object/elements/div.rb

@@ -5,7 +5,7 @@ module PageObject
       protected
 
       def self.watir_finders
-        [:class, :id, :text, :index, :xpath]
+        [:class, :id, :name, :text, :index, :xpath]
       end
       
       def self.selenium_finders

data/lib/page-object/page_populator.rb

@@ -0,0 +1,68 @@
+module PageObject
+  module PagePopulator
+
+    #
+    # This method will populate all matched page TextFields,
+    # TextAreas, SelectLists, Checkboxes, and Radio Buttons from the
+    # Hash passed as an argument.  The way it find an element is by
+    # matching the Hash key to the name you provided when declaring
+    # the element on your page.
+    #
+    # Checkboxe and Radio Button values must be true or false.
+    #
+    # @example
+    #   class ExamplePage
+    #     include PageObject
+    #
+    #     text_field(:username, :id => 'username_id')
+    #     checkbox(:active, :id => 'active_id')
+    #   end
+    #
+    #   ...
+    #
+    #   @browser = Watir::Browser.new :firefox
+    #   example_page = ExamplePage.new(@browser)
+    #   example_page.populate_page_with :username => 'a name', :active => true
+    #
+    # @param [Hash] the data to use to populate this page.  The key
+    # can be either a string or a symbol.  The value must be a string
+    # for TextField, TextArea, and SelectList and must be true or
+    # false for a Checkbox or RadioButton.
+    #
+    def populate_page_with(data)
+      data.each do |key, value|
+        populate_checkbox(key, value) if is_checkbox?(key)
+        populate_radiobutton(key, value) if is_radiobutton?(key)
+        populate_text(key, value) if is_text?(key)
+      end
+    end
+
+    private
+    
+    def populate_text(key, value)
+      self.send "#{key}=", value
+    end
+
+    def populate_checkbox(key, value)
+      return self.send "check_#{key}" if value
+      return self.send "uncheck_#{key}"
+    end
+
+    def populate_radiobutton(key, value)
+      return self.send "select_#{key}" if value
+      return self.send "clear_#{key}"
+    end
+
+    def is_text?(key)
+      respond_to?("#{key}=".to_sym)
+    end
+
+    def is_checkbox?(key)
+      respond_to?("check_#{key}".to_sym)
+    end
+
+    def is_radiobutton?(key)
+      respond_to?("select_#{key}".to_sym)
+    end
+  end
+end

data/lib/page-object/platforms/selenium_webdriver/page_object.rb

@@ -89,7 +89,7 @@ module PageObject
         # See PageObject#prompt
         #
         def prompt(answer, frame=nil, &block)
-          @browser.execute_script "window.prompt = function(text, value) { window.__lastWatirPrompt = { message: text, default_value: value }; return #{answer.to_json}; }"
+          @browser.execute_script "window.prompt = function(text, value) { window.__lastWatirPrompt = { message: text, default_value: value }; return #{answer}; }"
           yield
           result = @browser.execute_script "return window.__lastWatirPrompt"
           result && result.dup.each_key { |k| result[k.to_sym] = result.delete(k) }
@@ -462,7 +462,6 @@ module PageObject
         #
         def click_button_for(identifier)
           how, what, frame_identifiers = parse_identifiers(identifier, Elements::Button, 'input', :type => 'submit')
-          puts "how=#{how}, what=#{what}"
           switch_to_frame(frame_identifiers)
           @browser.find_element(how, what).click
           @browser.switch_to.default_content unless frame_identifiers.nil?

data/lib/page-object/platforms/watir_webdriver/page_object.rb

@@ -97,7 +97,7 @@ module PageObject
         #
         def prompt(answer, frame=nil, &block)
           switch_to_frame(frame)
-          @browser.wd.execute_script "window.prompt = function(text, value) { window.__lastWatirPrompt = { message: text, default_value: value }; return #{answer.to_json}; }"
+          @browser.wd.execute_script "window.prompt = function(text, value) { window.__lastWatirPrompt = { message: text, default_value: value }; return #{answer}; }"
           yield
           result = @browser.wd.execute_script "return window.__lastWatirPrompt"
           switch_to_default_content(frame)

data/lib/page-object/version.rb

@@ -1,4 +1,4 @@
 module PageObject
   # @private
-  VERSION = "0.5.2"
+  VERSION = "0.5.3"
 end

data/page-object.gemspec

@@ -19,8 +19,8 @@ Gem::Specification.new do |s|
   s.executables = `git ls-files -- bin/*`.split("\n").map { |f| File.basename(f) }
   s.require_paths = ["lib"]
 
-  s.add_dependency 'watir-webdriver', '>= 0.3.9'
-  s.add_dependency 'selenium-webdriver', '>= 2.14.0' 
+  s.add_dependency 'watir-webdriver', '>= 0.4.1'
+  s.add_dependency 'selenium-webdriver', '>= 2.15.0' 
   
   s.add_development_dependency 'rspec', '>= 2.6.0'
   s.add_development_dependency 'cucumber', '>= 1.1.0'

data/spec/page-object/page_populator_spec.rb

@@ -0,0 +1,56 @@
+require 'spec_helper'
+
+class PageObjectTestPageObject
+  include PageObject
+
+  text_field(:tf, :id => 'id')
+  text_area(:ta, :id => 'id')
+  select_list(:sl, :id => 'id')
+  checkbox(:cb, :id => 'id')
+  radio_button(:rb, :id => 'id')
+end
+
+describe PageObject::PagePopulator  do
+  let(:browser) { mock_watir_browser }
+  let(:page_object) { PageObjectTestPageObject.new(browser) }
+
+  it "should set a value in a text field" do
+    page_object.should_receive(:tf=).with('value')
+    page_object.populate_page_with('tf' => 'value')
+  end
+
+  it "should not set a value if it is not found on the page" do
+    browser.should_not_receive(:text_field)
+    page_object.populate_page_with('coffee' => 'value')
+  end
+
+  it "should set a value in a text area" do
+    page_object.should_receive(:ta=).with('value')
+    page_object.populate_page_with('ta' => 'value')
+  end
+
+  it "should set a value in a select list" do
+    page_object.should_receive(:sa=).with('value')
+    page_object.populate_page_with('sa' => 'value')
+  end
+
+  it "should check a checkbox to true is specified" do
+    page_object.should_receive(:check_cb)
+    page_object.populate_page_with('cb' => true)
+  end
+
+  it "should uncheck a checkbox to false is specified" do
+    page_object.should_receive(:uncheck_cb)
+    page_object.populate_page_with('cb' => false)
+  end
+
+  it "should select a radio button when true is specified" do
+    page_object.should_receive(:select_rb)
+    page_object.populate_page_with('rb' => true)
+  end
+
+  it "should clear a radio button when false is specified" do
+    page_object.should_receive(:clear_rb)
+    page_object.populate_page_with('rb' => false)
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: page-object
 version: !ruby/object:Gem::Version
-  version: 0.5.2
+  version: 0.5.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,33 +9,33 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-11-30 00:00:00.000000000 Z
+date: 2011-12-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: watir-webdriver
-  requirement: &70095900630940 !ruby/object:Gem::Requirement
+  requirement: &70269994307840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.3.9
+        version: 0.4.1
   type: :runtime
   prerelease: false
-  version_requirements: *70095900630940
+  version_requirements: *70269994307840
 - !ruby/object:Gem::Dependency
   name: selenium-webdriver
-  requirement: &70095900629300 !ruby/object:Gem::Requirement
+  requirement: &70269994307020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 2.14.0
+        version: 2.15.0
   type: :runtime
   prerelease: false
-  version_requirements: *70095900629300
+  version_requirements: *70269994307020
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70095900627260 !ruby/object:Gem::Requirement
+  requirement: &70269994305640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: 2.6.0
   type: :development
   prerelease: false
-  version_requirements: *70095900627260
+  version_requirements: *70269994305640
 - !ruby/object:Gem::Dependency
   name: cucumber
-  requirement: &70095900626440 !ruby/object:Gem::Requirement
+  requirement: &70269994302500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: 1.1.0
   type: :development
   prerelease: false
-  version_requirements: *70095900626440
+  version_requirements: *70269994302500
 - !ruby/object:Gem::Dependency
   name: yard
-  requirement: &70095900625280 !ruby/object:Gem::Requirement
+  requirement: &70269994301820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,7 +65,7 @@ dependencies:
         version: 0.7.2
   type: :development
   prerelease: false
-  version_requirements: *70095900625280
+  version_requirements: *70269994301820
 description: Page Object DSL that works with both Watir and Selenium
 email:
 - jeff.morgan@leandog.com
@@ -185,6 +185,7 @@ files:
 - lib/page-object/loads_platform.rb
 - lib/page-object/nested_elements.rb
 - lib/page-object/page_factory.rb
+- lib/page-object/page_populator.rb
 - lib/page-object/platforms.rb
 - lib/page-object/platforms/selenium_webdriver.rb
 - lib/page-object/platforms/selenium_webdriver/button.rb
@@ -245,6 +246,7 @@ files:
 - spec/page-object/loads_platform_spec.rb
 - spec/page-object/page-object_spec.rb
 - spec/page-object/page_factory_spec.rb
+- spec/page-object/page_populator_spec.rb
 - spec/page-object/platforms/selenium_webdriver/selenium_page_object_spec.rb
 - spec/page-object/platforms/selenium_webdriver_spec.rb
 - spec/page-object/platforms/watir_webdriver_spec.rb
@@ -373,6 +375,7 @@ test_files:
 - spec/page-object/loads_platform_spec.rb
 - spec/page-object/page-object_spec.rb
 - spec/page-object/page_factory_spec.rb
+- spec/page-object/page_populator_spec.rb
 - spec/page-object/platforms/selenium_webdriver/selenium_page_object_spec.rb
 - spec/page-object/platforms/selenium_webdriver_spec.rb
 - spec/page-object/platforms/watir_webdriver_spec.rb