celerity 0.0.3 → 0.0.4

data/lib/celerity/input_element.rb

@@ -17,7 +17,7 @@ module Celerity
     def assert_not_readonly
       if readonly?
         raise ObjectReadOnlyException,
-          "Textfield #{@how.inspect} and #{@what.inspect} is read only."
+          "InputElement #{identifier_string()} is read only."
       end
     end
 

data/lib/celerity/version.rb

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

data/lib/celerity/watir_compatibility.rb

@@ -1,62 +1,76 @@
 module Celerity
-  class IE
-    # these are just for Watir compatability - should we keep them?
+  class Browser
     class << self
+      # added for Watir compatability - not in use by Celerity
       attr_accessor :speed, :attach_timeout, :visible
+      # added for Watir compatability - not in use by Celerity
       alias_method :start_window, :start
+      # added for Watir compatability - not in use by Celerity
       def reset_attach_timeout; @attach_timeout = 2.0; end
+      # added for Watir compatability - not in use by Celerity
       def each; end
+      # added for Watir compatability - not in use by Celerity
       def quit; end
+      # added for Watir compatability - not in use by Celerity
       def set_fast_speed; @speed = :fast; end
+      # added for Watir compatability - not in use by Celerity
       def set_slow_speed; @speed = :slow; end  
     end
 
+    # added for Watir compatability - not in use by Celerity
     attr_accessor :visible
    
+    # added for Watir compatability - not in use by Celerity
     def bring_to_front; true; end
-    def speed=(s); end
+    # added for Watir compatability - not in use by Celerity
+    def speed=(s); s end
+    # added for Watir compatability - not in use by Celerity
     def wait; end
   end
   
   
   module ClickableElement
-    alias_method :click_no_wait, :click
+    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
+    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
+    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
+     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?
+    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
+    alias_method :getAllContents,   :get_all_contents
+    alias_method :clearSelection,   :clear_selection
+    alias_method :select_value,     :select
+    alias_method :includes?,        :include?
   end
   
   class TextField
-    alias_method :dragContentsTo, :drag_contents_to
-    alias_method :getContents, :get_contents
+    alias_method :dragContentsTo,   :drag_contents_to
+    alias_method :getContents,      :value
+    alias_method :get_contents,     :value
   end
-end
+end
+
+Celerity::IE = Celerity::Browser

data/spec/area_spec.rb

@@ -1,10 +1,9 @@
 require File.dirname(__FILE__) + '/spec_helper.rb'
 
-describe Area do
+describe "Area" do
   
   before :all do
-    @browser = IE.new
-    add_spec_checker(@browser)    
+    @browser = Browser.new
   end
 
   before :each do
@@ -25,9 +24,11 @@ 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
@@ -40,9 +41,11 @@ describe Area do
       @browser.area(:index, 1337).should_not exist
       @browser.area(:xpath, "//area[@id='no_such_id']").should_not exist
     end
+
     it "should raise ArgumentError when 'what' argument is invalid" do
       lambda { @browser.area(:id, 3.14).exists? }.should raise_error(ArgumentError)
     end
+
     it "should raise MissingWayOfFindingObjectException when 'how' argument is invalid" do
       lambda { @browser.area(:no_such_how, 'some_value').exists? }.should raise_error(MissingWayOfFindingObjectException)
     end
@@ -53,28 +56,40 @@ describe Area do
     it "should return the id attribute" do
       @browser.area(:index, 1).id.should == "NCE"
     end
+
     it "should return an empty string if the element exists and the attribute doesn't" do
       @browser.area(:index, 3).id.should == ''
     end
+
     it "should raise UnknownObjectException if the area doesn't exist" do
       lambda { @browser.area(:id, "no_such_id").id }.should raise_error(UnknownObjectException)
       lambda { @browser.area(:index, 1337).id }.should raise_error(UnknownObjectException)
     end
+    
   end
   
   describe "#name" do
     it "should return the name attribute" do
       @browser.area(:index, 1).name.should == "NCE"
     end
+
     it "should return an empty string if the element exists and the attribute doesn't" do
       @browser.area(:index, 3).name.should == ''
     end
+
     it "should raise UnknownObjectException if the area doesn't exist" do
       lambda { @browser.area(:id, "no_such_id").name }.should raise_error(UnknownObjectException)
       lambda { @browser.area(:index, 1337).name }.should raise_error(UnknownObjectException)
     end
   end
-
+  
+  describe "#respond_to?" do
+    it "should return true for all attribute methods" do
+      @browser.area(:index, 1).should respond_to(:id)
+      @browser.area(:index, 1).should respond_to(:name)
+    end
+  end
+  
   after :all do
     @browser.close
   end

data/spec/areas_spec.rb

@@ -1,10 +1,9 @@
 require File.dirname(__FILE__) + '/spec_helper.rb'
 
-describe Areas do
+describe "Areas" do
   
   before :all do
-    @browser = IE.new
-    add_spec_checker(@browser)    
+    @browser = Browser.new
   end
 
   before :each do

data/spec/{ie_spec.rb → browser_spec.rb}

@@ -1,10 +1,9 @@
 require File.dirname(__FILE__) + '/spec_helper.rb'
 
-describe IE do
+describe "Browser" do
   
   before :all do
-    @browser = IE.new
-    add_spec_checker(@browser)
+    @browser = Browser.new
   end
   
   # Exists
@@ -14,6 +13,7 @@ describe IE do
       @browser.goto(TEST_HOST + "/non_control_elements.html")
       @browser.should exist
     end
+
     it "should return false after IE#close" do
       @browser.close
       @browser.should_not exist
@@ -39,18 +39,54 @@ describe IE do
       @browser.goto(TEST_HOST + "/non_control_elements.html")
       @browser.text.should include("Dubito, ergo cogito, ergo sum.")
     end
+
     it "should return the text also if the content-type is text/plain" do
       # more specs for text/plain? what happens if we call other methods?
       @browser.goto(TEST_HOST + "/plain_text")
       @browser.text.strip.should == 'This is text/plain'
     end
-    it "should return text in the correct charset (utf-8)" do
-      @browser.goto(TEST_HOST + "/utf8_text.html")
-      @browser.text.strip.should == "\303\246\303\245\303\270"
-    end
-    it "should return text in the correct charset (latin-1)" do
-      @browser.goto(TEST_HOST + "/latin1_text.html")
-      @browser.text.strip.should == "\370\345\346"
+
+    it "should return a text representation including newlines" do
+      @browser.goto(TEST_HOST + "/forms_with_input_elements.html")
+      @browser.text.should == <<-TEXT
+Forms with input elementsUser administration
+
+Add user
+
+Personal informationFirst name  
+
+Last name  
+
+Email address  
+
+Country  Denmark Norway Sweden United Kingdom USA 
+
+Occupation  
+
+Species  
+
+Personal code  
+
+Languages  Danish English Norwegian Swedish 
+
+Portrait  
+
+Dental records   Login informationUsername (max 20 characters)  0
+
+Password  
+
+Role  Administrator Moderator Regular user  Interests Books  Bowling  Cars  Dancing  Dentistry   Food  Preferences
+
+Do you want to recieve our newslettter?
+
+ Yes  No  Certainly  Absolutely  Nah  Actions  Button 2     
+
+Delete user
+
+Username  Username 1 Username 2 Username 3 
+
+Comment Default comment.      
+TEXT
     end
   end
 
@@ -73,8 +109,8 @@ describe IE do
   end
   
   # Show methods
-  describe "#method_missing" do
-    it "should return all div elements on the page in a human readable format" do
+  describe "#show_«collection»" do
+    it "should print a human readable representation of elements matching the given name" do
       @browser.goto(TEST_HOST + "/non_control_elements.html")
       temp_stdout = StringIO.new
       old_stdout = $stdout
@@ -96,6 +132,7 @@ describe IE do
 8: id="footer" title="Closing remarks" class="profile" 
 '
     end
+
     it "should raise NoMethodError if the collection does not exist" do
       @browser.goto(TEST_HOST + "/non_control_elements.html")
       lambda { @browser.show_no_such_collection }.should raise_error(NoMethodError)
@@ -105,8 +142,8 @@ describe IE do
   # Manipulation methods
   describe ".start" do
     it "should go to the given URL and return an instance of itself" do
-      @browser = Celerity::IE.start(TEST_HOST + "/non_control_elements.html")
-      @browser.should be_instance_of(Celerity::IE)
+      @browser = Browser.start(TEST_HOST + "/non_control_elements.html")
+      @browser.should be_instance_of(Browser)
       @browser.title.should == "Non-control elements"
     end
   end
@@ -116,6 +153,14 @@ describe IE do
     # it "should handle HTTPS" do
     #   pending
     # end
+    
+    it "should add http:// to URLs with no protocol specified" do
+      url = TEST_HOST[%r{http://(.*)}, 1]
+      url.should_not be_nil
+      @browser.goto(url)
+      @browser.url.should == "http://#{url}"
+    end
+
     it "should go to the given url without raising errors" do
       lambda { @browser.goto(TEST_HOST + "/non_control_elements.html") }.should_not raise_error
     end
@@ -157,21 +202,25 @@ describe IE do
     before :each do
       @browser.goto(TEST_HOST + "/non_control_elements.html")
     end
+
     it "should raise ArgumentError when called with no or wrong arguments" do
       lambda { @browser.contains_text }.should raise_error(ArgumentError)
       lambda { @browser.contains_text(nil) }.should raise_error(ArgumentError)
       lambda { @browser.contains_text(42) }.should raise_error(ArgumentError)
     end
+
     it "should return the index if the given text exists" do
         @browser.contains_text('Dubito, ergo cogito, ergo sum.').should be_instance_of(Fixnum)
         @browser.contains_text(/Dubito.*sum./).should_not be_nil
     end
+
     it "should return nil if the text doesn't exist" do
       @browser.contains_text('no_such_text').should be_nil
       @browser.contains_text(/no_such_text/).should be_nil
     end
+
     it "should not raise error on a blank page" do
-      @browser = IE.new
+      @browser = Browser.new
       lambda { @browser.contains_text('') }.should_not raise_error
     end
   end
@@ -180,6 +229,7 @@ describe IE do
     it "should raise ArgumentError when not given any arguments" do
       lambda { @browser.add_checker }.should raise_error(ArgumentError)
     end
+
     it "should run the given proc on each page load" do
       output = ''
       proc = Proc.new { |ie| output << ie.text }
@@ -187,6 +237,7 @@ describe IE do
       @browser.goto(TEST_HOST + "/non_control_elements.html")
       output.should include('Dubito, ergo cogito, ergo sum')
     end
+
     it "should run the given block on each page load" do
       output = ''
       @browser.add_checker { |ie| output << ie.text }

data/spec/button_spec.rb

@@ -1,10 +1,9 @@
 require File.dirname(__FILE__) + '/spec_helper.rb'
 
-describe Button do
+describe "Button" do
 
   before :all do
-    @browser = IE.new
-    add_spec_checker(@browser)
+    @browser = Browser.new
   end
 
   before :each do
@@ -29,13 +28,16 @@ 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
       @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
@@ -52,9 +54,11 @@ describe Button do
       @browser.button(:index, 1337).should_not exist
       @browser.button(:xpath, "//input[@id='no_such_id']").should_not exist
     end
+
     it "should raise ArgumentError when 'what' argument is invalid" do
       lambda { @browser.button(:id, 3.14).exists? }.should raise_error(ArgumentError)
     end
+
     it "should raise MissingWayOfFindingObjectException when 'how' argument is invalid" do
       lambda { @browser.button(:no_such_how, 'some_value').exists? }.should raise_error(MissingWayOfFindingObjectException)
     end
@@ -65,6 +69,7 @@ describe Button do
     it "should return the class name of the button" do
       @browser.button(:name, "new_user_image").class_name.should == "image"
     end
+
     it "should return an empty string if the button has no class name" do
       @browser.button(:name, "new_user_submit").class_name.should == ""
     end
@@ -76,6 +81,7 @@ describe Button do
       @browser.button(:index, 2).id.should == 'new_user_reset'
       @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, 'Unable to locate object, using :index and 1337')
     end
@@ -87,6 +93,7 @@ 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 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
@@ -96,6 +103,7 @@ describe Button 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
@@ -105,9 +113,11 @@ describe Button 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
@@ -117,6 +127,7 @@ describe Button do
     it "should return the title of the button" do
       @browser.button(:index, 1).title.should == 'Submit the form'
     end
+
     it "should return an empty string for button without title" do
       @browser.button(:index, 2).title.should == ''
     end
@@ -128,6 +139,7 @@ describe Button do
       @browser.button(:index, 2).type.should == 'reset'
       @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, 'Unable to locate object, using :name and "no_such_name"')
     end
@@ -139,19 +151,35 @@ describe Button do
       @browser.button(:index, 2).value.should == 'Reset'
       @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, 'Unable to locate object, using :name and "no_such_name"')
     end
   end
+  
+  describe "#respond_to?" do
+    it "should return true for all attribute methods" do
+      @browser.button(:index, 1).should respond_to(:class_name)
+      @browser.button(:index, 1).should respond_to(:id)
+      @browser.button(:index, 1).should respond_to(:name)
+      @browser.button(:index, 1).should respond_to(:src)
+      @browser.button(:index, 1).should respond_to(:style)
+      @browser.button(:index, 1).should respond_to(:title)
+      @browser.button(:index, 1).should respond_to(:type)
+      @browser.button(:index, 1).should respond_to(:value)
+    end
+  end
 
   # Access methods
   describe "#enabled?" do
     it "should return true if the button is enabled" do
       @browser.button(:name, 'new_user_submit').should be_enabled
     end
+
     it "should return false if the button is disabled" 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, 'Unable to locate object, using :name and "no_such_name"')
     end
@@ -161,9 +189,11 @@ describe Button do
     it "should return false when button is enabled" do
       @browser.button(:name, 'new_user_submit').should_not be_disabled
     end
+
     it "should return true when button is disabled" 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, 'Unable to locate object, using :name and "no_such_name"')
     end
@@ -175,14 +205,17 @@ describe Button do
       @browser.button(:id, 'new_user_submit').click
       @browser.text.should include("You posted the following content:")
     end
+
     it "should fire events" do
       @browser.button(:id, 'new_user_button').click
       @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, '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)
     end