page-object 0.2.5 → 0.3.0

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

@@ -22,7 +22,7 @@ describe PageObject::Elements::RadioButton do
   describe "interface" do
     context "for selenium" do
       let(:selenium_rb) { double('radio_button') }
-      let(:radio_button) { PageObject::Elements::RadioButton.new(selenium_rb, :platform => :selenium) }
+      let(:radio_button) { PageObject::Elements::RadioButton.new(selenium_rb, :platform => :selenium_webdriver) }
 
       it "should select" do
         selenium_rb.should_receive(:click)

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

@@ -31,14 +31,14 @@ describe PageObject::Elements::SelectList do
 
     context "for watir" do
       it "should return an option when indexed" do
-        watir_sel_list = PageObject::Elements::SelectList.new(sel_list, :platform => :watir)
+        watir_sel_list = PageObject::Elements::SelectList.new(sel_list, :platform => :watir_webdriver)
         sel_list.stub(:wd).and_return(sel_list)
         sel_list.should_receive(:find_elements).with(:xpath, ".//child::option").and_return(opts)
         watir_sel_list[0].should be_instance_of PageObject::Elements::Option
       end
 
       it "should return an array of options" do
-        watir_sel_list = PageObject::Elements::SelectList.new(sel_list, :platform => :watir)
+        watir_sel_list = PageObject::Elements::SelectList.new(sel_list, :platform => :watir_webdriver)
         sel_list.stub(:wd).and_return(sel_list)
         sel_list.should_receive(:find_elements).with(:xpath, ".//child::option").and_return(opts)
         watir_sel_list.options.size.should == 2
@@ -47,19 +47,19 @@ describe PageObject::Elements::SelectList do
 
     context "for selenium" do
       it "should return an option when indexed" do
-        selenium_sel_list = PageObject::Elements::SelectList.new(sel_list, :platform => :selenium)
+        selenium_sel_list = PageObject::Elements::SelectList.new(sel_list, :platform => :selenium_webdriver)
         sel_list.should_receive(:find_elements).with(:xpath, ".//child::option").and_return(opts)
         selenium_sel_list[1].should be_instance_of PageObject::Elements::Option
       end
 
       it "should return an array of options" do
-        selenium_sel_list = PageObject::Elements::SelectList.new(sel_list, :platform => :selenium)
+        selenium_sel_list = PageObject::Elements::SelectList.new(sel_list, :platform => :selenium_webdriver)
         sel_list.should_receive(:find_elements).with(:xpath, ".//child::option").and_return(opts)
         selenium_sel_list.options.size.should == 2
       end
 
       it "should select an element" do
-        selenium_sel_list = PageObject::Elements::SelectList.new(sel_list, :platform => :selenium)
+        selenium_sel_list = PageObject::Elements::SelectList.new(sel_list, :platform => :selenium_webdriver)
         sel_list.should_receive(:send_keys).with('something')
         selenium_sel_list.select 'something'
       end

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

@@ -8,21 +8,21 @@ describe PageObject::Elements::TableRow do
   describe "interface" do
     context "for selenium" do
       it "should return a table cell when indexed" do
-        table_row = PageObject::Elements::TableRow.new(table_row_driver, :platform => :selenium)
+        table_row = PageObject::Elements::TableRow.new(table_row_driver, :platform => :selenium_webdriver)
         table_row_driver.should_receive(:find_elements).with(:xpath, ".//child::td|th").and_return(table_cell)
         table_cell.should_receive(:[]).and_return(table_cell)
         table_row[0].should be_instance_of PageObject::Elements::TableCell
       end
 
       it "should retrun the number of columns" do
-        table_row = PageObject::Elements::TableRow.new(table_row_driver, :platform => :selenium)
+        table_row = PageObject::Elements::TableRow.new(table_row_driver, :platform => :selenium_webdriver)
         table_row_driver.should_receive(:find_elements).with(:xpath, ".//child::td|th").and_return(table_row_driver)
         table_row_driver.should_receive(:size).and_return(3)
         table_row.columns.should == 3
       end
 
       it "should iterate over the table columns" do
-        table_row = PageObject::Elements::TableRow.new(table_row_driver, :platform => :selenium)
+        table_row = PageObject::Elements::TableRow.new(table_row_driver, :platform => :selenium_webdriver)
         table_row.should_receive(:columns).and_return(2)
         table_row.stub(:[]).and_return(table_row_driver)
         count = 0
@@ -37,13 +37,13 @@ describe PageObject::Elements::TableRow do
       end
 
       it "should return a table cell when indexed" do
-        table_row = PageObject::Elements::TableRow.new(table_row_driver, :platform => :watir)
+        table_row = PageObject::Elements::TableRow.new(table_row_driver, :platform => :watir_webdriver)
         table_row_driver.should_receive(:[]).with(1).and_return(table_cell)
         table_row[1].should be_instance_of PageObject::Elements::TableCell
       end
 
       it "should return the number of columns" do
-        table_row = PageObject::Elements::TableRow.new(table_row_driver, :platform => :watir)
+        table_row = PageObject::Elements::TableRow.new(table_row_driver, :platform => :watir_webdriver)
         table_row_driver.stub(:wd).and_return(table_row_driver)
         table_row_driver.should_receive(:find_elements).with(:xpath, ".//child::td|th").and_return(table_row_driver)
         table_row_driver.should_receive(:size).and_return(3)
@@ -51,7 +51,7 @@ describe PageObject::Elements::TableRow do
       end
 
       it "should iterate over the table columns" do
-        table_row = PageObject::Elements::TableRow.new(table_row_driver, :platform => :watir)
+        table_row = PageObject::Elements::TableRow.new(table_row_driver, :platform => :watir_webdriver)
         table_row.should_receive(:columns).and_return(2)
         table_row.stub(:[])
         count = 0

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

@@ -27,7 +27,7 @@ describe PageObject::Elements::Table do
     end
 
     context "for watir" do
-      let(:watir_table) { PageObject::Elements::Table.new(table_element, :platform => :watir) }
+      let(:watir_table) { PageObject::Elements::Table.new(table_element, :platform => :watir_webdriver) }
       
       it "should return a table row when indexed" do
         table_element.stub(:[]).with(1).and_return(table_element)
@@ -50,7 +50,7 @@ describe PageObject::Elements::Table do
     end
 
     context "for selenium" do
-      let(:selenium_table) { PageObject::Elements::Table.new(table_element, :platform => :selenium) }
+      let(:selenium_table) { PageObject::Elements::Table.new(table_element, :platform => :selenium_webdriver) }
       
       it "should return a table row when indexed" do
         table_element.should_receive(:find_elements).with(:xpath, ".//child::tr").and_return(table_element)

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

@@ -34,7 +34,7 @@ describe PageObject::Elements::TextArea do
     context "for Selenium" do
       it "should set its' value" do
         text_area_element = double('text_area')
-        text_area = PageObject::Elements::TextArea.new(text_area_element, :platform => :selenium)
+        text_area = PageObject::Elements::TextArea.new(text_area_element, :platform => :selenium_webdriver)
         text_area_element.should_receive(:clear)
         text_area_element.should_receive(:send_keys).with('Joseph')
         text_area.value = 'Joseph'

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

@@ -35,7 +35,7 @@ describe PageObject::Elements::TextField do
     context "for selenium" do
       it "should set its' value" do
         text_field_element = double('selenium_text_field')
-        selenium_text_field = PageObject::Elements::TextField.new(text_field_element, :platform => :selenium)
+        selenium_text_field = PageObject::Elements::TextField.new(text_field_element, :platform => :selenium_webdriver)
         text_field_element.should_receive(:clear)
         text_field_element.should_receive(:send_keys).with('Joseph')
         selenium_text_field.value = 'Joseph'

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

@@ -25,7 +25,7 @@ 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)
+        ul = PageObject::Elements::UnorderedList.new(ul_element, :platform => :watir_webdriver)
         ul_element.stub(:wd).and_return(ul_element)
         ul_element.stub(:find_elements).and_return(ul_element)
         ul_element.stub(:[])
@@ -33,7 +33,7 @@ describe PageObject::Elements::UnorderedList do
       end
 
       it "should know how many items it contains" do
-        ul = PageObject::Elements::UnorderedList.new(ul_element, :platform => :watir)
+        ul = PageObject::Elements::UnorderedList.new(ul_element, :platform => :watir_webdriver)
         ul_element.stub(:wd).and_return(ul_element)
         ul_element.stub(:find_elements).and_return(ul_element)
         ul_element.stub(:size).and_return(5)
@@ -41,7 +41,7 @@ describe PageObject::Elements::UnorderedList do
       end
 
       it "should know how to iterate over the items" do
-        ul = PageObject::Elements::UnorderedList.new(ul_element, :platform => :watir)
+        ul = PageObject::Elements::UnorderedList.new(ul_element, :platform => :watir_webdriver)
         ul.should_receive(:items).and_return(5)
         ul.stub(:[])
         count = 0
@@ -52,21 +52,21 @@ describe PageObject::Elements::UnorderedList do
 
     context "for selenium" do
       it "should return a list item when indexed" do
-        ul = PageObject::Elements::UnorderedList.new(ul_element, :platform => :selenium)
+        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
       end
 
       it "should know how many items it contains" do
-        ul = PageObject::Elements::UnorderedList.new(ul_element, :platform => :selenium)
+        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
       end
 
       it "should know how to iterate over the items" do
-        ul = PageObject::Elements::UnorderedList.new(ul_element, :platform => :selenium)
+        ul = PageObject::Elements::UnorderedList.new(ul_element, :platform => :selenium_webdriver)
         ul.should_receive(:items).and_return(5)
         ul.stub(:[])
         count = 0

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

@@ -15,13 +15,13 @@ describe PageObject do
   
   context "when created with a watir-webdriver browser" do
     it "should include the WatirPageObject module" do
-      watir_page_object.platform.should be_kind_of PageObject::WatirPageObject
+      watir_page_object.platform.should be_kind_of PageObject::Platforms::WatirWebDriver::PageObject
     end
   end
 
   context "when created with a selenium browser" do
     it "should include the SeleniumPageObject module" do
-      selenium_page_object.platform.should be_kind_of Object::PageObject::Platforms::Selenium::PageObject
+      selenium_page_object.platform.should be_kind_of PageObject::Platforms::SeleniumWebDriver::PageObject
     end
   end
   
@@ -109,6 +109,11 @@ describe PageObject do
         end
       end
       
+      it "should convert a modal popup to a window" do
+        watir_browser.should_receive(:execute_script)
+        watir_page_object.modal_dialog {}
+      end
+      
       it "should switch to a new window with a given title" do
         watir_browser.should_receive(:window).with(:title => /My\ Title/).and_return(watir_browser)
         watir_browser.should_receive(:use)
@@ -182,6 +187,11 @@ describe PageObject do
         end
       end
       
+      it "should convert a modal popup to a window" do
+        selenium_browser.should_receive(:execute_script)
+        selenium_page_object.modal_dialog {}
+      end
+      
       it "should switch to a new window with a given title" do
         selenium_browser.should_receive(:window_handles).and_return(["win1"])
         selenium_browser.should_receive(:switch_to).twice.and_return(selenium_browser)

data/spec/page-object/platforms/{selenium → selenium_webdriver}/selenium_page_object_spec.rb

@@ -1,12 +1,12 @@
 require 'spec_helper'
-require 'page-object/platforms/selenium/page_object'
+require 'page-object/platforms/selenium_webdriver/page_object'
 require 'page-object/elements'
 
 class SeleniumTestPageObject
   include PageObject
 end
 
-describe PageObject::Platforms::Selenium::PageObject do
+describe PageObject::Platforms::SeleniumWebDriver::PageObject do
   let(:selenium_browser) { mock_selenium_browser }
   let(:selenium_page_object) { SeleniumTestPageObject.new(selenium_browser) }
   

data/spec/page-object/platforms/selenium_webdriver_spec.rb

@@ -0,0 +1,29 @@
+require 'spec_helper'
+
+
+describe PageObject::Platforms::SeleniumWebDriver do
+
+  it "should be registered as an adapter" do
+    PageObject::Platforms.get[:selenium_webdriver].should be PageObject::Platforms::SeleniumWebDriver
+
+  end
+  describe 'create page object' do
+    let(:browser) { double('browser') }
+    let(:subject) { PageObject::Platforms::SeleniumWebDriver.create_page_object(browser) }
+    
+    it "should create a SeleniumPageObject" do
+      subject.should be_kind_of PageObject::Platforms::SeleniumWebDriver::PageObject
+    end
+  end
+  
+  describe "is for?" do
+    it "should be true when the browser is a selenium driver" do
+      browser = mock_selenium_browser()
+      PageObject::Platforms::SeleniumWebDriver.is_for?(browser).should == true
+    end
+    
+    it "should be false when the browser is anything else" do
+      PageObject::Platforms::SeleniumWebDriver.is_for?("asdf").should == false
+    end
+  end
+end

data/spec/page-object/platforms/{watir_spec.rb → watir_webdriver_spec.rb}

@@ -1,15 +1,19 @@
 require 'spec_helper'
 
-describe PageObject::Platforms::Watir do
+describe PageObject::Platforms::WatirWebDriver do
+  
   it "should be in the PageObjects Adapters list" do
-    PageObject::Platforms.get[:watir].should be PageObject::Platforms::Watir
+    PageObject::Platforms.get[:watir_webdriver].should be PageObject::Platforms::WatirWebDriver
   end
+  
   describe "create page object" do
     let(:browser) { double('browser') }
-    let(:subject) { PageObject::Platforms::Watir.create_page_object(browser) }
+    let(:subject) { PageObject::Platforms::WatirWebDriver.create_page_object(browser) }
+    
     it "should create a WatirPageObject" do
-      subject.should be_kind_of PageObject::WatirPageObject
+      subject.should be_kind_of PageObject::Platforms::WatirWebDriver::PageObject
     end
+    
     it "should give the watir page object the browser" do
       subject.browser.should be browser
     end
@@ -17,11 +21,12 @@ describe PageObject::Platforms::Watir do
   describe "is for?" do
     it "should be true when the browser is Watir::Browser" do
       browser = mock_watir_browser()
-      PageObject::Platforms::Watir.is_for?(browser).should be true
+      PageObject::Platforms::WatirWebDriver.is_for?(browser).should be true
     end
+    
     it "should be false at any other point" do
       browser = 'asdf'
-      PageObject::Platforms::Watir.is_for?('asdf').should be false
+      PageObject::Platforms::WatirWebDriver.is_for?('asdf').should be false
     end
   end
 end

metadata

@@ -2,7 +2,7 @@
 name: page-object
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.2.5
+  version: 0.3.0
 platform: ruby
 authors: 
 - Jeff Morgan
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-08-19 00:00:00 Z
+date: 2011-09-04 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: watir-webdriver
@@ -31,7 +31,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 2.4.0
+        version: 2.5.0
   type: :runtime
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
@@ -101,6 +101,10 @@ files:
 - features/html/frames.html
 - features/html/iframes.html
 - features/html/images/circle.png
+- features/html/modal.html
+- features/html/modal_1.html
+- features/html/modal_2.html
+- features/html/nested_elements.html
 - features/html/nested_frame_1.html
 - features/html/nested_frame_2.html
 - features/html/nested_frame_3.html
@@ -110,6 +114,8 @@ files:
 - features/image.feature
 - features/link.feature
 - features/list_item.feature
+- features/modal_dialog.feature
+- features/nested_elements.feature
 - features/ordered_list.feature
 - features/page_level_actions.feature
 - features/radio_button.feature
@@ -127,6 +133,8 @@ files:
 - features/step_definitions/image_steps.rb
 - features/step_definitions/link_steps.rb
 - features/step_definitions/list_item_steps.rb
+- features/step_definitions/modal_dialog_steps.rb
+- features/step_definitions/nested_elements_steps.rb
 - features/step_definitions/ordered_list_steps.rb
 - features/step_definitions/page_level_actions_steps.rb
 - features/step_definitions/page_traversal_steps.rb
@@ -172,38 +180,39 @@ files:
 - lib/page-object/elements/text_field.rb
 - lib/page-object/elements/unordered_list.rb
 - lib/page-object/loads_platform.rb
+- lib/page-object/nested_elements.rb
 - lib/page-object/page_factory.rb
 - lib/page-object/platforms.rb
-- lib/page-object/platforms/selenium.rb
-- lib/page-object/platforms/selenium/button.rb
-- lib/page-object/platforms/selenium/check_box.rb
-- lib/page-object/platforms/selenium/element.rb
-- lib/page-object/platforms/selenium/form.rb
-- lib/page-object/platforms/selenium/image.rb
-- lib/page-object/platforms/selenium/link.rb
-- lib/page-object/platforms/selenium/ordered_list.rb
-- lib/page-object/platforms/selenium/page_object.rb
-- lib/page-object/platforms/selenium/radio_button.rb
-- lib/page-object/platforms/selenium/select_list.rb
-- lib/page-object/platforms/selenium/table.rb
-- lib/page-object/platforms/selenium/table_row.rb
-- lib/page-object/platforms/selenium/text_area.rb
-- lib/page-object/platforms/selenium/text_field.rb
-- lib/page-object/platforms/selenium/unordered_list.rb
-- lib/page-object/platforms/watir.rb
-- lib/page-object/platforms/watir/check_box.rb
-- lib/page-object/platforms/watir/element.rb
-- lib/page-object/platforms/watir/form.rb
-- lib/page-object/platforms/watir/image.rb
-- lib/page-object/platforms/watir/ordered_list.rb
-- lib/page-object/platforms/watir/page_object.rb
-- lib/page-object/platforms/watir/radio_button.rb
-- lib/page-object/platforms/watir/select_list.rb
-- lib/page-object/platforms/watir/table.rb
-- lib/page-object/platforms/watir/table_row.rb
-- lib/page-object/platforms/watir/text_area.rb
-- lib/page-object/platforms/watir/text_field.rb
-- lib/page-object/platforms/watir/unordered_list.rb
+- lib/page-object/platforms/selenium_webdriver.rb
+- lib/page-object/platforms/selenium_webdriver/button.rb
+- lib/page-object/platforms/selenium_webdriver/check_box.rb
+- lib/page-object/platforms/selenium_webdriver/element.rb
+- lib/page-object/platforms/selenium_webdriver/form.rb
+- lib/page-object/platforms/selenium_webdriver/image.rb
+- lib/page-object/platforms/selenium_webdriver/link.rb
+- lib/page-object/platforms/selenium_webdriver/ordered_list.rb
+- lib/page-object/platforms/selenium_webdriver/page_object.rb
+- lib/page-object/platforms/selenium_webdriver/radio_button.rb
+- lib/page-object/platforms/selenium_webdriver/select_list.rb
+- lib/page-object/platforms/selenium_webdriver/table.rb
+- lib/page-object/platforms/selenium_webdriver/table_row.rb
+- lib/page-object/platforms/selenium_webdriver/text_area.rb
+- lib/page-object/platforms/selenium_webdriver/text_field.rb
+- lib/page-object/platforms/selenium_webdriver/unordered_list.rb
+- lib/page-object/platforms/watir_webdriver.rb
+- lib/page-object/platforms/watir_webdriver/check_box.rb
+- lib/page-object/platforms/watir_webdriver/element.rb
+- lib/page-object/platforms/watir_webdriver/form.rb
+- lib/page-object/platforms/watir_webdriver/image.rb
+- lib/page-object/platforms/watir_webdriver/ordered_list.rb
+- lib/page-object/platforms/watir_webdriver/page_object.rb
+- lib/page-object/platforms/watir_webdriver/radio_button.rb
+- lib/page-object/platforms/watir_webdriver/select_list.rb
+- lib/page-object/platforms/watir_webdriver/table.rb
+- lib/page-object/platforms/watir_webdriver/table_row.rb
+- lib/page-object/platforms/watir_webdriver/text_area.rb
+- lib/page-object/platforms/watir_webdriver/text_field.rb
+- lib/page-object/platforms/watir_webdriver/unordered_list.rb
 - lib/page-object/version.rb
 - page-object.gemspec
 - spec/page-object/accessors_spec.rb
@@ -217,6 +226,7 @@ files:
 - spec/page-object/elements/image_spec.rb
 - spec/page-object/elements/link_spec.rb
 - spec/page-object/elements/list_item_spec.rb
+- spec/page-object/elements/nested_element_spec.rb
 - spec/page-object/elements/ordered_list_spec.rb
 - spec/page-object/elements/radio_button_spec.rb
 - spec/page-object/elements/select_list_spec.rb
@@ -229,9 +239,9 @@ 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/platforms/selenium/selenium_page_object_spec.rb
-- spec/page-object/platforms/selenium_spec.rb
-- spec/page-object/platforms/watir_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
 - spec/spec_helper.rb
 homepage: http://github.com/cheezy/page-object
 licenses: []
@@ -275,6 +285,10 @@ test_files:
 - features/html/frames.html
 - features/html/iframes.html
 - features/html/images/circle.png
+- features/html/modal.html
+- features/html/modal_1.html
+- features/html/modal_2.html
+- features/html/nested_elements.html
 - features/html/nested_frame_1.html
 - features/html/nested_frame_2.html
 - features/html/nested_frame_3.html
@@ -284,6 +298,8 @@ test_files:
 - features/image.feature
 - features/link.feature
 - features/list_item.feature
+- features/modal_dialog.feature
+- features/nested_elements.feature
 - features/ordered_list.feature
 - features/page_level_actions.feature
 - features/radio_button.feature
@@ -301,6 +317,8 @@ test_files:
 - features/step_definitions/image_steps.rb
 - features/step_definitions/link_steps.rb
 - features/step_definitions/list_item_steps.rb
+- features/step_definitions/modal_dialog_steps.rb
+- features/step_definitions/nested_elements_steps.rb
 - features/step_definitions/ordered_list_steps.rb
 - features/step_definitions/page_level_actions_steps.rb
 - features/step_definitions/page_traversal_steps.rb
@@ -331,6 +349,7 @@ test_files:
 - spec/page-object/elements/image_spec.rb
 - spec/page-object/elements/link_spec.rb
 - spec/page-object/elements/list_item_spec.rb
+- spec/page-object/elements/nested_element_spec.rb
 - spec/page-object/elements/ordered_list_spec.rb
 - spec/page-object/elements/radio_button_spec.rb
 - spec/page-object/elements/select_list_spec.rb
@@ -343,7 +362,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/platforms/selenium/selenium_page_object_spec.rb
-- spec/page-object/platforms/selenium_spec.rb
-- spec/page-object/platforms/watir_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
 - spec/spec_helper.rb