fluent 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 865fd6926b13f1303315bd27fdf75450a651bd96
-  data.tar.gz: 2580430caa258e3d409a0b231d7b39a18d804f66
+  metadata.gz: 53bf5738dcf39690dc07ba2dddb31c18a6258738
+  data.tar.gz: 6d0786f388d7317f0b973da560f9acb1e9fb72e6
 SHA512:
-  metadata.gz: 28d8369390312cf460c41cce6fe3cb321cdef0af8b22418477bf222be8e062e7a92d9ce1297a3b7b8f8220a6f09094823e77234e1333a930cb9cf3edbf2be6e9
-  data.tar.gz: aaa9eb4cef3b0ab94213c3e408703bcf93663c9ce6baa89151809ae6fa682e6e5a98a4f27959eceda43a7f331c829cd487c081ee40005d3ad22d74301bad3d99
+  metadata.gz: 44341db669c208f238ee6ea76845f7de15d441a116bfd7865c51d0bcf1230acc7d260416c254f1c543b9bf2af5bb83f93a7d368466a7748d7ddb9e508db9b879
+  data.tar.gz: 9153f09f1b8a7b31e847ae69e3de19281dd5543f4dbd51da2a77f479e2b387f5f8182760bdc5209ceff11fc5938e068fe42a379f65f2c28ca0c7363d1ecc7fc0

data/HISTORY.md

@@ -1,6 +1,15 @@
 Change Log and History
 ======================
 
+Version 0.3.0 / 2013-10-29
+--------------------------
+
+This release has some added generators: label, hidden, headings (h1 through h6), form, and image. That means you can now interact with those elements via the Fluent interface.
+
+Elements now map their type (i.e., Button) and their tag (i.e., "submit"). This allows for certain actions like getting the parent of elements, which is now an action that is available on each element.
+
+Tables rows have been added as an element and that was done so that tables could be enumerated. This means table rows and columns can be more easily discovered. Finally, lists (unordered and ordered) have also been enumerated so that it is possible to get the text contents of those lists.
+
 Version 0.2.0 / 2013-10-21
 --------------------------
 

data/lib/fluent/errors.rb

@@ -3,6 +3,7 @@ module Fluent
     class NoUrlForDefinition < StandardError; end
     class NoTitleForDefinition < StandardError; end
     class TitleNotMatched < StandardError; end
+    class UrlNotMatched < StandardError; end
     class UnableToCreatePlatform < StandardError; end
   end
 end

data/lib/fluent/factory.rb

@@ -7,9 +7,12 @@ module Fluent
     # @param block [Proc] logic to execute within the context of the definition
     # @return [Object] instance of the definition
     def on(definition, visit=false, &block)
+      definition = get_object_for(definition) if definition.is_a? String
+      
       return @active if @active.kind_of?(definition)
       @active = definition.new(@browser, visit)
       block.call @active if block
+      
       @active
     end
 
@@ -26,6 +29,12 @@ module Fluent
     end
 
     alias_method :on_visit, :on_view
+
+    def get_object_for(definition)
+      definition.split('::').inject(Object) do |obj, name|
+        obj.const_get(name)
+      end
+    end
     
   end
 end

data/lib/fluent/generators.rb

@@ -8,6 +8,12 @@ module Fluent
       define_method('view') do
         platform.visit(url)
       end
+      
+      define_method('check_url') do
+        msg  = "Expected url: '#{url}'; Actual url: '#{browser.url}'"
+        valid_url = url == browser.url
+        raise Fluent::Errors::UrlNotMatched, msg unless valid_url
+      end
     end
     
     def title_is(title=nil)
@@ -48,6 +54,7 @@ module Fluent
       end
       
       common_definition_methods(identifier, locator, __method__)
+      common_definition_methods(identifier, locator, 'a')
     end
     
     def paragraph(identifier, locator)
@@ -56,6 +63,7 @@ module Fluent
       end
       
       common_definition_methods(identifier, locator, __method__)
+      common_definition_methods(identifier, locator, 'p')
     end
     
     def div(identifier, locator)
@@ -92,6 +100,7 @@ module Fluent
       end
       
       common_definition_methods(identifier, locator, __method__)
+      common_definition_methods(identifier, locator, 'textfield')
     end
     
     def text_area(identifier, locator)
@@ -104,6 +113,7 @@ module Fluent
       end
       
       common_definition_methods(identifier, locator, __method__)
+      common_definition_methods(identifier, locator, 'textarea')
     end
     
     def checkbox(identifier, locator)
@@ -158,6 +168,7 @@ module Fluent
       alias_method "set_#{identifier}".to_sym, "select_#{identifier}".to_sym
       
       common_definition_methods(identifier, locator, __method__)
+      common_definition_methods(identifier, locator, 'radio_button')
     end
     
     def ordered_list(identifier, locator)
@@ -204,14 +215,64 @@ module Fluent
       common_definition_methods(identifier, locator, 'td')
     end
     
-    alias_method :radio_button, :radio ###
-    alias_method :textarea, :text_area ###
-    alias_method :textfield, :text_field ###
-    alias_method :a, :link ###
+    def label(identifier, locator)
+      define_method(identifier) do
+        return platform.label_text(locator.clone)
+      end
+
+      common_definition_methods(identifier, locator, __method__)
+    end
+    
+    def hidden(identifier, locator)
+      define_method(identifier) do
+        return platform.hidden_value(locator.clone)
+      end
+
+      common_definition_methods(identifier, locator, __method__)
+    end
+    
+    def form(identifier, locator)
+      common_definition_methods(identifier, locator, __method__)
+    end
+    
+    def image(identifier, locator)
+      common_definition_methods(identifier, locator, __method__)
+      common_definition_methods(identifier, locator, 'img')
+    end
+    
+    [:h1, :h2, :h3, :h4, :h5, :h6].each do |method|
+      define_method(method) do |identifier, locator|
+        define_method(identifier) do
+          platform_method = "#{method.to_s}_text"
+          return platform.send(platform_method, locator.clone)
+        end
+        
+        common_definition_methods(identifier, locator, method)
+      end
+    end
+    
+    #def h1(identifier, locator)
+      
+    #end
+
+    #def h2(identifier, locator)
+      
+    #end
+
+    #def h3(identifier, locator)
+      
+    #end
+    
+    alias_method :radio_button, :radio
+    alias_method :textarea, :text_area
+    alias_method :textfield, :text_field
+    alias_method :a, :link
+    alias_method :p, :paragraph
     alias_method :ol, :ordered_list
     alias_method :ul, :unordered_list
     alias_method :li, :list_item
     alias_method :td, :cell
+    alias_method :img, :image
     
     def common_definition_methods(identifier, locator, method)
       define_method("#{identifier}_object") do

data/lib/fluent/platform_watir/platform_object.rb

@@ -115,15 +115,15 @@ module Fluent
         end
 
         def text_area(locator)
-          reference_web_element('text_area(locator)', WebElements::TextArea, locator)
+          reference_web_element('textarea(locator)', WebElements::TextArea, locator)
         end
         
         def text_area_set(locator, value)
-          access_web_element('text_area(locator).set(value)', locator, value)
+          access_web_element('textarea(locator).set(value)', locator, value)
         end
         
         def text_area_get(locator)
-          access_web_element('text_area(locator).value', locator)
+          access_web_element('textarea(locator).value', locator)
         end
         
         def checkbox(locator)
@@ -234,6 +234,89 @@ module Fluent
           access_web_element('td(locator).text', locator)
         end
         
+        def label(locator)
+          reference_web_element('label(locator)', WebElements::Label, locator)
+        end
+        
+        def label_text(locator)
+          access_web_element('label(locator).text', locator)
+        end
+
+        def hidden(locator)
+          reference_web_element('hidden(locator)', WebElements::Hidden, locator)
+        end
+
+        def hidden_value(locator)
+          access_web_element('hidden(locator).value', locator)
+        end
+        
+        def h1(locator)
+          reference_web_element('h1(locator)', WebElements::Heading, locator)
+        end
+        
+        def h1_text(locator)
+          access_web_element('h1(locator).text', locator)
+        end
+
+        def h2(locator)
+          reference_web_element('h2(locator)', WebElements::Heading, locator)
+        end
+
+        def h2_text(locator)
+          access_web_element('h2(locator).text', locator)
+        end
+
+        def h3(locator)
+          reference_web_element('h3(locator)', WebElements::Heading, locator)
+        end
+
+        def h3_text(locator)
+          access_web_element('h3(locator).text', locator)
+        end
+
+        def h4(locator)
+          reference_web_element('h4(locator)', WebElements::Heading, locator)
+        end
+
+        def h4_text(locator)
+          access_web_element('h4(locator).text', locator)
+        end
+
+        def h5(locator)
+          reference_web_element('h5(locator)', WebElements::Heading, locator)
+        end
+
+        def h5_text(locator)
+          access_web_element('h5(locator).text', locator)
+        end
+
+        def h6(locator)
+          reference_web_element('h6(locator)', WebElements::Heading, locator)
+        end
+
+        def h6_text(locator)
+          access_web_element('h6(locator).text', locator)
+        end
+        
+        def form(locator)
+          reference_web_element('form(locator)', WebElements::Form, locator)
+        end
+        
+        def image(locator)
+          reference_web_element('image(locator)', WebElements::Image, locator)
+        end
+        
+        alias_method :radio_button, :radio
+        alias_method :textarea, :text_area
+        alias_method :textfield, :text_field
+        alias_method :a, :link
+        alias_method :p, :paragraph
+        alias_method :ol, :ordered_list
+        alias_method :ul, :unordered_list
+        alias_method :li, :list_item
+        alias_method :td, :cell
+        alias_method :img, :image
+        
         # This method is called by any platform methods that require getting
         # an object reference.
         #
@@ -274,6 +357,12 @@ module Fluent
   end
 end
 
+# This require brings in the high-level web element mapping calls.
+require 'fluent/web_elements'
+
+# The statements below are used to bring in all of the web elements that
+# Fluent recognizes. /web_elements/web_element must be brought in first
+# so that happens and then it is rejected from being required twice.
 require 'fluent/web_elements/web_element'
 file_list = Dir["#{File.dirname(__FILE__)}/../web_elements/**/*.rb"].reject { |file| file =~ /web_element.rb/ }
 file_list.each { |file| require file }

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

@@ -0,0 +1,26 @@
+module Fluent
+  module Platforms
+    module WatirWebDriver
+      module OrderedList
+
+        # @return [Fluent::WebElements::ListItem]
+        def [](index)
+          ::Fluent::WebElements::ListItem.new(children[index], :platform => :watir_webdriver)
+        end
+        
+        def list_items
+          web_element.ols(:xpath => list_item_xpath)
+        end
+        
+        def children
+          list_items.find_all { |item| item.parent == web_element }
+        end
+        
+        def items
+          children.size
+        end
+        
+      end
+    end
+  end
+end

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

@@ -0,0 +1,25 @@
+module Fluent
+  module Platforms
+    module WatirWebDriver
+      module Table
+
+        def [](index)
+          index = find_index_by_title(index) if index.kind_of?(String)
+          return nil unless index
+          initialize_row(web_element[index], :platform => :watir_webdriver)
+        end
+        
+        def rows
+          web_element.wd.find_elements(:xpath, row_xpath).size
+        end
+
+        def find_index_by_title(row_title)
+          web_element.rows.find_index do |row|
+            row.cells.any? { |col| col.text.include? row_title }
+          end
+        end
+        
+      end
+    end
+  end
+end

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

@@ -0,0 +1,27 @@
+module Fluent
+  module Platforms
+    module WatirWebDriver
+      module TableRow
+
+        # @return [Fluent::WebElements::Cell]
+        def [](index)
+          index = find_by_title(index) if index.kind_of?(String)
+          return nil unless index && columns >= index + 1
+          ::Fluent::WebElements::Cell.new(web_element[index], :platform => :watir_webdriver)
+        end
+
+        def columns
+          web_element.wd.find_elements(:xpath, cell_xpath).size
+        end
+
+        def find_by_title(column_text)
+          table = web_element.parent
+          table = table.parent if table.tag_name == 'tbody'
+          first_row = table[0]
+          first_row.cells.find_index {|column| column.text.include? column_text}
+        end
+        
+      end
+    end
+  end
+end

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

@@ -0,0 +1,21 @@
+module Fluent
+  module Platforms
+    module WatirWebDriver
+      module TextArea
+
+        def value
+          web_element.value
+        end
+        
+        def value=(value)
+          web_element.set(value)
+        end
+        
+        def clear
+          web_element.wd.clear
+        end
+        
+      end
+    end
+  end
+end

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

@@ -2,6 +2,10 @@ module Fluent
   module Platforms
     module WatirWebDriver
       module TextField
+
+        def value
+          web_element.value
+        end
         
         def value=(text)
           web_element.set(text)

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

@@ -0,0 +1,26 @@
+module Fluent
+  module Platforms
+    module WatirWebDriver
+      module UnorderedList
+
+        # @return [Fluent::WebElements::ListItem]
+        def [](index)
+          ::Fluent::WebElements::ListItem.new(children[index], :platform => :watir_webdriver)
+        end
+
+        def list_items
+          web_element.uls(:xpath => list_item_xpath)
+        end
+
+        def children
+          list_items.find_all { |item| item.parent == web_element }
+        end
+
+        def items
+          children.size
+        end
+        
+      end
+    end
+  end
+end