celerity 0.0.1 → 0.0.2

data/lib/celerity/identifier.rb

@@ -0,0 +1,10 @@
+module Celerity
+
+  class Identifier < Struct.new(:tag, :attributes)
+    attr_accessor :text
+    
+    def initialize(t, a={})
+      super(t, a)
+    end
+  end
+end

data/lib/celerity/ie.rb

@@ -1,7 +1,7 @@
 module Celerity
   class IE
     include Container
-    attr_accessor :page, :object
+    attr_accessor :page, :object, :webclient
     
     def self.start(uri)
       browser = new
@@ -10,12 +10,14 @@ module Celerity
     end
     
     def initialize(opts = {})
+      @page_container  = self
+      @error_checkers  = []
+      @last_url, @page = nil
+
       browser = RUBY_PLATFORM =~ /java/ ? ::HtmlUnit::BrowserVersion::FIREFOX_2 : ::HtmlUnit::BrowserVersion.FIREFOX_2
       @webclient = ::HtmlUnit::WebClient.new(browser)
       @webclient.setThrowExceptionOnScriptError(false) unless $DEBUG || opts[:enable_javascript_exceptions]
       @webclient.setCssEnabled(false) if opts[:disable_css] 
-      @page_container = self
-      @error_checkers = []
     end
 
     def goto(uri)
@@ -29,7 +31,7 @@ module Celerity
     end
 
     def set_page(value)
-      # Log.debug(value.pretty_inspect)
+      @last_url = url() if exist?
       @page = value
       @object = @page.getDocumentElement
       run_error_checks
@@ -41,29 +43,35 @@ module Celerity
     end
     
     def base_url
+      # FIXME: base_url HTTPS
       "http://" + URI.parse( url() ).host
     end
 
     def title
-      @page.getTitleText
+      @page ? @page.getTitleText : ''
     end
 
     def html
-      @page ? @page.getDocumentElement.asXml : ''
+      @page ? @page.getWebResponse.getContentAsString : ''
     end
 
     def text
       # nicer way to do this?
-      assert_exists
-      @page.getFirstByXPath("//body").asText
+      @page ? @page.getFirstByXPath("//body").asText : ''
+    end
+    
+    def document
+      @object
     end
     
     def back
-      raise NotImplementedError
+      # FIXME: this is naive, need capability from HtmlUnit  
+      goto(@last_url) if @last_url
     end
     
     def refresh
-      raise NotImplementedError
+      assert_exists
+      set_page(@page.refresh)
     end
 
     def exist?
@@ -78,7 +86,7 @@ module Celerity
     end
     
     def contains_text(expected_text)
-      return "" unless exist?
+      return nil unless exist?
       case expected_text
       when Regexp
         text().match(expected_text)
@@ -89,6 +97,11 @@ module Celerity
       end
     end
     
+    def execute_script(source)
+      assert_exists
+      @page.executeJavaScript(source.to_s)
+    end
+    
     def run_error_checks
       @error_checkers.each { |e| e.call(self) }
     end
@@ -99,14 +112,14 @@ module Celerity
       elsif Proc === checker
         @error_checkers << checker
       else
-        raise ArgumentError, "argument must be a Proc or a block"
+        raise ArgumentError, "argument must be a Proc or block"
       end
     end
     
     def disable_checker(checker)
       @error_checkers.delete(checker)
     end
-        
+    
     # these are just for Watir compatability - should we keep them?
     class << self
       attr_accessor :speed, :attach_timeout, :visible
@@ -124,3 +137,5 @@ module Celerity
     
   end # IE
 end # Celerity
+
+Celerity::Browser = Celerity::IE

data/lib/celerity/input_element.rb

@@ -7,10 +7,6 @@ module Celerity
                                     :src, :alt, :usemap, :ismap, :tabindex, :accesskey, :onfocus, :onblur, 
                                     :onselect, :onchange, :accept, :align]    
     
-    def locate
-      @object = @container.locate_input_element(self, @how, @what)
-    end
-
     def readonly?
       assert_exists
       @object.isAttributeDefined('readonly')

data/lib/celerity/non_control_elements.rb

@@ -13,38 +13,38 @@ module Celerity
       assert_exists
       @container.update_page(@object.click)
     end
-
-    # # These elements can't be disabled 
-    # def disabled?; false; end
-    # alias_method :disabled, :disabled?
   end
     
   class Pre < NonControlElement
-    TAGS = ['pre']
+    TAGS = [ Identifier.new('pre')] 
   end
   
   class P < NonControlElement
-    TAGS = ['p']
+    TAGS = [ Identifier.new('p') ]
   end
   
   class Div < NonControlElement
-    TAGS = ['div']   
+    TAGS = [ Identifier.new('div')] 
   end
   
   class Span < NonControlElement
-    TAGS = ['span']  
+    TAGS = [ Identifier.new('span') ]
   end
 
   class Li < NonControlElement
-    TAGS = ['li']    
+    TAGS = [ Identifier.new('li') ]
   end
     
   class Map < NonControlElement
-    TAGS = ['map']
+    # double-check my DTD reading here! :) 
+    ATTRIBUTES = BASE_ATTRIBUTES | [:id, :class, :style, :title, :name]
+    TAGS = [ Identifier.new('map') ]
   end
 
   class Area < NonControlElement
-    TAGS = ['area']
+    # double-check my DTD reading here! :) 
+    ATTRIBUTES = BASE_ATTRIBUTES | [:shape, :coords, :href, :nohref, :alt]
+    TAGS = [ Identifier.new('area') ]
   end
   
-end
+end

data/lib/celerity/version.rb

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

data/spec/area_spec.rb

@@ -1,79 +1,79 @@
 require File.dirname(__FILE__) + '/spec_helper.rb'
 
-describe "P" do
+describe "Area" do
   
   before :all do
-    @ie = IE.new
-    add_spec_checker(@ie)    
+    @browser = IE.new
+    add_spec_checker(@browser)    
   end
 
   before :each do
-    @ie.goto(TEST_HOST + "/images.html")
+    @browser.goto(TEST_HOST + "/images.html")
   end
 
   # Exists method
   describe "#exist?" do
-    it "should return true if the 'area' exists" do
-      @ie.area(:id, "NCE").should exist
-      @ie.area(:id, /NCE/).should exist
-      @ie.area(:name, "NCE").should exist
-      @ie.area(:name, /NCE/).should exist
-      @ie.area(:title, "Tables").should exist
-      @ie.area(:title, /Tables/).should exist
-      @ie.area(:url, "tables.html").should exist
-      @ie.area(:url, /tables/).should exist
-      @ie.area(:index, 1).should exist
-      @ie.area(:xpath, "//area[@id='NCE']").should exist
+    it "should return true if the area exists" do
+      @browser.area(:id, "NCE").should exist
+      @browser.area(:id, /NCE/).should exist
+      @browser.area(:name, "NCE").should exist
+      @browser.area(:name, /NCE/).should exist
+      @browser.area(:title, "Tables").should exist
+      @browser.area(:title, /Tables/).should exist
+      @browser.area(:url, "tables.html").should exist
+      @browser.area(:url, /tables/).should exist
+      @browser.area(:index, 1).should exist
+      @browser.area(:xpath, "//area[@id='NCE']").should exist
     end
-    it "should return false if the 'area' doesn't exist" do
-      @ie.area(:id, "no_such_id").should_not exist
-      @ie.area(:id, /no_such_id/).should_not exist
-      @ie.area(:name, "no_such_id").should_not exist
-      @ie.area(:name, /no_such_id/).should_not exist
-      @ie.area(:title, "no_such_title").should_not exist
-      @ie.area(:title, /no_such_title/).should_not exist
-      @ie.area(:url, "no_such_href").should_not exist
-      @ie.area(:url, /no_such_href/).should_not exist
-      @ie.area(:index, 1337).should_not exist
-      @ie.area(:xpath, "//area[@id='no_such_id']").should_not exist
+    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
+      @browser.area(:name, "no_such_id").should_not exist
+      @browser.area(:name, /no_such_id/).should_not exist
+      @browser.area(:title, "no_such_title").should_not exist
+      @browser.area(:title, /no_such_title/).should_not exist
+      @browser.area(:url, "no_such_href").should_not exist
+      @browser.area(:url, /no_such_href/).should_not exist
+      @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 { @ie.area(:id, 3.14).exists? }.should raise_error(ArgumentError)
+    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 { @ie.area(:no_such_how, 'some_value').exists? }.should raise_error(MissingWayOfFindingObjectException)
+    it "should raise MissingWayOfFindingObjectException when 'how' argument is invalid" do
+      lambda { @browser.area(:no_such_how, 'some_value').exists? }.should raise_error(MissingWayOfFindingObjectException)
     end
   end
   
   # Attribute methods
   describe "#id" do
     it "should return the id attribute" do
-      @ie.area(:index, 1).id.should == "NCE"
+      @browser.area(:index, 1).id.should == "NCE"
     end
     it "should return an empty string if the element exists and the attribute doesn't" do
-      @ie.area(:index, 3).id.should == ''
+      @browser.area(:index, 3).id.should == ''
     end
-    it "should raise UnknownObjectException if the p doesn't exist" do
-      lambda { @ie.area(:id, "no_such_id").id }.should raise_error(UnknownObjectException)
-      lambda { @ie.area(:index, 1337).id }.should raise_error(UnknownObjectException)
+    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
-      @ie.area(:index, 1).name.should == "NCE"
+      @browser.area(:index, 1).name.should == "NCE"
     end
     it "should return an empty string if the element exists and the attribute doesn't" do
-      @ie.area(:index, 3).name.should == ''
+      @browser.area(:index, 3).name.should == ''
     end
-    it "should raise UnknownObjectException if the p doesn't exist" do
-      lambda { @ie.area(:id, "no_such_id").name }.should raise_error(UnknownObjectException)
-      lambda { @ie.area(:index, 1337).name }.should raise_error(UnknownObjectException)
+    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
 
   after :all do
-    @ie.close
+    @browser.close
   end
 
 end

data/spec/areas_spec.rb

@@ -3,38 +3,38 @@ require File.dirname(__FILE__) + '/spec_helper.rb'
 describe "Areas" do
   
   before :all do
-    @ie = IE.new
-    add_spec_checker(@ie)    
+    @browser = IE.new
+    add_spec_checker(@browser)    
   end
 
   before :each do
-    @ie.goto(TEST_HOST + "/images.html")
+    @browser.goto(TEST_HOST + "/images.html")
   end
 
   describe "#length" do
     it "should return the number of areas" do
-      @ie.areas.length.should == 3
+      @browser.areas.length.should == 3
     end
   end
   
   describe "#[]" do
-    it "should return the p at the given index" do
-      @ie.areas[1].id.should == "NCE"
+    it "should return the area at the given index" do
+      @browser.areas[1].id.should == "NCE"
     end
   end
 
   describe "#each" do
     it "should iterate through areas correctly" do
-      @ie.areas.each_with_index do |a, index|
-        a.name.should == @ie.area(:index, index+1).name
-        a.id.should == @ie.area(:index, index+1).id
-        a.value.should == @ie.area(:index, index+1).value
+      @browser.areas.each_with_index do |a, index|
+        a.name.should == @browser.area(:index, index+1).name
+        a.id.should == @browser.area(:index, index+1).id
+        a.value.should == @browser.area(:index, index+1).value
       end
     end
   end
   
   after :all do
-    @ie.close
+    @browser.close
   end
 
 end

data/spec/button_spec.rb

@@ -3,169 +3,174 @@ require File.dirname(__FILE__) + '/spec_helper.rb'
 describe "Button" do
 
   before :all do
-    @ie = IE.new
-    add_spec_checker(@ie)
+    @browser = IE.new
+    add_spec_checker(@browser)
   end
 
   before :each do
-    @ie.goto(TEST_HOST + "/forms_with_input_elements.html")
+    @browser.goto(TEST_HOST + "/forms_with_input_elements.html")
   end
   
   # Exists method
   describe "#exists?" do
     it "should return true if the button exists" do
-      @ie.button(:id, "new_user_submit").should exist
-      @ie.button(:id, /new_user_submit/).should exist
-      @ie.button(:name, "new_user_reset").should exist
-      @ie.button(:name, /new_user_reset/).should exist
+      @browser.button(:id, "new_user_submit").should exist
+      @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
-      @ie.button(:value, "Button 2").should exist
-      @ie.button(:value, /Button 2/).should exist
-      @ie.button(:text, "Button 2").should exist
-      @ie.button(:text, /Button 2/).should exist
-      @ie.button(:class, "image").should exist
-      @ie.button(:class, /image/).should exist
-      @ie.button(:index, 1).should exist
-      @ie.button(:xpath, "//input[@id='new_user_submit']").should exist
-    end
+      # 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(:text, "Button 2").should exist
+      @browser.button(:text, /Button 2/).should exist
+      @browser.button(:class, "image").should exist
+      @browser.button(:class, /image/).should exist
+      @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
-      @ie.button(:caption, "Button 2").should exist
-      @ie.button(:caption, /Button 2/).should exist
+      @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
-      @ie.button("Submit").should exist
+      @browser.button("Submit").should exist
     end
+    
     it "should return false if the button doesn't exist" do
-      @ie.button(:id, "no_such_id").should_not exist
-      @ie.button(:id, /no_such_id/).should_not exist
-      @ie.button(:name, "no_such_name").should_not exist
-      @ie.button(:name, /no_such_name/).should_not exist
+      @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
-      @ie.button(:value, "no_such_value").should_not exist
-      @ie.button(:value, /no_such_value/).should_not exist
-      @ie.button(:text, "no_such_text").should_not exist
-      @ie.button(:text, /no_such_text/).should_not exist
-      @ie.button(:class, "no_such_class").should_not exist
-      @ie.button(:class, /no_such_class/).should_not exist
-      @ie.button(:index, 1337).should_not exist
-      @ie.button(:xpath, "//input[@id='no_such_id']").should_not exist
+      @browser.button(:value, "no_such_value").should_not exist
+      @browser.button(:value, /no_such_value/).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
+      @browser.button(:class, /no_such_class/).should_not exist
+      @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 { @ie.button(:id, 3.14).exists? }.should raise_error(ArgumentError)
+    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 { @ie.button(:no_such_how, 'some_value').exists? }.should raise_error(MissingWayOfFindingObjectException)
+    it "should raise MissingWayOfFindingObjectException when 'how' argument is invalid" do
+      lambda { @browser.button(:no_such_how, 'some_value').exists? }.should raise_error(MissingWayOfFindingObjectException)
     end
   end
   
   # Attribute methods
   describe "#class_name" do
     it "should return the class name of the button" do
-      @ie.button(:name, "new_user_image").class_name.should == "image"
+      @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
-      @ie.button(:name, "new_user_submit").class_name.should == ""
+      @browser.button(:name, "new_user_submit").class_name.should == ""
     end
   end
   
   describe "#id" do
     it "should return the id if the button exists" do
-      @ie.button(:index, 1).id.should == 'new_user_submit'
-      @ie.button(:index, 2).id.should == 'new_user_reset'
-      @ie.button(:index, 3).id.should == 'new_user_button'
+      @browser.button(:index, 1).id.should == 'new_user_submit'
+      @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 { @ie.button(:index, 1337).id }.should raise_error(UnknownObjectException)
+      lambda { @browser.button(:index, 1337).id }.should raise_error(UnknownObjectException)
     end
   end
 
   describe "#name" do
     it "should return the name if button exists" do
-      @ie.button(:index, 1).name.should == 'new_user_submit'
-      @ie.button(:index, 2).name.should == 'new_user_reset'
-      @ie.button(:index, 3).name.should == 'new_user_button'
+      @browser.button(:index, 1).name.should == 'new_user_submit'
+      @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 { @ie.button(:name, "no_such_name").name }.should raise_error(UnknownObjectException)
+      lambda { @browser.button(:name, "no_such_name").name }.should raise_error(UnknownObjectException)
     end
   end
   
   describe "#title" do
     it "should return the title of the button" do
-      @ie.button(:index, 1).title.should == 'Submit the form'
+      @browser.button(:index, 1).title.should == 'Submit the form'
     end
     it "should return an empty string for button without title" do
-      @ie.button(:index, 2).title.should == ''
+      @browser.button(:index, 2).title.should == ''
     end
   end
 
   describe "#type" do
     it "should return the type if button exists" do
-      @ie.button(:index, 1).type.should == 'submit'
-      @ie.button(:index, 2).type.should == 'reset'
-      @ie.button(:index, 3).type.should == 'button'
+      @browser.button(:index, 1).type.should == 'submit'
+      @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 { @ie.button(:name, "no_such_name").type }.should raise_error(UnknownObjectException)
+      lambda { @browser.button(:name, "no_such_name").type }.should raise_error(UnknownObjectException)
     end
   end
 
   describe "#value" do
     it "should return the value if button exists" do
-      @ie.button(:index, 1).value.should == 'Submit'
-      @ie.button(:index, 2).value.should == 'Reset'
-      @ie.button(:index, 3).value.should == 'Button'
+      @browser.button(:index, 1).value.should == 'Submit'
+      @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 { @ie.button(:name, "no_such_name").value }.should raise_error(UnknownObjectException)
+      lambda { @browser.button(:name, "no_such_name").value }.should raise_error(UnknownObjectException)
     end
   end
 
   # Access methods
   describe "#enabled?" do
     it "should return true if the button is enabled" do
-      @ie.button(:name, 'new_user_submit').should be_enabled
+      @browser.button(:name, 'new_user_submit').should be_enabled
     end
     it "should return false if the button is disabled" do
-      @ie.button(:name, 'new_user_submit_disabled').should_not be_enabled
+      @browser.button(:name, 'new_user_submit_disabled').should_not be_enabled
     end
     it "should raise UnknownObjectException if the button doesn't exist" do
-      lambda { @ie.button(:name, "no_such_name").enabled? }.should raise_error(UnknownObjectException)
+      lambda { @browser.button(:name, "no_such_name").enabled? }.should raise_error(UnknownObjectException)
     end
   end
 
   describe "#disabled?" do
     it "should return false when button is enabled" do
-      @ie.button(:name, 'new_user_submit').should_not be_disabled
+      @browser.button(:name, 'new_user_submit').should_not be_disabled
     end
     it "should return true when button is disabled" do
-      @ie.button(:name, 'new_user_submit_disabled').should be_disabled
+      @browser.button(:name, 'new_user_submit_disabled').should be_disabled
     end
     it "should raise UnknownObjectException if button does not exist" do
-      lambda { @ie.button(:name, "no_such_name").disabled? }.should raise_error(UnknownObjectException)
+      lambda { @browser.button(:name, "no_such_name").disabled? }.should raise_error(UnknownObjectException)
     end
   end
   
   # Manipulation methods
   describe "#click" do
     it "should click the button if it exists" do
-      pending
+      @browser.button(:id, 'new_user_submit').click
+      @browser.text.should include("You posted the following content:")
     end
     it "should fire events" do
-      @ie.button(:id, 'new_user_button').click
-      @ie.button(:id, 'new_user_button').value.should == 'new_value_set_by_onclick_event'
+      @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 { @ie.button(:value, "no_such_value").click }.should raise_error(UnknownObjectException)
-      lambda { @ie.button(:id, "no_such_id").click }.should raise_error(UnknownObjectException)
+      lambda { @browser.button(:value, "no_such_value").click }.should raise_error(UnknownObjectException)
+      lambda { @browser.button(:id, "no_such_id").click }.should raise_error(UnknownObjectException)
     end
     it "should raise ObjectDisabledException when clicking a disabled button" do
-      lambda { @ie.button(:value, "Disabled").click }.should raise_error(ObjectDisabledException)
+      lambda { @browser.button(:value, "Disabled").click }.should raise_error(ObjectDisabledException)
     end
   end
 
   after :all do
-    @ie.close
+    @browser.close
   end
 end