page-object 0.4.4 → 0.5.0

data/ChangeLog

@@ -1,3 +1,10 @@
+=== Version 0.5 / 2011-11-06
+* Enhancements
+  * Validated support for JRuby
+  * Removed dependency on Mixology
+  * Updated to use selenium-webdriver 2.10.0
+  * Updated to use watir-webdriver 0.3.8
+
 === Version 0.4.4 / 2011-10-26
 * Enhancements
   * Can now find Radio buttons by value

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

@@ -1,4 +1,3 @@
-require 'mixology'
 
 module PageObject
   module Elements
@@ -23,9 +22,9 @@ module PageObject
         super
         if platform[:platform] == :selenium_webdriver
           require 'page-object/platforms/selenium_webdriver/button'
-          self.mixin PageObject::Platforms::SeleniumWebDriver::Button
+          self.class.send :include, PageObject::Platforms::SeleniumWebDriver::Button
         end
       end
     end
   end
-end
+end

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

@@ -1,4 +1,3 @@
-require 'mixology'
 
 module PageObject
   module Elements
@@ -15,14 +14,14 @@ module PageObject
         super
         if platform[:platform] == :watir_webdriver
           require 'page-object/platforms/watir_webdriver/check_box'
-          self.mixin PageObject::Platforms::WatirWebDriver::CheckBox
+          self.class.send :include, PageObject::Platforms::WatirWebDriver::CheckBox
         elsif platform[:platform] == :selenium_webdriver
           require 'page-object/platforms/selenium_webdriver/check_box'
-          self.mixin PageObject::Platforms::SeleniumWebDriver::CheckBox
+          self.class.send :include, PageObject::Platforms::SeleniumWebDriver::CheckBox
         else
           raise ArgumentError, "expect platform to be :watir_webdriver or :selenium_webdriver"
         end
       end
     end
   end
-end
+end

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

@@ -1,4 +1,3 @@
-require 'mixology'
 
 module PageObject
   module Elements
@@ -170,13 +169,13 @@ module PageObject
         if platform[:platform] == :watir_webdriver
           require 'page-object/platforms/watir_webdriver/element'
           require 'page-object/platforms/watir_webdriver/page_object'
-          self.mixin PageObject::Platforms::WatirWebDriver::Element
-          @platform = PageObject::Platforms::WatirWebDriver::PageObject.new(@element)
+          self.class.send :include,  ::PageObject::Platforms::WatirWebDriver::Element
+          @platform = ::PageObject::Platforms::WatirWebDriver::PageObject.new(@element)
         elsif platform[:platform] == :selenium_webdriver
           require 'page-object/platforms/selenium_webdriver/element'
           require 'page-object/platforms/selenium_webdriver/page_object'
-          self.mixin PageObject::Platforms::SeleniumWebDriver::Element
-          @platform = PageObject::Platforms::SeleniumWebDriver::PageObject.new(@element)
+          self.class.send :include, ::PageObject::Platforms::SeleniumWebDriver::Element
+          @platform = ::PageObject::Platforms::SeleniumWebDriver::PageObject.new(@element)
         else
           raise ArgumentError, "expect platform to be :watir_webdriver or :selenium_webdriver"
         end

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

@@ -1,4 +1,3 @@
-require 'mixology'
 
 module PageObject
   module Elements
@@ -14,14 +13,14 @@ module PageObject
         super
         if platform[:platform] == :watir_webdriver
           require 'page-object/platforms/watir_webdriver/form'
-          self.mixin PageObject::Platforms::WatirWebDriver::Form
+          self.class.send :include, PageObject::Platforms::WatirWebDriver::Form
         elsif platform[:platform] == :selenium_webdriver
           require 'page-object/platforms/selenium_webdriver/form'
-          self.mixin PageObject::Platforms::SeleniumWebDriver::Form
+          self.class.send :include,  PageObject::Platforms::SeleniumWebDriver::Form
         else
           raise ArgumentError, "expect platform to be :watir_webdriver or :selenium_webdriver"
         end
       end
     end
   end
-end
+end

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

@@ -1,5 +1,3 @@
-require 'mixology'
-
 module PageObject
   module Elements
     class Image < Element
@@ -14,10 +12,10 @@ module PageObject
         super
         if platform[:platform] == :watir_webdriver
           require 'page-object/platforms/watir_webdriver/image'
-          self.mixin PageObject::Platforms::WatirWebDriver::Image
+          self.class.send :include, PageObject::Platforms::WatirWebDriver::Image
         elsif platform[:platform] == :selenium_webdriver
           require 'page-object/platforms/selenium_webdriver/image'
-          self.mixin PageObject::Platforms::SeleniumWebDriver::Image
+          self.class.send :include, PageObject::Platforms::SeleniumWebDriver::Image
         else
           raise ArgumentError, "expect platform to be :watir_webdriver or :selenium_webdriver"
         end
@@ -25,4 +23,4 @@ module PageObject
 
     end
   end
-end
+end

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

@@ -1,4 +1,3 @@
-require 'mixology'
 
 module PageObject
   module Elements
@@ -31,9 +30,9 @@ module PageObject
         super
         if platform[:platform] == :selenium_webdriver
           require 'page-object/platforms/selenium_webdriver/link'
-          self.mixin PageObject::Platforms::SeleniumWebDriver::Link
+          self.class.send :include, PageObject::Platforms::SeleniumWebDriver::Link
         end
       end
     end
   end
-end
+end

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

@@ -1,4 +1,3 @@
-require 'mixology'
 
 module PageObject
   module Elements
@@ -35,10 +34,10 @@ module PageObject
         super
         if platform[:platform] == :watir_webdriver
           require 'page-object/platforms/watir_webdriver/ordered_list'
-          self.mixin PageObject::Platforms::WatirWebDriver::OrderedList
+          self.class.send :include, PageObject::Platforms::WatirWebDriver::OrderedList
         elsif platform[:platform] == :selenium_webdriver
           require 'page-object/platforms/selenium_webdriver/ordered_list'
-          self.mixin PageObject::Platforms::SeleniumWebDriver::OrderedList
+          self.class.send :include, PageObject::Platforms::SeleniumWebDriver::OrderedList
         else
           raise ArgumentError, "expect platform to be :watir_webdriver or :selenium_webdriver"
         end
@@ -46,4 +45,4 @@ module PageObject
 
     end
   end
-end
+end

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

@@ -1,4 +1,3 @@
-require 'mixology'
 
 module PageObject
   module Elements
@@ -23,10 +22,10 @@ module PageObject
         super
         if platform[:platform] == :watir_webdriver
           require 'page-object/platforms/watir_webdriver/radio_button'
-          self.mixin PageObject::Platforms::WatirWebDriver::RadioButton
+          self.class.send :include, PageObject::Platforms::WatirWebDriver::RadioButton
         elsif platform[:platform] == :selenium_webdriver
           require 'page-object/platforms/selenium_webdriver/radio_button'
-          self.mixin PageObject::Platforms::SeleniumWebDriver::RadioButton
+          self.class.send :include, PageObject::Platforms::SeleniumWebDriver::RadioButton
         else
           raise ArgumentError, "expect platform to be :watir_webdriver or :selenium_webdriver"
         end

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

@@ -1,4 +1,3 @@
-require 'mixology'
 
 module PageObject
   module Elements
@@ -23,10 +22,10 @@ module PageObject
         super
         if platform[:platform] == :watir_webdriver
           require 'page-object/platforms/watir_webdriver/select_list'
-          self.mixin PageObject::Platforms::WatirWebDriver::SelectList
+          self.class.send :include, PageObject::Platforms::WatirWebDriver::SelectList
         elsif platform[:platform] == :selenium_webdriver
           require 'page-object/platforms/selenium_webdriver/select_list'
-          self.mixin PageObject::Platforms::SeleniumWebDriver::SelectList
+          self.class.send :include, PageObject::Platforms::SeleniumWebDriver::SelectList
         else
           raise ArgumentError, "expect platform to be :watir_webdriver or :selenium_webdriver"
         end

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

@@ -1,4 +1,3 @@
-require 'mixology'
 
 module PageObject
   module Elements
@@ -31,14 +30,14 @@ module PageObject
         super
         if platform[:platform] == :watir_webdriver
           require 'page-object/platforms/watir_webdriver/table'
-          self.mixin PageObject::Platforms::WatirWebDriver::Table
+          self.class.send :include, PageObject::Platforms::WatirWebDriver::Table
         elsif platform[:platform] == :selenium_webdriver
           require 'page-object/platforms/selenium_webdriver/table'
-          self.mixin PageObject::Platforms::SeleniumWebDriver::Table
+          self.class.send :include, PageObject::Platforms::SeleniumWebDriver::Table
         else
           raise ArgumentError, "expect platform to be :watir_webdriver or :selenium_webdriver"
         end
       end
     end
   end
-end
+end

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

@@ -1,4 +1,3 @@
-require 'mixology'
 
 module PageObject
   module Elements
@@ -31,14 +30,14 @@ module PageObject
         super
         if platform[:platform] == :watir_webdriver
           require 'page-object/platforms/watir_webdriver/table_row'
-          self.mixin PageObject::Platforms::WatirWebDriver::TableRow
+          self.class.send :include, PageObject::Platforms::WatirWebDriver::TableRow
         elsif platform[:platform] == :selenium_webdriver
           require 'page-object/platforms/selenium_webdriver/table_row'
-          self.mixin PageObject::Platforms::SeleniumWebDriver::TableRow
+          self.class.send :include, PageObject::Platforms::SeleniumWebDriver::TableRow
         else
           raise ArgumentError, "expect platform to be :watir_webdriver or :selenium_webdriver"
         end
       end
     end
   end
-end
+end

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

@@ -1,4 +1,3 @@
-require 'mixology'
 
 module PageObject
   module Elements
@@ -31,14 +30,14 @@ module PageObject
         super
         if platform[:platform] == :watir_webdriver
           require 'page-object/platforms/watir_webdriver/text_area'
-          self.mixin PageObject::Platforms::WatirWebDriver::TextArea
+          self.class.send :include, PageObject::Platforms::WatirWebDriver::TextArea
         elsif platform[:platform] == :selenium_webdriver
           require 'page-object/platforms/selenium_webdriver/text_area'
-          self.mixin PageObject::Platforms::SeleniumWebDriver::TextArea
+          self.class.send :include, PageObject::Platforms::SeleniumWebDriver::TextArea
         else
           raise ArgumentError, "expect platform to be :watir_webdriver or :selenium_webdriver"
         end
       end
     end
   end
-end
+end

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

@@ -1,4 +1,3 @@
-require 'mixology'
 
 module PageObject
   module Elements
@@ -31,14 +30,14 @@ module PageObject
         super
         if platform[:platform] == :watir_webdriver
           require 'page-object/platforms/watir_webdriver/text_field'
-          self.mixin PageObject::Platforms::WatirWebDriver::TextField
+          self.class.send :include, PageObject::Platforms::WatirWebDriver::TextField
         elsif platform[:platform] == :selenium_webdriver
           require 'page-object/platforms/selenium_webdriver/text_field'
-          self.mixin PageObject::Platforms::SeleniumWebDriver::TextField
+          self.class.send :include, PageObject::Platforms::SeleniumWebDriver::TextField
         else
           raise ArgumentError, "expect platform to be :watir_webdriver or :selenium_webdriver"
         end
       end
     end
   end
-end
+end

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

@@ -1,4 +1,3 @@
-require 'mixology'
 
 module PageObject
   module Elements
@@ -36,10 +35,10 @@ module PageObject
         super
         if platform[:platform] == :watir_webdriver
           require 'page-object/platforms/watir_webdriver/unordered_list'
-          self.mixin PageObject::Platforms::WatirWebDriver::UnorderedList
+          self.class.send :include, PageObject::Platforms::WatirWebDriver::UnorderedList
         elsif platform[:platform] == :selenium_webdriver
           require 'page-object/platforms/selenium_webdriver/unordered_list'
-          self.mixin PageObject::Platforms::SeleniumWebDriver::UnorderedList
+          self.class.send :include, PageObject::Platforms::SeleniumWebDriver::UnorderedList
         else
           raise ArgumentError, "expect platform to be :watir_webdriver or :selenium_webdriver"
         end
@@ -47,4 +46,4 @@ module PageObject
 
     end
   end
-end
+end

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

@@ -17,7 +17,7 @@ module PageObject
         # return true if an element exists
         #
         def exists?
-          nil != @element
+          not @element.nil?
         end
 
         #

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

@@ -154,4 +154,4 @@ module PageObject
       end
     end
   end
-end
+end

data/lib/page-object/version.rb

@@ -1,4 +1,4 @@
 module PageObject
   # @private
-  VERSION = "0.4.4"
+  VERSION = "0.5.0"
 end

data/page-object.gemspec

@@ -19,9 +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.5'
-  s.add_dependency 'selenium-webdriver', '>= 2.9.1' 
-  s.add_dependency 'mixology'
+  s.add_dependency 'watir-webdriver', '>= 0.3.8'
+  s.add_dependency 'selenium-webdriver', '>= 2.10.0' 
   
   s.add_development_dependency 'rspec', '>= 2.6.0'
   s.add_development_dependency 'cucumber', '>= 1.1.0'

data/spec/page-object/elements/watir_element_spec.rb

@@ -1,116 +1,124 @@
 require 'spec_helper'
 
 describe "Element for Watir" do
-  before(:each) do
-    @watir_driver = ::Watir::Element.new(nil, {})
-    @watir_element = ::PageObject::Elements::Element.new(@watir_driver, :platform => :watir_webdriver)
-  end
-  
+  let(:watir_driver) { double('watir_driver') }
+  let(:watir_element) { ::PageObject::Elements::Element.new(watir_driver, :platform => :watir_webdriver) }
+
   it "should know when it is visible" do
-    @watir_driver.should_receive(:present?).and_return(true)
-    @watir_element.visible?.should == true
+    watir_driver.stub(:present?).and_return(true)
+    watir_driver.stub(:displayed?).and_return(true)
+    watir_element.visible?.should == true
   end
 
   it "should know when it is not visible" do
-    @watir_driver.should_receive(:present?).and_return(false)
-    @watir_element.visible?.should == false
+    watir_driver.stub(:present?).and_return(false)
+    watir_driver.stub(:displayed?).and_return(false)
+    watir_element.visible?.should == false
   end
 
   it "should know when it exists" do
-    @watir_driver.should_receive(:exists?).and_return(true)
-    @watir_element.exists?.should == true
+    watir_driver.stub(:exists?).and_return(true)
+    watir_element.exists?.should == true
   end
 
   it "should know when it does not exist" do
-    @watir_driver.should_receive(:exists?).and_return(false)
-    @watir_element.exists?.should == false
+    watir_driver.stub(:exists?).and_return(false)
+    watir_driver.stub(:nil?).and_return(true)
+    watir_element.exists?.should == false
   end
 
   it "should be able to return the text contained in the element" do
-    @watir_driver.should_receive(:text).and_return("my text")
-    @watir_element.text.should == "my text"
+    watir_driver.should_receive(:text).and_return("my text")
+    watir_element.text.should == "my text"
   end
 
   it "should know when it is equal to another" do
-    @watir_driver.should_receive(:==).and_return(true)
-    @watir_element.should == @watir_element
+    watir_driver.should_receive(:==).and_return(true)
+    watir_element.should == watir_element
   end
 
   it "should return its tag name" do
-    @watir_driver.should_receive(:tag_name).and_return("h1")
-    @watir_element.tag_name.should == "h1"
+    watir_driver.should_receive(:tag_name).and_return("h1")
+    watir_element.tag_name.should == "h1"
   end
 
   it "should know its value" do
-    @watir_driver.should_receive(:value).and_return("value")
-    @watir_element.value.should == "value"
+    watir_driver.stub(:value).and_return("value")
+    watir_driver.stub(:attribute).and_return("value")
+    watir_element.value.should == "value"
   end
 
   it "should know how to retrieve the value of an attribute" do
-    @watir_driver.should_receive(:attribute_value).and_return(true)
-    @watir_element.attribute("readonly").should be_true
+    watir_driver.stub(:attribute_value).and_return(true)
+    watir_driver.stub(:attribute).and_return(true)
+    watir_element.attribute("readonly").should be_true
   end
 
   it "should be clickable" do
-    @watir_driver.should_receive(:click)
-    @watir_element.click
+    watir_driver.should_receive(:click)
+    watir_element.click
   end
   
   it "should be double clickable" do
-    @watir_driver.should_receive(:double_click)
-    @watir_element.double_click
+    watir_driver.should_receive(:double_click)
+    watir_element.double_click
   end
   
   it "should be right clickable" do
-    @watir_driver.should_receive(:right_click)
-    @watir_element.right_click
+    watir_driver.stub(:right_click)
+    watir_driver.stub(:context_click)
+    watir_element.right_click
   end
 
   it "should be able to block until it is present" do
-    @watir_driver.should_receive(:wait_until_present).with(10)
-    @watir_element.when_present(10)
+    watir_driver.stub(:wait_until_present).with(10)
+    watir_element.when_present(10)
   end
   
   it "should return the element when it is present" do
-    @watir_driver.should_receive(:wait_until_present).with(10)
-    element = @watir_element.when_present(10)
-    element.should === @watir_element
+    watir_driver.stub(:wait_until_present).with(10)
+    element = watir_element.when_present(10)
+    element.should === watir_element
   end
 
   it "should be able to block until it is visible" do
-    ::Watir::Wait.should_receive(:until).with(10, "Element was not visible in 10 seconds")
-    @watir_element.when_visible(10)
+    ::Watir::Wait.stub(:until).with(10, "Element was not visible in 10 seconds")
+    watir_driver.stub(:displayed?).and_return(true)
+    watir_element.when_visible(10)
   end
   
   it "should return the element when it is visible" do
-    ::Watir::Wait.should_receive(:until).with(10, "Element was not visible in 10 seconds")
-    element = @watir_element.when_visible(10)
-    element.should === @watir_element
+    ::Watir::Wait.stub(:until).with(10, "Element was not visible in 10 seconds")
+    watir_driver.stub(:displayed?).and_return(true)
+    element = watir_element.when_visible(10)
+    element.should === watir_element
   end
 
   it "should be able to block until it is not visible" do
-    ::Watir::Wait.should_receive(:while).with(10, "Element still visible after 10 seconds")
-    @watir_element.when_not_visible(10)
+    ::Watir::Wait.stub(:while).with(10, "Element still visible after 10 seconds")
+    watir_driver.stub(:displayed?).and_return(false)
+    watir_element.when_not_visible(10)
   end
   
   it "should return the element when it is not visible" do
-    ::Watir::Wait.should_receive(:while).with(10, "Element still visible after 10 seconds")
-    element = @watir_element.when_not_visible(10)
-    element.should === @watir_element
+    ::Watir::Wait.stub(:while).with(10, "Element still visible after 10 seconds")
+    watir_driver.stub(:displayed?).and_return(false)
+    element = watir_element.when_not_visible(10)
+    element.should === watir_element
   end
 
   it "should be able to block until a user define event fires true" do
-    ::Watir::Wait.should_receive(:until).with(10, "Element blah")
-    @watir_element.wait_until(10, "Element blah") {}
+    ::Watir::Wait.stub(:until).with(10, "Element blah")
+    watir_element.wait_until(10, "Element blah") {true}
   end
   
   it "should send keys to the element" do
-    @watir_driver.should_receive(:send_keys).with([:control, 'a'])
-    @watir_element.send_keys([:control, 'a'])
+    watir_driver.should_receive(:send_keys).with([:control, 'a'])
+    watir_element.send_keys([:control, 'a'])
   end
   
   it "should clear its' contents" do
-    @watir_driver.should_receive(:clear)
-    @watir_element.clear
+    watir_driver.should_receive(:clear)
+    watir_element.clear
   end
-end
+end

metadata

@@ -2,7 +2,7 @@
 name: page-object
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.4.4
+  version: 0.5.0
 platform: ruby
 authors: 
 - Jeff Morgan
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-10-26 00:00:00 Z
+date: 2011-11-06 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: watir-webdriver
@@ -20,7 +20,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.3.5
+        version: 0.3.8
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
@@ -31,53 +31,42 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 2.9.1
+        version: 2.10.0
   type: :runtime
   version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: mixology
-  prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
-  type: :runtime
-  version_requirements: *id003
 - !ruby/object:Gem::Dependency 
   name: rspec
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
         version: 2.6.0
   type: :development
-  version_requirements: *id004
+  version_requirements: *id003
 - !ruby/object:Gem::Dependency 
   name: cucumber
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
         version: 1.1.0
   type: :development
-  version_requirements: *id005
+  version_requirements: *id004
 - !ruby/object:Gem::Dependency 
   name: yard
   prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
         version: 0.7.2
   type: :development
-  version_requirements: *id006
+  version_requirements: *id005
 description: Page Object DSL that works with both Watir and Selenium
 email: 
 - jeff.morgan@leandog.com
@@ -391,3 +380,4 @@ test_files:
 - spec/page-object/platforms/selenium_webdriver_spec.rb
 - spec/page-object/platforms/watir_webdriver_spec.rb
 - spec/spec_helper.rb
+has_rdoc: