page-object 0.6.1 → 0.6.2

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

@@ -38,7 +38,7 @@ module PageObject
         # @return [Array<String>] An array of strings representing the text value of the currently selected options.
         #
         def selected_options
-          @element.selected_options
+          @element.selected_options.map { |e| e.text }.compact
         end
 
         #

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

@@ -8,7 +8,7 @@ module PageObject
         # Set the value of the TextArea
         #
         def value=(new_value)
-          element.send_keys(new_value)
+          element.set(new_value)
         end
         
         #

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

@@ -10,24 +10,27 @@ module PageObject
         # @return [PageObject::Elements::ListItem]
         #
         def [](idx)
-          eles = list_items
-          Object::PageObject::Elements::ListItem.new(eles[idx], :platform => :watir_webdriver)
+          Object::PageObject::Elements::ListItem.new(children[idx], :platform => :watir_webdriver)
         end
 
         #
         # Return the number of items contained in the unordered list
         #
         def items
-          list_items.size
+          children.size
         end
 
         private
 
+        def children
+          list_items.find_all { |item| item.parent == element }
+        end
+        
         def list_items
-          element.wd.find_elements(:xpath, child_xpath)
+          element.uls(:xpath => child_xpath)
         end
 
       end
     end
   end
-end
+end

data/lib/page-object/version.rb

@@ -1,4 +1,4 @@
 module PageObject
   # @private
-  VERSION = "0.6.1"
+  VERSION = "0.6.2"
 end

data/page-object.gemspec

@@ -19,11 +19,12 @@ 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.4.1'
-  s.add_dependency 'selenium-webdriver', '>= 2.17.0' 
+  s.add_dependency 'watir-webdriver', '>= 0.5.3'
+  s.add_dependency 'selenium-webdriver', '>= 2.19.0' 
   
   s.add_development_dependency 'rspec', '>= 2.6.0'
   s.add_development_dependency 'cucumber', '>= 1.1.0'
   s.add_development_dependency 'yard', '>= 0.7.2'
+  s.add_development_dependency 'rack', '>= 1.0'
 
 end

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

@@ -30,19 +30,24 @@ describe PageObject::Elements::OrderedList do
     context "for watir" do
       it "should return a list item when indexed" do
         ol = PageObject::Elements::OrderedList.new(ol_element, :platform => :watir_webdriver)
-        ol_element.stub(:wd).and_return(ol_element)
-        ol_element.should_receive(:find_elements).with(:xpath, ".//child::li").and_return(ol_element)
-        ol_element.stub(:[]).and_return(ol_element)
-        ol[1].should be_instance_of PageObject::Elements::ListItem
+        ol_element.stub(:ols).and_return([ol_element])
+        ol_element.stub(:find_elements).and_return(ol_element)
+        ol_element.stub(:map).and_return([ol_element])
+        ol_element.stub(:parent).and_return(ol_element)
+        ol_element.stub(:element).and_return(ol_element)
+        ol_element.stub(:==).and_return(true)
+        ol[1]
       end
 
       it "should know how many list items it contains" do
         ol = PageObject::Elements::OrderedList.new(ol_element, :platform => :watir_webdriver)
-        ol_element.stub(:wd).and_return(ol_element)
-        ol_element.should_receive(:find_elements).with(:xpath, ".//child::li").and_return(ol_element)
-        ol_element.stub(:[]).and_return(ol_element)
-        ol_element.stub(:size).and_return(5)
-        ol.items.should == 5
+        ol_element.stub(:ols).and_return([ol_element])
+        ol_element.stub(:find_elements).and_return(ol_element)
+        ol_element.stub(:map).and_return([ol_element])
+        ol_element.stub(:parent).and_return(ol_element)
+        ol_element.stub(:element).and_return(ol_element)
+        ol_element.stub(:==).and_return(true)
+        ol.items.should == 1
       end
 
       it "should iterate over the list items" do
@@ -58,16 +63,22 @@ describe PageObject::Elements::OrderedList do
     context "for selenium" do
       it "should return a list item when indexed" do
         ol = PageObject::Elements::OrderedList.new(ol_element, :platform => :selenium_webdriver)
-        ol_element.should_receive(:find_elements).with(:xpath, ".//child::li").and_return(ol_element)
-        ol_element.should_receive(:[]).and_return(ol_element)
-        ol[1].should be_instance_of PageObject::Elements::ListItem
+        ol_element.should_receive(:find_elements).and_return(ol_element)
+        ol_element.should_receive(:map).and_return([ol_element])
+        ol_element.should_receive(:parent).and_return(ol_element)
+        ol_element.should_receive(:element).and_return(ol_element)
+        ol_element.should_receive(:==).and_return(true)
+        ol[1]
       end
 
       it "should know how many list items it contains" do
         ol = PageObject::Elements::OrderedList.new(ol_element, :platform => :selenium_webdriver)
-        ol_element.should_receive(:find_elements).with(:xpath, ".//child::li").and_return(ol_element)
-        ol_element.should_receive(:size).and_return(5)
-        ol.items.should == 5
+        ol_element.should_receive(:find_elements).and_return(ol_element)
+        ol_element.should_receive(:map).and_return([ol_element])
+        ol_element.should_receive(:parent).and_return(ol_element)
+        ol_element.should_receive(:element).and_return(ol_element)
+        ol_element.should_receive(:==).and_return(true)
+        ol.items.should == 1
       end
 
       it "should iterate over the list items" do

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

@@ -54,6 +54,7 @@ describe PageObject::Elements::SelectList do
 
       it "should return an array of selected options" do
         sel_list.stub(:selected_options).and_return(opts)
+        sel_list.stub(:text).and_return(sel_list)
         watir_sel_list.selected_options.should == opts
       end
 

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

@@ -30,18 +30,24 @@ describe PageObject::Elements::UnorderedList do
     context "for watir" do
       it "should return a list item when indexed" do
         ul = PageObject::Elements::UnorderedList.new(ul_element, :platform => :watir_webdriver)
-        ul_element.stub(:wd).and_return(ul_element)
+        ul_element.stub(:uls).and_return([ul_element])
         ul_element.stub(:find_elements).and_return(ul_element)
-        ul_element.stub(:[])
-        ul[1].should be_instance_of PageObject::Elements::ListItem
+        ul_element.stub(:map).and_return([ul_element])
+        ul_element.stub(:parent).and_return(ul_element)
+        ul_element.stub(:element).and_return(ul_element)
+        ul_element.stub(:==).and_return(true)
+        ul[1]
       end
 
       it "should know how many items it contains" do
         ul = PageObject::Elements::UnorderedList.new(ul_element, :platform => :watir_webdriver)
-        ul_element.stub(:wd).and_return(ul_element)
+        ul_element.stub(:uls).and_return([ul_element])
         ul_element.stub(:find_elements).and_return(ul_element)
-        ul_element.stub(:size).and_return(5)
-        ul.items.should == 5
+        ul_element.stub(:map).and_return([ul_element])
+        ul_element.stub(:parent).and_return(ul_element)
+        ul_element.stub(:element).and_return(ul_element)
+        ul_element.stub(:==).and_return(true)
+        ul.items.should == 1
       end
 
       it "should know how to iterate over the items" do
@@ -58,15 +64,21 @@ describe PageObject::Elements::UnorderedList do
       it "should return a list item when indexed" do
         ul = PageObject::Elements::UnorderedList.new(ul_element, :platform => :selenium_webdriver)
         ul_element.should_receive(:find_elements).and_return(ul_element)
-        ul_element.stub(:[])
-        ul[1].should be_instance_of PageObject::Elements::ListItem
+        ul_element.should_receive(:map).and_return([ul_element])
+        ul_element.should_receive(:parent).and_return(ul_element)
+        ul_element.should_receive(:element).and_return(ul_element)
+        ul_element.should_receive(:==).and_return(true)
+        ul[1]
       end
 
       it "should know how many items it contains" do
         ul = PageObject::Elements::UnorderedList.new(ul_element, :platform => :selenium_webdriver)
         ul_element.should_receive(:find_elements).and_return(ul_element)
-        ul_element.should_receive(:size).and_return(5)
-        ul.items.should == 5
+        ul_element.should_receive(:map).and_return([ul_element])
+        ul_element.should_receive(:parent).and_return(ul_element)
+        ul_element.should_receive(:element).and_return(ul_element)
+        ul_element.should_receive(:==).and_return(true)
+        ul.items.should == 1
       end
 
       it "should know how to iterate over the items" do

data/spec/page-object/javascript_framework_facade_spec.rb

@@ -0,0 +1,61 @@
+require 'spec_helper'
+
+class TestClass
+  include PageObject::JavascriptFrameworkFacade
+end
+
+
+describe PageObject::JavascriptFrameworkFacade do
+  let(:facade) { PageObject::JavascriptFrameworkFacade }
+  
+  it "should allow the selection of a javascript framework" do
+    facade.framework = :jquery
+    facade.framework.should == :jquery
+  end
+
+  it "should register the jQuery script builder" do
+    facade.framework = :jquery
+    facade.script_builder.should == ::PageObject::Javascript::JQuery
+  end
+
+  it "should return script for pending requests in jQuery" do
+    facade.framework = :jquery
+    facade.pending_requests.should == 'return jQuery.active'
+  end
+
+  it "should register the Prototype script builder" do
+    facade.framework = :prototype
+    facade.script_builder.should == ::PageObject::Javascript::Prototype
+  end
+
+  it "should return script for pending requests in Prototype" do
+    facade.framework = :prototype
+    facade.pending_requests.should == 'return Ajax.activeRequestCount'
+  end
+
+  it "should not allow you to set the framework to one it does not know about" do
+    expect{ facade.framework = :blah }.to raise_error
+  end
+
+  it "should allow you to add a new javascript framework" do
+    module GoodFake
+      def self.pending_requests
+        "fake"
+      end
+    end
+    
+    facade.add_framework(:blah, GoodFake)
+    facade.framework = :blah
+    facade.pending_requests.should == "fake"
+  end
+
+  it "should not allow you to add a new javascript framework that is invalid" do
+    module BadFake
+      def self.blah
+      end
+    end
+
+    expect{ facade.add_framework(:blah, BadFake) }.to raise_error
+  end
+end
+

data/spec/page-object/page-object_spec.rb

@@ -12,6 +12,18 @@ describe PageObject do
   let(:selenium_browser) { mock_selenium_browser }
   let(:watir_page_object) { PageObjectTestPageObject.new(watir_browser) }
   let(:selenium_page_object) { PageObjectTestPageObject.new(selenium_browser) }
+
+  context "setting values for the Javascript Framework" do
+    it "should set the javascript framework" do
+      PageObject::JavascriptFrameworkFacade.should_receive(:framework=)
+      PageObject.javascript_framework = :foo
+    end
+
+    it "should add a new Javascript Framework" do
+      PageObject::JavascriptFrameworkFacade.should_receive(:add_framework)
+      PageObject.add_framework(:foo, :bar)
+    end
+  end
   
   context "when created with a watir-webdriver browser" do
     it "should include the WatirPageObject module" do
@@ -91,6 +103,12 @@ describe PageObject do
         watir_page_object.wait_until(5, "too long")
       end
 
+      it "should wait until there are no pending ajax requests" do
+        PageObject::JavascriptFrameworkFacade.should_receive(:pending_requests).and_return('pending requests')
+        watir_browser.should_receive(:execute_script).with('pending requests').and_return(0)
+        watir_page_object.wait_for_ajax
+      end
+
       it "should override alert popup behavior" do
         watir_browser.should_receive(:wd).twice.and_return(watir_browser)
         watir_browser.should_receive(:execute_script).twice
@@ -150,7 +168,8 @@ describe PageObject do
       end
       
       it "should know how to clear all of the cookies from the browser" do
-        watir_browser.should_receive(:clear_cookies)
+        watir_browser.should_receive(:cookies).and_return(watir_browser)
+        watir_browser.should_receive(:clear)
         watir_page_object.clear_cookies
       end
       
@@ -189,6 +208,12 @@ describe PageObject do
         selenium_page_object.wait_until(5, 'too long')
       end
 
+      it "should wait until there are no pending ajax requests" do
+        PageObject::JavascriptFrameworkFacade.should_receive(:pending_requests).and_return('pending requests')
+        selenium_browser.should_receive(:execute_script).with('pending requests').and_return(0)
+        selenium_page_object.wait_for_ajax
+      end
+
       it "should override alert popup behavior" do
         selenium_browser.should_receive(:execute_script).twice
         selenium_page_object.alert do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: page-object
 version: !ruby/object:Gem::Version
-  version: 0.6.1
+  version: 0.6.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,33 +9,33 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-01-18 00:00:00.000000000 Z
+date: 2012-02-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: watir-webdriver
-  requirement: &70219783537560 !ruby/object:Gem::Requirement
+  requirement: &70155418362080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.4.1
+        version: 0.5.3
   type: :runtime
   prerelease: false
-  version_requirements: *70219783537560
+  version_requirements: *70155418362080
 - !ruby/object:Gem::Dependency
   name: selenium-webdriver
-  requirement: &70219783530900 !ruby/object:Gem::Requirement
+  requirement: &70155418361240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 2.17.0
+        version: 2.19.0
   type: :runtime
   prerelease: false
-  version_requirements: *70219783530900
+  version_requirements: *70155418361240
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70219789108140 !ruby/object:Gem::Requirement
+  requirement: &70155418375380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: 2.6.0
   type: :development
   prerelease: false
-  version_requirements: *70219789108140
+  version_requirements: *70155418375380
 - !ruby/object:Gem::Dependency
   name: cucumber
-  requirement: &70219789106820 !ruby/object:Gem::Requirement
+  requirement: &70155418374700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: 1.1.0
   type: :development
   prerelease: false
-  version_requirements: *70219789106820
+  version_requirements: *70155418374700
 - !ruby/object:Gem::Dependency
   name: yard
-  requirement: &70219789105960 !ruby/object:Gem::Requirement
+  requirement: &70155418374020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,7 +65,18 @@ dependencies:
         version: 0.7.2
   type: :development
   prerelease: false
-  version_requirements: *70219789105960
+  version_requirements: *70155418374020
+- !ruby/object:Gem::Dependency
+  name: rack
+  requirement: &70155418373300 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '1.0'
+  type: :development
+  prerelease: false
+  version_requirements: *70155418373300
 description: Page Object DSL that works with both Watir and Selenium
 email:
 - jeff.morgan@leandog.com
@@ -114,6 +125,7 @@ files:
 - features/html/static_elements.html
 - features/html/success.html
 - features/image.feature
+- features/javascript.feature
 - features/link.feature
 - features/list_item.feature
 - features/modal_dialog.feature
@@ -123,6 +135,11 @@ files:
 - features/page_level_actions.feature
 - features/paragraph.feature
 - features/radio_button.feature
+- features/sample-app/public/jquery-1.3.2.js
+- features/sample-app/public/jquery.html
+- features/sample-app/public/prototype-1.6.0.3.js
+- features/sample-app/public/prototype.html
+- features/sample-app/sample_app.rb
 - features/select_list.feature
 - features/span.feature
 - features/step_definitions/accessor_steps.rb
@@ -137,6 +154,7 @@ files:
 - features/step_definitions/headings_steps.rb
 - features/step_definitions/hidden_field_steps.rb
 - features/step_definitions/image_steps.rb
+- features/step_definitions/javascript_steps.rb
 - features/step_definitions/link_steps.rb
 - features/step_definitions/list_item_steps.rb
 - features/step_definitions/modal_dialog_steps.rb
@@ -154,6 +172,7 @@ files:
 - features/step_definitions/text_area_steps.rb
 - features/step_definitions/text_field_steps.rb
 - features/step_definitions/unordered_list_steps.rb
+- features/support/ajax_text_environment.rb
 - features/support/env.rb
 - features/support/hooks.rb
 - features/support/page.rb
@@ -192,6 +211,9 @@ files:
 - lib/page-object/elements/text_area.rb
 - lib/page-object/elements/text_field.rb
 - lib/page-object/elements/unordered_list.rb
+- lib/page-object/javascript/jquery.rb
+- lib/page-object/javascript/prototype.rb
+- lib/page-object/javascript_framework_facade.rb
 - lib/page-object/loads_platform.rb
 - lib/page-object/nested_elements.rb
 - lib/page-object/page_factory.rb
@@ -259,6 +281,7 @@ files:
 - spec/page-object/elements/text_field_spec.rb
 - spec/page-object/elements/unordered_list_spec.rb
 - spec/page-object/elements/watir_element_spec.rb
+- spec/page-object/javascript_framework_facade_spec.rb
 - spec/page-object/loads_platform_spec.rb
 - spec/page-object/page-object_spec.rb
 - spec/page-object/page_factory_spec.rb
@@ -322,6 +345,7 @@ test_files:
 - features/html/static_elements.html
 - features/html/success.html
 - features/image.feature
+- features/javascript.feature
 - features/link.feature
 - features/list_item.feature
 - features/modal_dialog.feature
@@ -331,6 +355,11 @@ test_files:
 - features/page_level_actions.feature
 - features/paragraph.feature
 - features/radio_button.feature
+- features/sample-app/public/jquery-1.3.2.js
+- features/sample-app/public/jquery.html
+- features/sample-app/public/prototype-1.6.0.3.js
+- features/sample-app/public/prototype.html
+- features/sample-app/sample_app.rb
 - features/select_list.feature
 - features/span.feature
 - features/step_definitions/accessor_steps.rb
@@ -345,6 +374,7 @@ test_files:
 - features/step_definitions/headings_steps.rb
 - features/step_definitions/hidden_field_steps.rb
 - features/step_definitions/image_steps.rb
+- features/step_definitions/javascript_steps.rb
 - features/step_definitions/link_steps.rb
 - features/step_definitions/list_item_steps.rb
 - features/step_definitions/modal_dialog_steps.rb
@@ -362,6 +392,7 @@ test_files:
 - features/step_definitions/text_area_steps.rb
 - features/step_definitions/text_field_steps.rb
 - features/step_definitions/unordered_list_steps.rb
+- features/support/ajax_text_environment.rb
 - features/support/env.rb
 - features/support/hooks.rb
 - features/support/page.rb
@@ -400,6 +431,7 @@ test_files:
 - spec/page-object/elements/text_field_spec.rb
 - spec/page-object/elements/unordered_list_spec.rb
 - spec/page-object/elements/watir_element_spec.rb
+- spec/page-object/javascript_framework_facade_spec.rb
 - spec/page-object/loads_platform_spec.rb
 - spec/page-object/page-object_spec.rb
 - spec/page-object/page_factory_spec.rb