page-object 0.0.5 → 0.1

data/lib/page-object/version.rb

@@ -1,4 +1,4 @@
 module PageObject
   # @private
-  VERSION = "0.0.5"
+  VERSION = "0.1"
 end

data/lib/page-object/watir_page_object.rb

@@ -244,6 +244,7 @@ module PageObject
     # See PageObject::Accessors#div
     #
     def div_text_for(identifier)
+      identifier = add_tagname_if_needed identifier, "div"
       identifier = Elements::Div.watir_identifier_for identifier
       @browser.div(identifier).text
     end
@@ -253,6 +254,7 @@ module PageObject
     # See PageObject::Accessors#div
     #
     def div_for(identifier)
+      identifier = add_tagname_if_needed identifier, "div"
       identifier = Elements::Div.watir_identifier_for identifier
       element = @browser.div(identifier)
       PageObject::Elements::Div.new(element, :platform => :watir)
@@ -263,6 +265,7 @@ module PageObject
     # See PageObject::Accessors#span
     #
     def span_text_for(identifier)
+      identifier = add_tagname_if_needed identifier, "span"
       identifier = Elements::Span.watir_identifier_for identifier
       @browser.span(identifier).text
     end
@@ -272,6 +275,7 @@ module PageObject
     # See PageObject::Accessors#span
     #
     def span_for(identifier)
+      identifier = add_tagname_if_needed identifier, "span"
       identifier = Elements::Span.watir_identifier_for identifier
       element = @browser.span(identifier)
       PageObject::Elements::Span.new(element, :platform => :watir)
@@ -301,7 +305,8 @@ module PageObject
     # See PageObject::Accessors#table
     #
     def table_for(identifier)
-      identifier = Elements::Table.watir_identifier_for identifier
+      identifier = add_tagname_if_needed identifier, "table"
+      identifier = Elements::Table.watir_identifier_for identifier.clone
       element = @browser.table(identifier)
       PageObject::Elements::Table.new(element, :platform => :watir)
     end
@@ -311,6 +316,7 @@ module PageObject
     # See PageObject::Accessors#cell
     #
     def cell_text_for(identifier)
+      identifier = add_tagname_if_needed identifier, "td"
       identifier = Elements::TableCell.watir_identifier_for identifier
       @browser.td(identifier).text
     end
@@ -320,6 +326,7 @@ module PageObject
     # See PageObject::Accessors#cell
     #
     def cell_for(identifier)
+      identifier = add_tagname_if_needed identifier, "td"
       identifier = Elements::TableCell.watir_identifier_for identifier
       element = @browser.td(identifier)
       PageObject::Elements::TableCell.new(element, :platform => :watir)
@@ -350,6 +357,7 @@ module PageObject
     # See PageObject::Accessors#list_item
     #
     def list_item_text_for(identifier)
+      identifier = add_tagname_if_needed identifier, "li"
       identifier = Elements::ListItem.watir_identifier_for identifier
       @browser.li(identifier).text
     end
@@ -359,6 +367,7 @@ module PageObject
     # See PageObject::Accessors#list_item
     #
     def list_item_for(identifier)
+      identifier = add_tagname_if_needed identifier, "li"
       identifier = Elements::ListItem.watir_identifier_for identifier
       element = @browser.li(identifier)
       PageObject::Elements::ListItem.new(element, :platform => :watir)
@@ -369,6 +378,7 @@ module PageObject
     # See PageObject::Accessors#unordered_list
     #
     def unordered_list_for(identifier)
+      identifier = add_tagname_if_needed identifier, "ul"
       identifier = Elements::UnorderedList.watir_identifier_for identifier
       element = @browser.ul(identifier)
       PageObject::Elements::UnorderedList.new(element, :platform => :watir)
@@ -379,9 +389,18 @@ module PageObject
     # See PageObject::Accessors#ordered_list
     #
     def ordered_list_for(identifier)
+      identifier = add_tagname_if_needed identifier, "ol"
       identifier = Elements::OrderedList.watir_identifier_for identifier
       element = @browser.ol(identifier)
       PageObject::Elements::OrderedList.new(element, :platform => :watir)
     end
+
+    private
+    
+    def add_tagname_if_needed identifier, tag
+      return identifier if identifier.length < 2 and not identifier[:name]
+      identifier[:tag_name] = tag if identifier[:name]
+      identifier
+    end
   end
 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.2.4'
-  s.add_dependency 'selenium-webdriver', '>= 0.2.1' 
+  s.add_dependency 'watir-webdriver', '>= 0.2.5'
+  s.add_dependency 'selenium-webdriver', '>= 0.2.2' 
   
   s.add_development_dependency 'rspec', '>= 2.5.0'
   s.add_development_dependency 'cucumber', '>= 0.10.2'

data/spec/page-object/accessors_spec.rb

@@ -360,14 +360,14 @@ describe PageObject::Accessors do
       it "should check a check box element" do
         selenium_browser.should_receive(:find_element).twice.and_return(selenium_browser)
         selenium_browser.should_receive(:selected?).and_return(false)
-        selenium_browser.should_receive(:toggle)
+        selenium_browser.should_receive(:click)
         selenium_page_object.check_active
       end
     
       it "should clear a check box element" do
         selenium_browser.should_receive(:find_element).twice.and_return(selenium_browser)
         selenium_browser.should_receive(:selected?).and_return(true)
-        selenium_browser.should_receive(:toggle)
+        selenium_browser.should_receive(:click)
         selenium_page_object.uncheck_active
       end
     

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

@@ -13,7 +13,7 @@ describe PageObject::Elements::Button do
     end
 
     it "should map selenium types to same" do
-      [:class, :id, :name, :xpath].each do |t|
+      [:class, :id, :index, :name, :xpath].each do |t|
         key, value = button.selenium_identifier_for t => 'value'
         key.should == t
       end

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

@@ -12,7 +12,7 @@ describe PageObject::Elements::CheckBox do
       end
     end
     it "should map selenium types to same" do
-      [:class, :id, :name, :xpath].each do |t|
+      [:class, :id, :name, :xpath, :index].each do |t|
         key, value = checkbox.selenium_identifier_for t => 'value'
         key.should == t
       end

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

@@ -13,7 +13,7 @@ describe PageObject::Elements::Div do
     end
 
     it "should map selenium types to same" do
-      [:class, :id, :name, :xpath].each do |t|
+      [:class, :id, :index, :name, :xpath].each do |t|
         key, value = div.selenium_identifier_for t => 'value'
         key.should == t
       end

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

@@ -18,7 +18,7 @@ describe PageObject::Elements::HiddenField do
     end
     
     it "should map selenium types to same" do
-      [:class, :css, :id, :name, :xpath].each do |t|
+      [:class, :css, :id, :name, :xpath, :index].each do |t|
         key, value = hiddenfield.selenium_identifier_for t => 'value'
         key.should == t
       end

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

@@ -13,7 +13,7 @@ describe PageObject::Elements::Image do
     end
 
     it "should map selenium types to same" do
-      [:class, :id, :name, :xpath].each do |t|
+      [:class, :id, :index, :name, :xpath].each do |t|
         key, value = image.selenium_identifier_for t => 'value'
         key.should == t
       end

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

@@ -20,7 +20,7 @@ describe PageObject::Elements::Link do
     end
     
     it "should map selenium types to same" do
-      [:class, :id, :link, :link_text, :name, :xpath].each do |t|
+      [:class, :id, :link, :link_text, :name, :xpath, :index].each do |t|
         key, value = link.selenium_identifier_for t => 'value'
         key.should == t
       end

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

@@ -13,7 +13,7 @@ describe PageObject::Elements::ListItem do
     end
 
     it "should map selenium types to same" do
-      [:class, :id, :name, :xpath].each do |t|
+      [:class, :id, :index, :name, :xpath].each do |t|
         key, value = list_item.selenium_identifier_for t => 'value'
         key.should == t
       end

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

@@ -13,7 +13,7 @@ describe PageObject::Elements::OrderedList do
     end
 
     it "should map selenium types to same" do
-      [:class, :id, :name, :xpath].each do |t|
+      [:class, :id, :index, :name, :xpath].each do |t|
         key, value = ol.selenium_identifier_for t => 'value'
         key.should == t
       end

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

@@ -12,7 +12,7 @@ describe PageObject::Elements::RadioButton do
       end
     end
     it "should map selenium types to same" do
-      [:class, :id, :name, :xpath].each do |t|
+      [:class, :id, :name, :xpath, :index].each do |t|
         key, value = radiobutton.selenium_identifier_for t => 'value'
         key.should == t
       end

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

@@ -13,10 +13,51 @@ describe PageObject::Elements::SelectList do
     end
 
     it "should map selenium types to same" do
-      [:class, :id, :name, :xpath].each do |t|
+      [:class, :id, :name, :xpath, :index].each do |t|
         key, value = selectlist.selenium_identifier_for t => 'value'
         key.should == t
       end
     end
   end
-end
+
+  describe "interface" do
+    let(:sel_list) { double('select_list') }
+    let(:opts) { [sel_list, sel_list] }
+
+    before(:each) do
+      sel_list.stub(:find_elements).and_return(sel_list)
+      sel_list.stub(:each)
+    end
+    
+    context "for watir" do
+      it "should return an option when indexed" do
+        watir_sel_list = PageObject::Elements::SelectList.new(sel_list, :platform => :watir)
+        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)
+        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
+      end
+
+    end
+
+    context "for selenium" do
+      it "should return an option when indexed" do
+        selenium_sel_list = PageObject::Elements::SelectList.new(sel_list, :platform => :selenium)
+        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)
+        sel_list.should_receive(:find_elements).with(:xpath, ".//child::option").and_return(opts)
+        selenium_sel_list.options.size.should == 2
+      end
+    end
+  end
+end

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

@@ -13,7 +13,7 @@ describe PageObject::Elements::Span do
     end
 
     it "should map selenium types to same" do
-      [:class, :id, :name, :xpath].each do |t|
+      [:class, :id, :index, :name, :xpath].each do |t|
         key, value = span.selenium_identifier_for t => 'value'
         key.should == t
       end

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

@@ -32,6 +32,10 @@ describe PageObject::Elements::TableRow do
     end
 
     context "for watir" do
+      before(:each) do
+        table_row_driver.stub(:find_elements).and_return(table_row_driver)
+      end
+      
       it "should return a table cell when indexed" do
         table_row = PageObject::Elements::TableRow.new(table_row_driver, :platform => :watir)    
         table_row_driver.should_receive(:[]).with(1).and_return(table_cell)
@@ -40,7 +44,7 @@ describe PageObject::Elements::TableRow do
 
       it "should return the number of columns" do
         table_row = PageObject::Elements::TableRow.new(table_row_driver, :platform => :watir)
-        table_row_driver.should_receive(:wd).and_return(table_row_driver)
+        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)
         table_row.columns.should == 3

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

@@ -11,7 +11,7 @@ describe PageObject::Elements::Table do
     end
 
     it "should map selenium types to same" do
-      [:class, :id, :name, :xpath].each do |t|
+      [:class, :id, :index, :name, :xpath].each do |t|
         key, value = PageObject::Elements::Table.selenium_identifier_for t => 'value'
         key.should == t
       end

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

@@ -18,7 +18,7 @@ describe PageObject::Elements::TextArea do
     end
     
     it "should map selenium types to same" do
-      [:class, :css, :id, :name, :xpath].each do |t|
+      [:class, :css, :id, :name, :xpath, :index].each do |t|
         key, value = textarea.selenium_identifier_for t => 'value'
         key.should == t
       end

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

@@ -18,7 +18,7 @@ describe PageObject::Elements::TextField do
     end
     
     it "should map selenium types to same" do
-      [:class, :css, :id, :name, :xpath].each do |t|
+      [:class, :css, :id, :name, :xpath, :index].each do |t|
         key, value = textfield.selenium_identifier_for t => 'value'
         key.should == t
       end

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

@@ -13,7 +13,7 @@ describe PageObject::Elements::UnorderedList do
     end
 
     it "should map selenium types to same" do
-      [:class, :id, :name, :xpath].each do |t|
+      [:class, :id, :index, :name, :xpath].each do |t|
         key, value = ul.selenium_identifier_for t => 'value'
         key.should == t
       end

metadata

@@ -2,7 +2,7 @@
 name: page-object
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.0.5
+  version: "0.1"
 platform: ruby
 authors: 
 - Jeff Morgan
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-06-15 00:00:00 Z
+date: 2011-07-01 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: watir-webdriver
@@ -20,7 +20,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.2.4
+        version: 0.2.5
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
@@ -31,7 +31,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.2.1
+        version: 0.2.2
   type: :runtime
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
@@ -89,7 +89,7 @@ files:
 - features/button.feature
 - features/check_box.feature
 - features/div.feature
-- features/element.feature
+- features/element_attributes.feature
 - features/form.feature
 - features/hidden_field.feature
 - features/html/images/circle.png
@@ -128,6 +128,7 @@ files:
 - lib/page-object/elements/image.rb
 - lib/page-object/elements/link.rb
 - lib/page-object/elements/list_item.rb
+- lib/page-object/elements/option.rb
 - lib/page-object/elements/ordered_list.rb
 - lib/page-object/elements/radio_button.rb
 - lib/page-object/elements/select_list.rb
@@ -145,6 +146,7 @@ files:
 - 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_select_list.rb
 - lib/page-object/platforms/selenium_table.rb
 - lib/page-object/platforms/selenium_table_row.rb
 - lib/page-object/platforms/selenium_unordered_list.rb
@@ -152,6 +154,7 @@ files:
 - 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_select_list.rb
 - lib/page-object/platforms/watir_table.rb
 - lib/page-object/platforms/watir_table_row.rb
 - lib/page-object/platforms/watir_unordered_list.rb
@@ -212,7 +215,7 @@ test_files:
 - features/button.feature
 - features/check_box.feature
 - features/div.feature
-- features/element.feature
+- features/element_attributes.feature
 - features/form.feature
 - features/hidden_field.feature
 - features/html/images/circle.png