fluent 0.2.0 → 0.3.0

data/lib/fluent/platform_watir/platform_web_elements/web_element.rb

@@ -91,6 +91,13 @@ module Fluent
         def wait_until(timeout=::Fluent.element_level_wait, message=nil, &block)
           Object::Watir::Wait.until(timeout, message, &block)
         end
+
+        def parent
+          parent = web_element.parent
+          type = web_element.type if parent.tag_name.to_sym == :input
+          object_class = ::Fluent::WebElements.get_class_for(parent.tag_name, type)
+          object_class.new(parent, :platform => :watir_webdriver)
+        end
         
         alias_method :when_actionable, :when_present
         alias_method :when_not_actionable, :when_not_present

data/lib/fluent/version.rb

@@ -1,3 +1,3 @@
 module Fluent
-  VERSION = '0.2.0'
+  VERSION = '0.3.0'
 end

data/lib/fluent/web_elements.rb

@@ -0,0 +1,20 @@
+module Fluent
+  module WebElements
+    
+    class << self
+      def class_for_tag
+        @class_for_tag ||= {}
+      end
+      
+      def class_for_type
+        @class_for_type ||= {}
+      end
+      
+      def get_class_for(tag, type=nil)
+        return class_for_type[type.to_sym] if type
+        class_for_tag[tag.to_sym] || ::Fluent::WebElements::WebElement
+      end
+    end
+    
+  end
+end

data/lib/fluent/web_elements/button.rb

@@ -10,7 +10,12 @@ module Fluent
       def include_platform_specifics_for(platform)
         super
       end
-
+      
     end
+
+    ::Fluent::WebElements.class_for_type[:submit] = ::Fluent::WebElements::Button
+    ::Fluent::WebElements.class_for_type[:button] = ::Fluent::WebElements::Button
+    ::Fluent::WebElements.class_for_type[:image]  = ::Fluent::WebElements::Button
+    ::Fluent::WebElements.class_for_type[:reset]  = ::Fluent::WebElements::Button
   end
 end

data/lib/fluent/web_elements/cell.rb

@@ -12,5 +12,8 @@ module Fluent
       end
 
     end
+
+    ::Fluent::WebElements.class_for_tag[:td] = ::Fluent::WebElements::Cell
+    ::Fluent::WebElements.class_for_tag[:th] = ::Fluent::WebElements::Cell
   end
 end

data/lib/fluent/web_elements/checkbox.rb

@@ -14,7 +14,9 @@ module Fluent
           self.class.send :include, Fluent::Platforms::WatirWebDriver::CheckBox
         end
       end
-
+      
     end
+
+    ::Fluent::WebElements.class_for_type[:checkbox] = ::Fluent::WebElements::CheckBox
   end
 end

data/lib/fluent/web_elements/div.rb

@@ -12,5 +12,7 @@ module Fluent
       end
       
     end
+
+    ::Fluent::WebElements.class_for_tag[:div] = ::Fluent::WebElements::Div
   end
 end

data/lib/fluent/web_elements/form.rb

@@ -0,0 +1,18 @@
+module Fluent
+  module WebElements
+    class Form < WebElement
+
+      def initialize(web_element, platform)
+        @web_element = web_element
+        include_platform_specifics_for platform
+      end
+
+      def include_platform_specifics_for(platform)
+        super
+      end
+
+    end
+
+    ::Fluent::WebElements.class_for_tag[:form] = ::Fluent::WebElements::Form
+  end
+end

data/lib/fluent/web_elements/heading.rb

@@ -0,0 +1,23 @@
+module Fluent
+  module WebElements
+    class Heading < WebElement
+
+      def initialize(web_element, platform)
+        @web_element = web_element
+        include_platform_specifics_for platform
+      end
+
+      def include_platform_specifics_for(platform)
+        super
+      end
+
+    end
+
+    ::Fluent::WebElements.class_for_tag[:h1] = ::Fluent::WebElements::Heading
+    ::Fluent::WebElements.class_for_tag[:h2] = ::Fluent::WebElements::Heading
+    ::Fluent::WebElements.class_for_tag[:h3] = ::Fluent::WebElements::Heading
+    ::Fluent::WebElements.class_for_tag[:h4] = ::Fluent::WebElements::Heading
+    ::Fluent::WebElements.class_for_tag[:h5] = ::Fluent::WebElements::Heading
+    ::Fluent::WebElements.class_for_tag[:h6] = ::Fluent::WebElements::Heading
+  end
+end

data/lib/fluent/web_elements/hidden.rb

@@ -0,0 +1,18 @@
+module Fluent
+  module WebElements
+    class Hidden < WebElement
+
+      def initialize(web_element, platform)
+        @web_element = web_element
+        include_platform_specifics_for platform
+      end
+
+      def include_platform_specifics_for(platform)
+        super
+      end
+
+    end
+
+    ::Fluent::WebElements.class_for_tag[:hidden] = ::Fluent::WebElements::Hidden
+  end
+end

data/lib/fluent/web_elements/image.rb

@@ -0,0 +1,18 @@
+module Fluent
+  module WebElements
+    class Image < WebElement
+
+      def initialize(web_element, platform)
+        @web_element = web_element
+        include_platform_specifics_for platform
+      end
+
+      def include_platform_specifics_for(platform)
+        super
+      end
+
+    end
+
+    ::Fluent::WebElements.class_for_tag[:img] = ::Fluent::WebElements::Image
+  end
+end

data/lib/fluent/web_elements/label.rb

@@ -0,0 +1,18 @@
+module Fluent
+  module WebElements
+    class Label < WebElement
+
+      def initialize(web_element, platform)
+        @web_element = web_element
+        include_platform_specifics_for platform
+      end
+
+      def include_platform_specifics_for(platform)
+        super
+      end
+
+    end
+
+    ::Fluent::WebElements.class_for_tag[:label] = ::Fluent::WebElements::Label
+  end
+end

data/lib/fluent/web_elements/link.rb

@@ -12,5 +12,7 @@ module Fluent
       end
       
     end
+
+    ::Fluent::WebElements.class_for_tag[:a] = ::Fluent::WebElements::Link
   end
 end

data/lib/fluent/web_elements/list_item.rb

@@ -12,5 +12,7 @@ module Fluent
       end
 
     end
+
+    ::Fluent::WebElements.class_for_tag[:li] = ::Fluent::WebElements::ListItem
   end
 end

data/lib/fluent/web_elements/option.rb

@@ -12,5 +12,7 @@ module Fluent
       end
 
     end
+
+    ::Fluent::WebElements.class_for_tag[:option] = ::Fluent::WebElements::Option
   end
 end

data/lib/fluent/web_elements/ordered_list.rb

@@ -1,16 +1,34 @@
 module Fluent
   module WebElements
     class OrderedList < WebElement
-
+      include Enumerable
+      
       def initialize(web_element, platform)
         @web_element = web_element
         include_platform_specifics_for platform
       end
+      
+      # @return [Fluent::WebElements::ListItem]
+      def each
+        for index in 1..self.items do
+          yield self[index - 1]
+        end
+      end
 
+      def list_item_xpath
+        './/child::li'
+      end
+      
       def include_platform_specifics_for(platform)
         super
+        if platform[:platform] == :watir_webdriver
+          require 'fluent/platform_watir/platform_web_elements/ordered_list'
+          self.class.send :include, Fluent::Platforms::WatirWebDriver::OrderedList
+        end
       end
 
     end
+
+    ::Fluent::WebElements.class_for_tag[:ol] = ::Fluent::WebElements::OrderedList
   end
 end

data/lib/fluent/web_elements/paragraph.rb

@@ -12,5 +12,7 @@ module Fluent
       end
 
     end
+
+    ::Fluent::WebElements.class_for_tag[:p] = ::Fluent::WebElements::Paragraph
   end
 end

data/lib/fluent/web_elements/radio.rb

@@ -14,7 +14,9 @@ module Fluent
           self.class.send :include, Fluent::Platforms::WatirWebDriver::Radio
         end
       end
-
+      
     end
+
+    ::Fluent::WebElements.class_for_type[:radio] = ::Fluent::WebElements::Radio
   end
 end

data/lib/fluent/web_elements/select_list.rb

@@ -20,5 +20,7 @@ module Fluent
       end
 
     end
+
+    ::Fluent::WebElements.class_for_tag[:select] = ::Fluent::WebElements::SelectList
   end
 end

data/lib/fluent/web_elements/span.rb

@@ -12,5 +12,8 @@ module Fluent
       end
 
     end
+
+    ::Fluent::WebElements.class_for_tag[:span] = ::Fluent::WebElements::Span
+    
   end
 end

data/lib/fluent/web_elements/table.rb

@@ -1,16 +1,48 @@
 module Fluent
   module WebElements
     class Table < WebElement
+      include Enumerable
 
       def initialize(web_element, platform)
         @web_element = web_element
         include_platform_specifics_for platform
       end
 
+      # @return [Fluent::WebElements::TableRow]
+      def each
+        for index in 1..self.rows do
+          yield self[index - 1]
+        end
+      end
+
+      # @return [Fluent::WebElements::TableRow]
+      def first_row
+        self[0]
+      end
+
+      # @return [Fluent::WebElements::TableRow]
+      def last_row
+        self[-1]
+      end
+
+      def initialize_row(element, platform)
+        ::Fluent::WebElements::TableRow.new(element, platform)
+      end
+      
+      def row_xpath
+        './/child::tr'
+      end
+      
       def include_platform_specifics_for(platform)
         super
+        if platform[:platform] == :watir_webdriver
+          require 'fluent/platform_watir/platform_web_elements/table'
+          self.class.send :include, Fluent::Platforms::WatirWebDriver::Table
+        end
       end
 
     end
+
+    ::Fluent::WebElements.class_for_tag[:table] = ::Fluent::WebElements::Table
   end
 end

data/lib/fluent/web_elements/table_row.rb

@@ -0,0 +1,38 @@
+module Fluent
+  module WebElements
+    class TableRow < WebElement
+      include Enumerable
+      
+      def initialize(web_element, platform)
+        @web_element = web_element
+        include_platform_specifics_for platform
+      end
+
+      # @return [Fluent::WebElements::Cell]
+      def each
+        for index in 1..self.columns do
+          yield self[index - 1]
+        end
+      end
+
+      def initialize_cell(row_element, platform)
+        ::Fluent::WebElements::Cell.new(row_element, platform)
+      end
+      
+      def cell_xpath
+        './/child::td|th'
+      end
+      
+      def include_platform_specifics_for(platform)
+        super
+        if platform[:platform] == :watir_webdriver
+          require 'fluent/platform_watir/platform_web_elements/table_row'
+          self.class.send :include, Fluent::Platforms::WatirWebDriver::TableRow
+        end
+      end
+
+    end
+
+    ::Fluent::WebElements.class_for_tag[:tr] = ::Fluent::WebElements::TableRow
+  end
+end

data/lib/fluent/web_elements/text_area.rb

@@ -9,8 +9,14 @@ module Fluent
 
       def include_platform_specifics_for(platform)
         super
+        if platform[:platform] == :watir_webdriver
+          require 'fluent/platform_watir/platform_web_elements/text_area'
+          self.class.send :include, Fluent::Platforms::WatirWebDriver::TextArea
+        end
       end
 
     end
+
+    ::Fluent::WebElements.class_for_tag[:textarea] = ::Fluent::WebElements::TextArea
   end
 end

data/lib/fluent/web_elements/text_field.rb

@@ -20,5 +20,8 @@ module Fluent
       end
 
     end
+
+    ::Fluent::WebElements.class_for_type[:text] = ::Fluent::WebElements::TextField
+    ::Fluent::WebElements.class_for_type[:password] = ::Fluent::WebElements::TextField
   end
 end

data/lib/fluent/web_elements/unordered_list.rb

@@ -1,16 +1,35 @@
 module Fluent
   module WebElements
     class UnorderedList < WebElement
-
+      include Enumerable
+      
       def initialize(web_element, platform)
         @web_element = web_element
         include_platform_specifics_for platform
       end
 
+      # @return [Fluent::WebElements::ListItem]
+      def each
+        for index in 1..self.items do
+          yield self[index - 1]
+        end
+      end
+      
+      def list_item_xpath
+        './/child::li'
+      end
+      
       def include_platform_specifics_for(platform)
         super
+        if platform[:platform] == :watir_webdriver
+          require 'fluent/platform_watir/platform_web_elements/unordered_list'
+          self.class.send :include, Fluent::Platforms::WatirWebDriver::UnorderedList
+        end
       end
 
     end
+
+    ::Fluent::WebElements.class_for_tag[:ul] = ::Fluent::WebElements::UnorderedList
+    
   end
 end

data/spec/factory_spec.rb

@@ -39,4 +39,11 @@ describe Fluent::Factory do
     current.should === active
   end
   
+  it 'should create a new definition based on a string' do
+    @factory.browser.should_receive(:goto)
+    @factory.on_view "DefinitionTest" do |page|
+      page.should be_instance_of DefinitionTest
+    end
+  end
+  
 end