firewatir 1.6.5 → 1.6.6.rc1

data/lib/firewatir/elements/input_element.rb

@@ -1,44 +1,44 @@
-module FireWatir
-  #
-  # Description:
-  #   Base class containing items that are common between select list, text field, button, hidden, file field classes.
-  #
-  class InputElement < Element
-    attr_accessor :element_name
-    #
-    # Description:
-    #   Locate the element on the page. Element can be a select list, text field, button, hidden, file field.
-    #
-    def locate
-      case @how
-      when :jssh_name
-        @element_name = @what
-      when :xpath
-        @element_name = element_by_xpath(@container, @what)
-      else
-        if(self.class::INPUT_TYPES.include?("select-one"))
-          @element_name = locate_tagged_element("select", @how, @what, self.class::INPUT_TYPES)
-        else
-          @element_name = locate_tagged_element("input", @how, @what, self.class::INPUT_TYPES)
-        end
-      end
-      @o = self
-    end
-    #
-    # Description:
-    #   Initializes the instance of element.
-    #
-    # Input:
-    #   - how - Attribute to identify the element.
-    #   - what - Value of that attribute.
-    #
-    def initialize(container, how, what)
-      @how = how
-      @what = what
-      @container = container
-      @element_name = ""
-      #super(nil)
-    end
-
-  end # FireWatir
-end # InputElement
+module FireWatir
+  #
+  # Description:
+  #   Base class containing items that are common between select list, text field, button, hidden, file field classes.
+  #
+  class InputElement < Element
+    attr_accessor :element_name
+    #
+    # Description:
+    #   Locate the element on the page. Element can be a select list, text field, button, hidden, file field.
+    #
+    def locate
+      case @how
+      when :jssh_name
+        @element_name = @what
+      when :xpath
+        @element_name = element_by_xpath(@container, @what)
+      else
+        if(self.class::INPUT_TYPES.include?("select-one"))
+          @element_name = locate_tagged_element("select", @how, @what, self.class::INPUT_TYPES)
+        else
+          @element_name = locate_tagged_element("input", @how, @what, self.class::INPUT_TYPES)
+        end
+      end
+      @o = self
+    end
+    #
+    # Description:
+    #   Initializes the instance of element.
+    #
+    # Input:
+    #   - how - Attribute to identify the element.
+    #   - what - Value of that attribute.
+    #
+    def initialize(container, how, what)
+      @how = how
+      @what = what
+      @container = container
+      @element_name = ""
+      #super(nil)
+    end
+
+  end # FireWatir
+end # InputElement

data/lib/firewatir/elements/link.rb

@@ -1,76 +1,76 @@
-module FireWatir
-  #
-  # Description:
-  #   Class for Link element.
-  #
-  class Link < Element
-    attr_accessor :element_name
-    TAG = 'A'
-    #
-    # Description:
-    #   Initializes the instance of link element.
-    #
-    # Input:
-    #   - how - Attribute to identify the link element.
-    #   - what - Value of that attribute.
-    #
-    def initialize(container, how, what)
-      @how = how
-      @what = what
-      @container = container
-    end
-
-    #
-    # Description:
-    #   Locate the link element on the page.
-    #
-    def locate
-      case @how
-      when :jssh_name
-        @element_name = @what
-      when :xpath
-        @element_name = element_by_xpath(@container, @what)
-      else
-        @element_name = locate_tagged_element('A', @how, @what)
-      end
-      @o = self
-    end
-
-    #TODO: if an image is used as part of the link, this will return true
-    #def link_has_image
-    #    assert_exists
-    #    return true  if @o.getElementsByTagName("IMG").length > 0
-    #    return false
-    #end
-
-    #TODO: this method returns the src of an image, if an image is used as part of the link
-    #def src # BUG?
-    #    assert_exists
-    #    if @o.getElementsByTagName("IMG").length > 0
-    #        return  @o.getElementsByTagName("IMG")[0.to_s].src
-    #    else
-    #        return ""
-    #    end
-    #end
-
-    #
-    # Description:
-    #   Used to populate the properties in to_s method.
-    #
-    #def link_string_creator
-    #    n = []
-    #    n <<   "href:".ljust(TO_S_SIZE) + self.href
-    #    n <<   "inner text:".ljust(TO_S_SIZE) + self.text
-    #    n <<   "img src:".ljust(TO_S_SIZE) + self.src if self.link_has_image
-    #    return n
-    #    end
-
-    # returns a textual description of the link
-
-    def to_s
-      assert_exists
-      super({"href" => "href","inner text" => "text"})
-    end
-
-  end # Link
-end # FireWatir
+module FireWatir
+  #
+  # Description:
+  #   Class for Link element.
+  #
+  class Link < Element
+    attr_accessor :element_name
+    TAG = 'A'
+    #
+    # Description:
+    #   Initializes the instance of link element.
+    #
+    # Input:
+    #   - how - Attribute to identify the link element.
+    #   - what - Value of that attribute.
+    #
+    def initialize(container, how, what)
+      @how = how
+      @what = what
+      @container = container
+    end
+
+    #
+    # Description:
+    #   Locate the link element on the page.
+    #
+    def locate
+      case @how
+      when :jssh_name
+        @element_name = @what
+      when :xpath
+        @element_name = element_by_xpath(@container, @what)
+      else
+        @element_name = locate_tagged_element('A', @how, @what)
+      end
+      @o = self
+    end
+
+    #TODO: if an image is used as part of the link, this will return true
+    #def link_has_image
+    #    assert_exists
+    #    return true  if @o.getElementsByTagName("IMG").length > 0
+    #    return false
+    #end
+
+    #TODO: this method returns the src of an image, if an image is used as part of the link
+    #def src # BUG?
+    #    assert_exists
+    #    if @o.getElementsByTagName("IMG").length > 0
+    #        return  @o.getElementsByTagName("IMG")[0.to_s].src
+    #    else
+    #        return ""
+    #    end
+    #end
+
+    #
+    # Description:
+    #   Used to populate the properties in to_s method.
+    #
+    #def link_string_creator
+    #    n = []
+    #    n <<   "href:".ljust(TO_S_SIZE) + self.href
+    #    n <<   "inner text:".ljust(TO_S_SIZE) + self.text
+    #    n <<   "img src:".ljust(TO_S_SIZE) + self.src if self.link_has_image
+    #    return n
+    #    end
+
+    # returns a textual description of the link
+
+    def to_s
+      assert_exists
+      super({"href" => "href","inner text" => "text"})
+    end
+
+  end # Link
+end # FireWatir

data/lib/firewatir/elements/non_control_element.rb

@@ -1,53 +1,53 @@
-module FireWatir
-
-  # Base class containing items that are common between the span, div, label, p and pre classes.
-  class NonControlElement < Element
-    def self.inherited subclass
-      class_name = subclass.to_s.demodulize
-      method_name = class_name.underscore
-      FireWatir::Container.module_eval "def #{method_name}(how, what=nil)
-      locate if respond_to?(:locate)
-      return #{class_name}.new(self, how, what); end"
-    end
-
-    attr_accessor :element_name
-
-    #
-    # Description:
-    #   Locate the element on the page. Element can be a span, div, label, p or pre HTML tag.
-    #
-    def locate
-      case @how
-      when :jssh_name
-        @element_name = @what
-      when :xpath
-        @element_name = element_by_xpath(@container, @what)
-      else
-        @element_name = locate_tagged_element(self.class::TAG, @how, @what)
-      end
-      @o = self
-    end
-
-    #   - how - Attribute to identify the element.
-    #   - what - Value of that attribute.
-    def initialize(container, how, what)
-      #@element = Element.new(nil)
-      @how = how
-      @what = what
-      @container = container
-      @o = nil
-    end
-
-    # Returns a string of properties of the object.
-    def to_s(attributes = nil)
-      assert_exists
-      hash_properties = {"text"=>"innerHTML"}
-      hash_properties.update(attributes) if attributes != nil
-      r = super(hash_properties)
-      #r = string_creator
-      #r += span_div_string_creator
-      return r.join("\n")
-    end
-
-  end # NonControlElement
-end # FireWatir
+module FireWatir
+
+  # Base class containing items that are common between the span, div, label, p and pre classes.
+  class NonControlElement < Element
+    def self.inherited subclass
+      class_name = subclass.to_s.demodulize
+      method_name = class_name.underscore
+      FireWatir::Container.module_eval "def #{method_name}(how, what=nil)
+      locate if respond_to?(:locate)
+      return #{class_name}.new(self, how, what); end"
+    end
+
+    attr_accessor :element_name
+
+    #
+    # Description:
+    #   Locate the element on the page. Element can be a span, div, label, p or pre HTML tag.
+    #
+    def locate
+      case @how
+      when :jssh_name
+        @element_name = @what
+      when :xpath
+        @element_name = element_by_xpath(@container, @what)
+      else
+        @element_name = locate_tagged_element(self.class::TAG, @how, @what)
+      end
+      @o = self
+    end
+
+    #   - how - Attribute to identify the element.
+    #   - what - Value of that attribute.
+    def initialize(container, how, what)
+      #@element = Element.new(nil)
+      @how = how
+      @what = what
+      @container = container
+      @o = nil
+    end
+
+    # Returns a string of properties of the object.
+    def to_s(attributes = nil)
+      assert_exists
+      hash_properties = {"text"=>"innerHTML"}
+      hash_properties.update(attributes) if attributes != nil
+      r = super(hash_properties)
+      #r = string_creator
+      #r += span_div_string_creator
+      return r.join("\n")
+    end
+
+  end # NonControlElement
+end # FireWatir

data/lib/firewatir/elements/non_control_elements.rb

@@ -1,108 +1,108 @@
-module FireWatir
-  class Pre < NonControlElement
-    TAG = 'PRE'
-  end
-
-  class P < NonControlElement
-    TAG = 'P'
-  end
-
-  class Div < NonControlElement
-    TAG = 'DIV'
-  end
-
-  class Span < NonControlElement
-    TAG = 'SPAN'
-  end
-
-  class Strong < NonControlElement
-    TAG = 'STRONG'
-  end
-
-  class Label < NonControlElement
-    TAG = 'LABEL'
-
-    #
-    # Description:
-    #   Used to populate the properties in the to_s method.
-    #
-    #def label_string_creator
-    #    n = []
-    #    n <<   "for:".ljust(TO_S_SIZE) + self.for
-    #    n <<   "inner text:".ljust(TO_S_SIZE) + self.text
-    #    return n
-    #end
-    #private :label_string_creator
-
-    #
-    # Description:
-    #   Creates string of properties of the object.
-    #
-    def to_s
-      assert_exists
-      super({"for" => "htmlFor","text" => "innerHTML"})
-      #   r=r + label_string_creator
-    end
-  end
-
-  class Ul < NonControlElement
-    TAG = 'UL'
-  end
-
-  class Li < NonControlElement
-    TAG = 'LI'
-  end
-
-  class Dl < NonControlElement
-    TAG = 'DL'
-  end
-
-  class Dt < NonControlElement
-    TAG = 'DT'
-  end
-
-  class Dd < NonControlElement
-    TAG = 'DD'
-  end
-
-  class H1 < NonControlElement
-    TAG = 'H1'
-  end
-
-  class H2 < NonControlElement
-    TAG = 'H2'
-  end
-
-  class H3 < NonControlElement
-    TAG = 'H3'
-  end
-
-  class H4 < NonControlElement
-    TAG = 'H4'
-  end
-
-  class H5 < NonControlElement
-    TAG = 'H5'
-  end
-
-  class H6 < NonControlElement
-    TAG = 'H6'
-  end
-
-  class Map < NonControlElement
-    TAG = 'MAP'
-  end
-
-  class Area < NonControlElement
-    TAG = 'AREA'
-  end
-
-  class Body < NonControlElement
-    TAG = 'TBODY'
-  end
-  
-  class Em < NonControlElement
-    TAG = 'EM'
-  end
-
-end # FireWatir
+module FireWatir
+  class Pre < NonControlElement
+    TAG = 'PRE'
+  end
+
+  class P < NonControlElement
+    TAG = 'P'
+  end
+
+  class Div < NonControlElement
+    TAG = 'DIV'
+  end
+
+  class Span < NonControlElement
+    TAG = 'SPAN'
+  end
+
+  class Strong < NonControlElement
+    TAG = 'STRONG'
+  end
+
+  class Label < NonControlElement
+    TAG = 'LABEL'
+
+    #
+    # Description:
+    #   Used to populate the properties in the to_s method.
+    #
+    #def label_string_creator
+    #    n = []
+    #    n <<   "for:".ljust(TO_S_SIZE) + self.for
+    #    n <<   "inner text:".ljust(TO_S_SIZE) + self.text
+    #    return n
+    #end
+    #private :label_string_creator
+
+    #
+    # Description:
+    #   Creates string of properties of the object.
+    #
+    def to_s
+      assert_exists
+      super({"for" => "htmlFor","text" => "innerHTML"})
+      #   r=r + label_string_creator
+    end
+  end
+
+  class Ul < NonControlElement
+    TAG = 'UL'
+  end
+
+  class Li < NonControlElement
+    TAG = 'LI'
+  end
+
+  class Dl < NonControlElement
+    TAG = 'DL'
+  end
+
+  class Dt < NonControlElement
+    TAG = 'DT'
+  end
+
+  class Dd < NonControlElement
+    TAG = 'DD'
+  end
+
+  class H1 < NonControlElement
+    TAG = 'H1'
+  end
+
+  class H2 < NonControlElement
+    TAG = 'H2'
+  end
+
+  class H3 < NonControlElement
+    TAG = 'H3'
+  end
+
+  class H4 < NonControlElement
+    TAG = 'H4'
+  end
+
+  class H5 < NonControlElement
+    TAG = 'H5'
+  end
+
+  class H6 < NonControlElement
+    TAG = 'H6'
+  end
+
+  class Map < NonControlElement
+    TAG = 'MAP'
+  end
+
+  class Area < NonControlElement
+    TAG = 'AREA'
+  end
+
+  class Body < NonControlElement
+    TAG = 'TBODY'
+  end
+  
+  class Em < NonControlElement
+    TAG = 'EM'
+  end
+
+end # FireWatir