celerity 0.0.2 → 0.0.3

data/lib/celerity/non_control_elements.rb

@@ -7,6 +7,8 @@ module Celerity
   #
   class NonControlElement < Element
     include Exception
+    ATTRIBUTES = BASE_ATTRIBUTES
+    DEFAULT_HOW = :id
 
     # Can't use ClickableElement as it does assert_enabled - maybe we don't need the module after all?
     def click
@@ -30,21 +32,45 @@ module Celerity
   class Span < NonControlElement
     TAGS = [ Identifier.new('span') ]
   end
+  
+  class Ul < NonControlElement
+    TAGS = [ Identifier.new('ul') ]
+  end
+  
+  class Ol < NonControlElement
+    TAGS = [ Identifier.new('ol') ]
+  end
 
   class Li < NonControlElement
     TAGS = [ Identifier.new('li') ]
   end
     
   class Map < NonControlElement
-    # double-check my DTD reading here! :) 
-    ATTRIBUTES = BASE_ATTRIBUTES | [:id, :class, :style, :title, :name]
     TAGS = [ Identifier.new('map') ]
   end
 
   class Area < NonControlElement
-    # double-check my DTD reading here! :) 
-    ATTRIBUTES = BASE_ATTRIBUTES | [:shape, :coords, :href, :nohref, :alt]
+    ATTRIBUTES = ATTRIBUTES | [:shape, :coords, :href, :nohref, :alt, :tabindex, :accesskey, :onfocus, :onblur]
     TAGS = [ Identifier.new('area') ]
   end
   
+  class H1 < NonControlElement
+    TAGS = [ Identifier.new('h1') ]
+  end
+  class H2 < NonControlElement
+    TAGS = [ Identifier.new('h2') ]
+  end
+  class H3 < NonControlElement
+    TAGS = [ Identifier.new('h3') ]
+  end
+  class H4 < NonControlElement
+    TAGS = [ Identifier.new('h4') ]
+  end
+  class H5 < NonControlElement
+    TAGS = [ Identifier.new('h5') ]
+  end
+  class H6 < NonControlElement
+    TAGS = [ Identifier.new('h6') ]
+  end
+  
 end

data/lib/celerity/version.rb

@@ -2,7 +2,7 @@ module Celerity #:nodoc:
   module VERSION #:nodoc:
     MAJOR = 0
     MINOR = 0
-    TINY  = 2
+    TINY  = 3
 
     STRING = [MAJOR, MINOR, TINY].join('.')
   end

data/lib/celerity/watir_compatibility.rb

@@ -0,0 +1,62 @@
+module Celerity
+  class IE
+    # these are just for Watir compatability - should we keep them?
+    class << self
+      attr_accessor :speed, :attach_timeout, :visible
+      alias_method :start_window, :start
+      def reset_attach_timeout; @attach_timeout = 2.0; end
+      def each; end
+      def quit; end
+      def set_fast_speed; @speed = :fast; end
+      def set_slow_speed; @speed = :slow; end  
+    end
+
+    attr_accessor :visible
+   
+    def bring_to_front; true; end
+    def speed=(s); end
+    def wait; end
+  end
+  
+  
+  module ClickableElement
+    alias_method :click_no_wait, :click
+  end
+  
+  module Container
+    alias_method :checkbox, :check_box
+    alias_method :checkBox, :check_box
+    alias_method :body, :tbody
+    alias_method :bodies, :tbodies
+  end
+    
+  class Image
+    alias_method :hasLoaded?, :loaded?
+    alias_method :has_loaded?, :loaded?
+    alias_method :fileSize, :file_size
+    alias_method :fileCreatedDate, :file_created_date
+  end
+  
+   class Link
+     alias_method :click_no_wait, :click
+   end
+  
+  class RadioCheckCommon
+    alias_method :is_set?, :set?
+    alias_method :get_state, :set?
+    alias_method :isSet?, :set?
+    alias_method :getState, :set?
+  end
+  
+  class SelectList
+    alias_method :getSelectedItems, :get_selected_items
+    alias_method :getAllContents, :get_all_contents
+    alias_method :clearSelection, :clear_selection
+    alias_method :select_value, :select
+  end
+  
+  class TextField
+    alias_method :dragContentsTo, :drag_contents_to
+    alias_method :getContents, :get_contents
+  end
+end

data/setup.rb

@@ -1362,8 +1362,6 @@ class Installer
   end
 
   def install_dir_conf(rel)
-    # FIXME: should not remove current config files
-    # (rename previous file to .old/.org)
     install_files targetfiles(), "#{config('sysconfdir')}/#{rel}", 0644
   end
 

data/spec/area_spec.rb

@@ -1,6 +1,6 @@
 require File.dirname(__FILE__) + '/spec_helper.rb'
 
-describe "Area" do
+describe Area do
   
   before :all do
     @browser = IE.new
@@ -25,6 +25,9 @@ describe "Area" do
       @browser.area(:index, 1).should exist
       @browser.area(:xpath, "//area[@id='NCE']").should exist
     end
+    it "should return true if the element exists (default how = :id)" do
+      @browser.area("NCE").should exist
+    end
     it "should return false if the area doesn't exist" do
       @browser.area(:id, "no_such_id").should_not exist
       @browser.area(:id, /no_such_id/).should_not exist

data/spec/areas_spec.rb

@@ -1,6 +1,6 @@
 require File.dirname(__FILE__) + '/spec_helper.rb'
 
-describe "Areas" do
+describe Areas do
   
   before :all do
     @browser = IE.new

data/spec/button_spec.rb

@@ -1,6 +1,6 @@
 require File.dirname(__FILE__) + '/spec_helper.rb'
 
-describe "Button" do
+describe Button do
 
   before :all do
     @browser = IE.new
@@ -18,10 +18,10 @@ describe "Button" do
       @browser.button(:id, /new_user_submit/).should exist
       @browser.button(:name, "new_user_reset").should exist
       @browser.button(:name, /new_user_reset/).should exist
-      # we need to figure out what :text and :value/:caption means on input type="button" and <button /> elements
-      # it should return the value attribute for <input> elements, and the inner text for <button> elements - Jari 2008-05-10
       @browser.button(:value, "Button 2").should exist
       @browser.button(:value, /Button 2/).should exist
+      @browser.button(:src, "images/button.jpg").should exist
+      @browser.button(:src, /button.jpg/).should exist
       @browser.button(:text, "Button 2").should exist
       @browser.button(:text, /Button 2/).should exist
       @browser.button(:class, "image").should exist
@@ -29,25 +29,22 @@ describe "Button" do
       @browser.button(:index, 1).should exist
       @browser.button(:xpath, "//input[@id='new_user_submit']").should exist
     end
-    
     it "should return true if the button exists (how = :caption)" do
-      # we need to figure out what :text and :value/:caption means on input type="button" and <button /> elements
       @browser.button(:caption, "Button 2").should exist
       @browser.button(:caption, /Button 2/).should exist
     end
-    
     it "should return true if the button exists (default how = :value)" do
       @browser.button("Submit").should exist
     end
-    
     it "should return false if the button doesn't exist" do
       @browser.button(:id, "no_such_id").should_not exist
       @browser.button(:id, /no_such_id/).should_not exist
       @browser.button(:name, "no_such_name").should_not exist
       @browser.button(:name, /no_such_name/).should_not exist
-      # we need to figure out what :text and :value/:caption means on input type="button" and <button /> elements
       @browser.button(:value, "no_such_value").should_not exist
       @browser.button(:value, /no_such_value/).should_not exist
+      @browser.button(:src, "no_such_src").should_not exist
+      @browser.button(:src, /no_such_src/).should_not exist
       @browser.button(:text, "no_such_text").should_not exist
       @browser.button(:text, /no_such_text/).should_not exist
       @browser.button(:class, "no_such_class").should_not exist
@@ -80,7 +77,7 @@ describe "Button" do
       @browser.button(:index, 3).id.should == 'new_user_button'
     end
     it "should raise UnknownObjectException if button does not exist" do
-      lambda { @browser.button(:index, 1337).id }.should raise_error(UnknownObjectException)
+      lambda { @browser.button(:index, 1337).id }.should raise_error(UnknownObjectException, 'Unable to locate object, using :index and 1337')
     end
   end
 
@@ -90,8 +87,29 @@ describe "Button" do
       @browser.button(:index, 2).name.should == 'new_user_reset'
       @browser.button(:index, 3).name.should == 'new_user_button'
     end
-    it "should raise UnknownObjectException if button does not exist" do
-      lambda { @browser.button(:name, "no_such_name").name }.should raise_error(UnknownObjectException)
+    it "should raise UnknownObjectException if the button does not exist" do
+      lambda { @browser.button(:name, "no_such_name").name }.should raise_error(UnknownObjectException, 'Unable to locate object, using :name and "no_such_name"')
+    end
+  end
+  
+  describe "#src" do
+    it "should return the url for the button image" do
+      @browser.button(:name, "new_user_image").src.should == "images/button.jpg"
+    end
+    it "should raise UnknownObjectException if the button does not exist" do
+      lambda { @browser.button(:name, "no_such_name").src }.should raise_error(UnknownObjectException, 'Unable to locate object, using :name and "no_such_name"')
+    end
+  end
+  
+  describe "#style" do
+    it "should return the style attribute if the button exists" do
+      @browser.button(:id, 'delete_user_submit').style.should == "border: 4px solid red;"
+    end
+    it "should return an empty string if the element exists and the attribute doesn't" do
+      @browser.button(:id, 'new_user_submit').style.should == ""
+    end
+    it "should raise UnknownObjectException if the button does not exist" do
+      lambda { @browser.button(:name, "no_such_name").style }.should raise_error(UnknownObjectException, 'Unable to locate object, using :name and "no_such_name"')
     end
   end
   
@@ -111,7 +129,7 @@ describe "Button" do
       @browser.button(:index, 3).type.should == 'button'
     end
     it "should raise UnknownObjectException if button does not exist" do
-      lambda { @browser.button(:name, "no_such_name").type }.should raise_error(UnknownObjectException)
+      lambda { @browser.button(:name, "no_such_name").type }.should raise_error(UnknownObjectException, 'Unable to locate object, using :name and "no_such_name"')
     end
   end
 
@@ -122,7 +140,7 @@ describe "Button" do
       @browser.button(:index, 3).value.should == 'Button'
     end
     it "should raise UnknownObjectException if button does not exist" do
-      lambda { @browser.button(:name, "no_such_name").value }.should raise_error(UnknownObjectException)
+      lambda { @browser.button(:name, "no_such_name").value }.should raise_error(UnknownObjectException, 'Unable to locate object, using :name and "no_such_name"')
     end
   end
 
@@ -135,7 +153,7 @@ describe "Button" do
       @browser.button(:name, 'new_user_submit_disabled').should_not be_enabled
     end
     it "should raise UnknownObjectException if the button doesn't exist" do
-      lambda { @browser.button(:name, "no_such_name").enabled? }.should raise_error(UnknownObjectException)
+      lambda { @browser.button(:name, "no_such_name").enabled? }.should raise_error(UnknownObjectException, 'Unable to locate object, using :name and "no_such_name"')
     end
   end
 
@@ -147,7 +165,7 @@ describe "Button" do
       @browser.button(:name, 'new_user_submit_disabled').should be_disabled
     end
     it "should raise UnknownObjectException if button does not exist" do
-      lambda { @browser.button(:name, "no_such_name").disabled? }.should raise_error(UnknownObjectException)
+      lambda { @browser.button(:name, "no_such_name").disabled? }.should raise_error(UnknownObjectException, 'Unable to locate object, using :name and "no_such_name"')
     end
   end
   
@@ -162,8 +180,8 @@ describe "Button" do
       @browser.button(:id, 'new_user_button').value.should == 'new_value_set_by_onclick_event'
     end
     it "should raise UnknownObjectException when clicking a button that doesn't exist" do
-      lambda { @browser.button(:value, "no_such_value").click }.should raise_error(UnknownObjectException)
-      lambda { @browser.button(:id, "no_such_id").click }.should raise_error(UnknownObjectException)
+      lambda { @browser.button(:value, "no_such_value").click }.should raise_error(UnknownObjectException, 'Unable to locate object, using :value and "no_such_value"')
+      lambda { @browser.button(:id, "no_such_id").click }.should raise_error(UnknownObjectException, 'Unable to locate object, using :id and "no_such_id"')
     end
     it "should raise ObjectDisabledException when clicking a disabled button" do
       lambda { @browser.button(:value, "Disabled").click }.should raise_error(ObjectDisabledException)

data/spec/buttons_spec.rb

@@ -1,6 +1,6 @@
 require File.dirname(__FILE__) + '/spec_helper.rb'
 
-describe "Buttons" do
+describe Buttons do
   
   before :all do
     @browser = IE.new

data/spec/checkbox_spec.rb

@@ -1,6 +1,6 @@
 require File.dirname(__FILE__) + '/spec_helper.rb'
 
-describe "Checkbox" do
+describe CheckBox do
   
   before :all do
     @browser = IE.new
@@ -22,7 +22,7 @@ describe "Checkbox" do
       @browser.checkbox(:name, /new_user_interests/).should exist
       @browser.checkbox(:value, "books").should exist
       @browser.checkbox(:value, /books/).should exist
-      # unsure what :text is supposed to represent here
+      # not sure what :text is supposed to represent here
       # @browser.checkbox(:text, "books").should exist
       # @browser.checkbox(:text, /books/).should exist
       @browser.checkbox(:class, "fun").should exist
@@ -30,7 +30,9 @@ describe "Checkbox" do
       @browser.checkbox(:index, 1).should exist
       @browser.checkbox(:xpath, "//input[@id='new_user_interests_books']").should exist
     end
-    
+    it "should return true if the element exists (default how = :name)" do
+      @browser.checkbox("new_user_interests").should exist
+    end
     it "should return true if the checkbox button exists (search by name and value)" do
       @browser.checkbox(:name, "new_user_interests", 'cars').should exist
       @browser.checkbox(:xpath, "//input[@name='new_user_interests' and @value='cars']").set
@@ -211,7 +213,7 @@ describe "Checkbox" do
       @browser.checkbox(:id, "toggle_button_checkbox").clear
       @browser.button(:id, "disabled_button").should be_disabled
     end
-
+    
     it "should raise UnknownObjectException if the checkbox button doesn't exist" do
       lambda { @browser.checkbox(:name, "no_such_name").set  }.should raise_error(UnknownObjectException)
       lambda { @browser.checkbox(:xpath, "//input[@name='no_such_name']").set  }.should raise_error(UnknownObjectException)

data/spec/checkboxes_spec.rb

@@ -1,6 +1,6 @@
 require File.dirname(__FILE__) + '/spec_helper.rb'
 
-describe "CheckBoxes" do
+describe CheckBoxes do
   before :all do
     @browser = IE.new
     add_spec_checker(@browser)    

data/spec/div_spec.rb

@@ -1,6 +1,7 @@
 require File.dirname(__FILE__) + '/spec_helper.rb'
 
-describe "Div" do
+describe Div do
+  
   before :all do
     @browser = IE.new
     add_spec_checker(@browser)    
@@ -25,6 +26,9 @@ describe "Div" do
       @browser.div(:index, 1).should exist
       @browser.div(:xpath, "//div[@id='header']").should exist
     end
+    it "should return true if the element exists (default how = :id)" do
+      @browser.div("header").should exist
+    end
     it "should return false if the element does not exist" do
       @browser.div(:id, "no_such_id").should_not exist
       @browser.div(:id, /no_such_id/).should_not exist
@@ -83,9 +87,21 @@ describe "Div" do
       @browser.div(:index, 1).name.should == ""
     end
     it "should raise UnknownObjectException if the element does not exist" do
-      lambda {@browser.div(:id, "div77").name }.should raise_error(UnknownObjectException)
-      lambda {@browser.div(:title, "div77").name }.should raise_error(UnknownObjectException)
-      lambda {@browser.div(:index, 44).name }.should raise_error(UnknownObjectException)
+      lambda {@browser.div(:id, "no_such_id").name }.should raise_error(UnknownObjectException)
+      lambda {@browser.div(:title, "no_such_title").name }.should raise_error(UnknownObjectException)
+      lambda {@browser.div(:index, 1337).name }.should raise_error(UnknownObjectException)
+    end
+  end
+  
+  describe "#style" do
+    it "should return the style attribute if the element exists" do
+      @browser.div(:id, 'best_language').style.should == "color: red; text-decoration: underline; cursor: pointer;"
+    end
+    it "should return an empty string if the element exists but the attribute doesn't" do
+      @browser.div(:id, 'promo').style.should == ""
+    end
+    it "should raise UnknownObjectException if the element does not exist" do
+      lambda {@browser.div(:id, "no_such_id").style }.should raise_error(UnknownObjectException)
     end
   end
   
@@ -156,21 +172,6 @@ describe "Div" do
     end
   end
   
-  # Divs can't be disabled
-  # describe "#disabled?" do
-  #   it "should raise UnknownObjectException if the element does not exist" do
-  #     lambda {@browser.div(:id , "div77").disabled? }.should raise_error(UnknownObjectException)
-  #     lambda {@browser.div(:title , "div77").disabled? }.should raise_error(UnknownObjectException)
-  #     lambda {@browser.div(:index , 44).disabled? }.should raise_error(UnknownObjectException)
-  #   end
-  #   
-  #   it "should return false if the element is enabled" do
-  #     @browser.div(:index , 2).should_not be_disabled
-  #   end
-  #   
-  #   it "should return true if the element is disabled" 
-  # end
-  
   after :all do
     @browser.close
   end

data/spec/divs_spec.rb

@@ -1,6 +1,6 @@
 require File.dirname(__FILE__) + '/spec_helper.rb'
 
-describe "Divs" do
+describe Divs do
   before :all do
     @browser = IE.new
     add_spec_checker(@browser)    
@@ -12,7 +12,7 @@ describe "Divs" do
   
   describe "#length" do
     it "should return the number of divs" do
-      @browser.divs.length.should == 7
+      @browser.divs.length.should == 8
     end
   end
   

data/spec/element_spec.rb

@@ -1,6 +1,6 @@
 require File.dirname(__FILE__) + '/spec_helper.rb'
 
-describe "Element" do
+describe Element do
 
   before :all do
     @browser = IE.new
@@ -16,7 +16,6 @@ describe "Element" do
       @browser.checkbox(:name => 'new_user_interests', :title => 'Dancing is fun!').value.should == 'dancing'
       @browser.text_field(:class_name => 'name', :index => 2).id.should == 'new_user_last_name'
     end
-    
     it "should raise UnknownObjectException with a sane error message when given a hash of :how => 'what' arguments" do
       conditions = {:index => 100, :name => "foo"}
       lambda { @browser.text_field(conditions).id }.should raise_error(UnknownObjectException, /Unable to locate object, using (\{:name=>"foo", :index=>100\}|\{:index=>100, :name=>"foo"\})/)
@@ -32,6 +31,18 @@ describe "Element" do
     end
   end
   
+  describe "#html" do
+    it "should return the normative (actual) html for the image element" do
+      @browser.goto(TEST_HOST + "/images.html")
+      @browser.image(:id, 'non_self_closing').html.chomp.should == '<img src="images/1.gif" alt="1" id="non_self_closing"></img>'
+      @browser.goto(TEST_HOST + "/non_control_elements.html")
+      @browser.div(:id, 'html_test').html.chomp.should ==
+'<div id="html_test" class=some_class title = "This is a title">
+    asdf
+</div>' #TODO: This expected value might be a little off, whitespace-wise
+    end
+  end
+  
   after :all do
     @browser.close
   end