jarib-celerity 0.0.6.5 → 0.0.6.6

data/lib/celerity/browser.rb

@@ -700,7 +700,7 @@ module Celerity
       when :firefox, :ff
         browser_version = ::HtmlUnit::BrowserVersion::FIREFOX_2
       when :internet_explorer, :ie
-        browser_version = ::HtmlUnit::BrowserVersion::INTERNET_EXPLORER_7_0
+        browser_version = ::HtmlUnit::BrowserVersion::INTERNET_EXPLORER_7
       else
         raise ArgumentError, "unknown browser: #{browser.inspect}"
       end

data/lib/celerity/element.rb

@@ -127,7 +127,7 @@ module Celerity
 
     def visible?
       assert_exists
-      @object.isVisible
+      @object.isDisplayed
     end
 
     #
@@ -204,7 +204,7 @@ module Celerity
 
       result = ''
       @object.getAttributes.each do |attribute|
-        result << %Q{#{attribute.getName}="#{attribute.getHtmlValue}"}
+        result << %Q{#{attribute.getName}="#{attribute.getValue}"}
       end
 
       result
@@ -234,7 +234,7 @@ module Celerity
       meth = selector_to_attribute(meth)
 
       if self.class::ATTRIBUTES.include?(meth)
-        return @object.getAttributeValue(meth.to_s)
+        return @object.getAttribute(meth.to_s)
       end
 
       Log.warn "Element\#method_missing calling super with #{meth.inspect}"
@@ -263,7 +263,7 @@ module Celerity
       end
 
       element.getAttributes.each do |attribute|
-        ret << "  #{attribute.getName}:".ljust(TO_S_SIZE+2) + attribute.getHtmlValue.to_s
+        ret << "  #{attribute.getName}:".ljust(TO_S_SIZE+2) + attribute.getValue.to_s
       end
 
       unless (text = element.asText).empty?

data/lib/celerity/element_locator.rb

@@ -82,7 +82,7 @@ module Celerity
       when Regexp
         elements_by_tag_names.find { |elem| elem.getId =~ what }
       when String
-        obj = @object.getHtmlElementById(what)
+        obj = @object.getElementById(what)
         return obj if @tags.include?(obj.getTagName)
 
         $stderr.puts "warning: multiple elements with identical id? (#{what.inspect})" if $VERBOSE
@@ -129,7 +129,7 @@ module Celerity
       return false unless ident.tag == element.getTagName
 
       attr_result = ident.attributes.all? do |key, values|
-        values.any? { |val| matches?(element.getAttributeValue(key.to_s), val) }
+        values.any? { |val| matches?(element.getAttribute(key.to_s), val) }
       end
 
       if ident.text

data/lib/celerity/elements/frame.rb

@@ -64,7 +64,7 @@ module Celerity
       meth = selector_to_attribute(meth)
       if self.class::ATTRIBUTES.include?(meth)
         assert_exists
-        @inline_frame_object.getAttributeValue(meth.to_s)
+        @inline_frame_object.getAttribute(meth.to_s)
       else
         Log.warn "Element\#method_missing calling super with #{meth.inspect}"
         super

data/lib/celerity/elements/image.rb

@@ -19,13 +19,13 @@ module Celerity
     end
 
     #
-    # returns the filesize of the image
+    # returns the file size of the image in bytes
     #
 
     def file_size
       assert_exists
       web_response = @object.getWebResponse(true)
-      web_response.getResponseBody.length
+      web_response.getContentAsBytes.length
     end
 
     #

data/lib/celerity/elements/link.rb

@@ -16,7 +16,7 @@ module Celerity
 
     def absolute_url
       assert_exists
-      href = @object.getAttributeValue('href')
+      href = @object.getAttribute('href')
 
       unless href.empty? || URI.parse(href).absolute?
         href = URI.join(browser.url, href).to_s

data/lib/celerity/elements/select_list.rb

@@ -9,7 +9,9 @@ module Celerity
     
     def options
       assert_exists
-      @object.getOptions.map { |e| e.asText }
+      @object.getOptions.map do |e|
+        e.asText.empty? ? e.getAttribute("label") : e.asText
+      end
     end
     
     #
@@ -18,7 +20,7 @@ module Celerity
     
     def selected_options
       assert_exists
-      @object.getSelectedOptions.map { |e| e.asText }
+      @object.getSelectedOptions.map { |e| e.asText.empty? ? e.getAttribute('label') : e.asText }
     end
     
     #
@@ -46,7 +48,11 @@ module Celerity
       raise NoValueFoundException, "unknown option with value #{value.inspect} for select_list #{@conditions.inspect}" unless include?(value)
       
       selected = nil
-      @object.getOptions.select { |e| matches?(e.asText, value) }.each do |option|
+      matching = @object.getOptions.select do |e|
+        matches?(e.asText, value) || matches?(e.getAttribute('label'), value)
+      end
+      
+      matching.each do |option|
         selected ||= option.asText
         @container.update_page option.click
       end
@@ -64,7 +70,7 @@ module Celerity
     
     def include?(value)
       assert_exists
-      !!@object.getOptions.find { |e| matches?(e.asText, value) }
+      !!@object.getOptions.find { |e| matches?(e.asText, value) || matches?(e.getAttribute('label'), value) }
     end
 
     #
@@ -91,7 +97,7 @@ module Celerity
     
     def type
       assert_exists
-      'select-' + (@object.isAttributeDefined('multiple') ? 'multiple' : 'one')
+      'select-' + (@object.hasAttribute('multiple') ? 'multiple' : 'one')
     end
 
     #
@@ -107,6 +113,8 @@ module Celerity
         optn.getValueAttribute
       end
     end
-
+    
+    private
+    
   end # SelectList
 end # Celerity

data/lib/celerity/elements/table_cell.rb

@@ -15,7 +15,7 @@ module Celerity
 
     def colspan
       assert_exists
-      attribute_value = @object.getAttributeValue('colspan').to_i
+      attribute_value = @object.getAttribute('colspan').to_i
       attribute_value > 0 ? attribute_value : 1
     end
 

data/lib/celerity/elements/text_field.rb

@@ -81,7 +81,7 @@ module Celerity
     
     def type
       assert_exists
-      type = @object.getAttributeValue('type')
+      type = @object.getAttribute 'type'
 
       if NON_TEXT_TYPES.include?(type)
         type

data/lib/celerity/input_element.rb

@@ -9,7 +9,7 @@ module Celerity
 
     def readonly?
       assert_exists
-      @object.isAttributeDefined('readonly')
+      @object.hasAttribute 'readonly'
     end
 
     private

data/lib/celerity/version.rb

@@ -3,7 +3,7 @@ module Celerity #:nodoc:
     MAJOR = 0
     MINOR = 0
     TINY  = 6
-    PATCH = 5 # Set to nil for official release
+    PATCH = 6 # Set to nil for official release
     
     STRING = [MAJOR, MINOR, TINY, PATCH].compact.join('.')
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: jarib-celerity
 version: !ruby/object:Gem::Version 
-  version: 0.0.6.5
+  version: 0.0.6.6
 platform: ruby
 authors: 
 - Jari Bakken