page-object 2.1.1 → 2.2

data/lib/page-object/elements/list_item.rb

@@ -2,12 +2,6 @@ module PageObject
   module Elements
     class ListItem < Element
 
-      protected
-
-      def self.watir_finders
-        super + [:text]
-      end
-
     end
 
     ::PageObject::Elements.tag_to_class[:li] = ::PageObject::Elements::ListItem

data/lib/page-object/elements/ordered_list.rb

@@ -22,7 +22,7 @@ module PageObject
       # @return [PageObject::Elements::ListItem]
       #
       def [](idx)
-        Object::PageObject::Elements::ListItem.new(children[idx], :platform => :watir)
+        Object::PageObject::Elements::ListItem.new(children[idx])
       end
 
       #
@@ -37,7 +37,7 @@ module PageObject
       #
       def list_items
         children.collect do |obj|
-          Object::PageObject::Elements::ListItem.new(obj, :platform => :watir)
+          Object::PageObject::Elements::ListItem.new(obj)
         end
       end
 
@@ -51,10 +51,6 @@ module PageObject
         "./child::li"
       end
 
-      def self.watir_finders
-        [:class, :id, :index, :xpath]
-      end
-
     end
 
     ::PageObject::Elements.tag_to_class[:ol] = ::PageObject::Elements::OrderedList

data/lib/page-object/elements/radio_button.rb

@@ -17,12 +17,6 @@ module PageObject
         element.set?
       end
 
-      protected
-
-      def self.watir_finders
-        super + [:value, :label]
-      end
-
     end
 
     ::PageObject::Elements.type_to_class[:radio] = ::PageObject::Elements::RadioButton

data/lib/page-object/elements/select_list.rb

@@ -18,7 +18,7 @@ module PageObject
       # @return [array of PageObject::Elements::Option]
       #
       def options
-        element.options.map { |e| ::PageObject::Elements::Option.new(e, :platform => :watir) }
+        element.options.map { |e| PageObject::Elements::Option.new(e) }
       end
 
       #
@@ -50,10 +50,6 @@ module PageObject
         ".//child::option"
       end
 
-      def self.watir_finders
-        super + [:text, :value, :label]
-      end
-
     end
 
     ::PageObject::Elements.tag_to_class[:select] = ::PageObject::Elements::SelectList

data/lib/page-object/elements/span.rb

@@ -2,12 +2,6 @@ module PageObject
   module Elements
     class Span < Element
 
-      protected
-
-      def self.watir_finders
-        [:class, :id, :index, :text, :title, :xpath]
-      end
-      
     end
 
     ::PageObject::Elements.tag_to_class[:span] = ::PageObject::Elements::Span

data/lib/page-object/elements/table.rb

@@ -54,7 +54,7 @@ module PageObject
       def [](idx)
         idx = find_index_by_title(idx) if idx.kind_of?(String)
         return nil unless idx
-        initialize_row(element[idx], :platform => :watir)
+        initialize_row(element[idx])
       end
 
       #
@@ -70,8 +70,8 @@ module PageObject
         ".//child::tr"
       end
 
-      def initialize_row(row_element, platform)
-        ::PageObject::Elements::TableRow.new(row_element, platform)
+      def initialize_row(row_element)
+        ::PageObject::Elements::TableRow.new(row_element)
       end
 
       def find_index_by_title(row_title)

data/lib/page-object/elements/table_cell.rb

@@ -9,12 +9,6 @@ module PageObject
         true
       end
 
-      protected
-
-      def self.watir_finders
-        super + [:text]
-      end
-
     end
 
     ::PageObject::Elements.tag_to_class[:td] = ::PageObject::Elements::TableCell

data/lib/page-object/elements/table_row.rb

@@ -25,7 +25,7 @@ module PageObject
       def [](idx)
         idx = find_index_by_title(idx) if idx.kind_of?(String)
         return nil unless idx && columns >= idx + 1
-        initialize_cell(element[idx], :platform => :watir)
+        initialize_cell(element[idx])
       end
 
       #
@@ -41,8 +41,8 @@ module PageObject
         ".//child::td|th"
       end
 
-      def initialize_cell(row_element, platform)
-        ::PageObject::Elements::TableCell.new(row_element, platform)
+      def initialize_cell(row_element)
+        ::PageObject::Elements::TableCell.new(row_element)
       end
 
       def find_index_by_title(title)

data/lib/page-object/elements/text_area.rb

@@ -10,12 +10,6 @@ module PageObject
         element.set(new_value)
       end
 
-      protected
-
-      def self.watir_finders
-        super + [:label]
-      end
-
     end
 
     ::PageObject::Elements.tag_to_class[:textarea] = ::PageObject::Elements::TextArea

data/lib/page-object/elements/text_field.rb

@@ -10,12 +10,6 @@ module PageObject
         element.set(new_value)
       end
 
-      protected
-
-      def self.watir_finders
-        super + [:title, :value, :text, :label]
-      end
-
     end
 
     ::PageObject::Elements.type_to_class[:text] = ::PageObject::Elements::TextField

data/lib/page-object/elements/unordered_list.rb

@@ -22,7 +22,7 @@ module PageObject
       # @return [PageObject::Elements::ListItem]
       #
       def [](idx)
-        Object::PageObject::Elements::ListItem.new(children[idx], :platform => :watir)
+        Object::PageObject::Elements::ListItem.new(children[idx])
       end
 
       #
@@ -38,7 +38,7 @@ module PageObject
       #
       def list_items
         children.collect do |obj|
-          Object::PageObject::Elements::ListItem.new(obj, :platform => :watir)
+          Object::PageObject::Elements::ListItem.new(obj)
         end
       end
 
@@ -48,10 +48,6 @@ module PageObject
         "./child::li"
       end
 
-      def self.watir_finders
-        [:class, :id, :index, :xpath]
-      end
-
       def children
         element.uls(:xpath => child_xpath)
       end

data/lib/page-object/indexed_properties.rb

@@ -2,14 +2,12 @@ module PageObject
   module IndexedProperties
     class TableOfElements
       include PageObject
-      include LoadsPlatform
 
       def initialize (browser, identifier_list)
         initialize_browser(browser)
         @identifier_list = identifier_list
         @indexed_property_class = Class.new {
           include PageObject
-          include LoadsPlatform
           extend Accessors
 
           def initialize (browser, index, identifier_list)
@@ -23,6 +21,8 @@ module PageObject
                 next if value.is_a? Regexp # Cannot format Regexp with %
                 if key == :index
                   how_and_what[key] = (value % index).to_i
+                elsif key == :frame
+                  how_and_what[key] = value #passthrough frame without modification
                 else
                   how_and_what[key] = value % index
                 end

data/lib/page-object/javascript_framework_facade.rb

@@ -69,7 +69,7 @@ module PageObject
       end
 
       def unknown_framework(framework)
-        "You specified the Javascript framework #{framework} and it is unknow to the system"
+        "You specified the Javascript framework #{framework} and it is unknown to the system"
       end
 
       def invalid_framework

data/lib/page-object/locator_generator.rb

@@ -1,156 +1,160 @@
 module PageObject
   module LocatorGenerator
 
-    BASIC_ELEMENTS = [:abbr,
-                      :address,
-                      :animate,
-                      :animate_motion,
-                      :animate_transform,
-                      :article,
-                      :as,
-                      :aside,
-                      :base,
-                      :bdi,
-                      :bdo,
-                      :blockquote,
-                      :body,
-                      :br,
-                      :caption,
-                      :circle,
-                      :cite,
-                      :code,
-                      :col,
-                      :colgroup,
-                      :command,
-                      :cursor,
-                      :data,
-                      :datalist,
-                      :dd,
-                      :defs,
-                      :del,
-                      :desc,
-                      :details,
-                      :dfn,
-                      :dialog,
-                      :discard,
-                      :dl,
-                      :dt,
-                      :ellipse,
-                      :em,
-                      :embed,
-                      :fieldset,
-                      :figcaption,
-                      :figure,
-                      :font,
-                      :footer,
-                      :foreign_object,
-                      :g,
-                      :head,
-                      :header,
-                      :hgroup,
-                      :hr,
-                      :html,
-                      :ins,
-                      :kbd,
-                      :keygen,
-                      :legend,
-                      :line,
-                      :linear_gradient,
-                      :main,
-                      :map,
-                      :mark,
-                      :marker,
-                      :menu,
-                      :menuitem,
-                      :mesh_gradient,
-                      :mesh_patch,
-                      :mesh_row,
-                      :meta,
-                      :metadata,
-                      :meter,
-                      :mpath,
-                      :nav,
-                      :noscript,
-                      :object,
-                      :optgroup,
-                      :output,
-                      :p,
-                      :param,
-                      :path,
-                      :pattern,
-                      :polygon,
-                      :polyline,
-                      :pre,
-                      :progress,
-                      :q,
-                      :radial_gradient,
-                      :rect,
-                      :rp,
-                      :rt,
-                      :ruby,
-                      :s,
-                      :samp,
-                      :script,
-                      :section,
-                      :set,
-                      :small,
-                      :source,
-                      :stop,
-                      :strong,
-                      :style,
-                      :sub,
-                      :summary,
-                      :sup,
-                      :switch,
-                      :symbol,
-                      :template,
-                      :text_path,
-                      :thread,
-                      :time,
-                      :title,
-                      :track,
-                      :tspan,
-                      :u,
-                      :use,
-                      :var,
-                      :view,
-                      :wbr]
+    BASIC_ELEMENTS = %i(
+        abbr
+        address
+        animate
+        animate_motion
+        animate_transform
+        article
+        as
+        aside
+        base
+        bdi
+        bdo
+        blockquote
+        body
+        br
+        caption
+        circle
+        cite
+        code
+        col
+        colgroup
+        command
+        cursor
+        data
+        datalist
+        dd
+        defs
+        del
+        desc
+        details
+        dfn
+        dialog
+        discard
+        dl
+        dt
+        ellipse
+        em
+        embed
+        fieldset
+        figcaption
+        figure
+        font
+        footer
+        foreign_object
+        g
+        head
+        header
+        hgroup
+        hr
+        html
+        ins
+        kbd
+        keygen
+        legend
+        line
+        linear_gradient
+        main
+        map
+        mark
+        marker
+        menu
+        menuitem
+        mesh_gradient
+        mesh_patch
+        mesh_row
+        meta
+        metadata
+        meter
+        mpath
+        nav
+        noscript
+        object
+        optgroup
+        output
+        p
+        param
+        path
+        pattern
+        polygon
+        polyline
+        pre
+        progress
+        q
+        radial_gradient
+        rect
+        rp
+        rt
+        ruby
+        s
+        samp
+        script
+        section
+        set
+        small
+        source
+        stop
+        strong
+        style
+        sub
+        summary
+        sup
+        switch
+        symbol
+        template
+        text_path
+        thread
+        time
+        title
+        track
+        tspan
+        u
+        use
+        var
+        view
+        wbr
+    )
 
 
-    ADVANCED_ELEMENTS = [:text_field,
-                         :hidden_field,
-                         :text_area,
-                         :select_list,
-                         :link,
-                         :checkbox,
-                         :radio_button,
-                         :button,
-                         :div,
-                         :span,
-                         :table,
-                         :cell,
-                         :row,
-                         :image,
-                         :form,
-                         :list_item,
-                         :ordered_list,
-                         :unordered_list,
-                         :h1,
-                         :h2,
-                         :h3,
-                         :h4,
-                         :h5,
-                         :h6,
-                         :paragraph,
-                         :label,
-                         :file_field,
-                         :area,
-                         :canvas,
-                         :audio,
-                         :video,
-                         :b,
-                         :i,
-                         :svg]
+    ADVANCED_ELEMENTS = %i(
+        text_field
+        hidden_field
+        text_area
+        select_list
+        link
+        checkbox
+        radio_button
+        button
+        div
+        span
+        table
+        cell
+        row
+        image
+        form
+        list_item
+        ordered_list
+        unordered_list
+        h1
+        h2
+        h3
+        h4
+        h5
+        h6
+        paragraph
+        label
+        file_field
+        area
+        canvas
+        audio
+        video
+        b
+        i
+        svg
+    )
 
     def self.generate_locators(target)
       ADVANCED_ELEMENTS.each do |tag|