fluent 0.7.3 → 0.7.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c79d7d2f797b81cc077bf208424734358ae32312
-  data.tar.gz: 68eaac53b4e08133dcaf1eb46afd5064d065765c
+  metadata.gz: fb91a4979f347c6c48c56b72aef4ac74d8c2aba8
+  data.tar.gz: aaa194a3259546456b03400b8bd3f11fd7088d4c
 SHA512:
-  metadata.gz: 0a46811e408cf068b8147d2106301b2d5dad61d343adf4e425d63201b35e3a6e4f1309222bb858c62266fb8dcfeb053f4c48fc705058505e37e61ed445a85cc1
-  data.tar.gz: 51d97e5c42f6eed673a7557c7fc33c3b53c03d57e8c6fe90736724ef6b16fa1f87555dc96e0bff28ec8561de68c4455580b780c4ac698553440bd16ba7392c71
+  metadata.gz: d9a37468a281061ff9c0564ed3d27b3f128016c1dc23c57e3af337a92ca84df612abd8abe6df6e1fb540e3f0ef77b080aeb8fecc2a82d60514a176ed3f723866
+  data.tar.gz: 3bd8e5667cbee8d01a0bd9b0e719e9ee91c4f0dc06c42df46fc8d8ebfa4877cca9d14372c05c052d90ed65d62a59782bca1b0e8d4087f24882da05d29f9c1c6b

data/HISTORY.md

@@ -1,6 +1,18 @@
 Change Log and History
 ======================
 
+Version 0.7.4 / 2013-12-19
+--------------------------
+
+The changes in this patch release are:
+
+* Element definitions can now accept blocks.
+
+* It is now possible to run JavaScript against a web element by passing an element reference to the call to `run_script` (or `execute_script`).
+
+* RSpec is now a runtime dependency. This allows for RSpec Matchers to automatically be included into page and activity definitions, which makes it easier to incorporate all of RSpec's checking methods.
+
+
 Version 0.7.3 / 2013-12-18
 --------------------------
 

data/lib/fluent.rb

@@ -15,6 +15,7 @@ require 'fluent/data_config'
 require 'watir-webdriver'
 require 'selenium-webdriver'
 require 'mechanize'
+require 'rspec'
 
 module Fluent
   include Platforms
@@ -24,6 +25,7 @@ module Fluent
   include DataSetter
   include DataBuilder
   include DataConfig
+  include RSpec::Matchers
   
   # Browser drivers will be:
   # [Watir::Browser] or [Selenium::WebDriver::Driver]
@@ -127,4 +129,11 @@ module Fluent
     Fluent::trace("Fluent platform object: #{@platform}")
     @platform
   end
+
+  # This method processes a block with single or multiple parameters.
+  #
+  # @param [Proc] block the block to process
+  def process_block(&block)
+    block.arity == 1 ? block.call(self) : self.instance_eval(&block)
+  end
 end

data/lib/fluent/evaluators.rb

@@ -25,7 +25,8 @@ module Fluent
       platform.refresh
     end
 
-    def run_script(script)
+    def run_script(script, *args)
+      args.map! { |obj| obj.kind_of?(Fluent::WebElements::WebElement) ? obj.web_element : obj }
       platform.run_script(script)
     end
 

data/lib/fluent/generators.rb

@@ -48,112 +48,112 @@ module Fluent
       block.call(frame)
     end
     
-    def link(identifier, locator)
+    def link(identifier, locator={index: 0}, &block)
       define_method(identifier) do
-        return platform.link_click(locator.clone)
+        return platform.link_click(locator.clone) unless block_given?
       end
       
-      common_definition_methods(identifier, locator, __method__)
-      common_definition_methods(identifier, locator, 'a')
+      common_definition_methods(identifier, locator, __method__, &block)
+      common_definition_methods(identifier, locator, 'a', &block)
     end
     
-    def paragraph(identifier, locator)
+    def paragraph(identifier, locator={index: 0}, &block)
       define_method(identifier) do
-        return platform.paragraph_text(locator.clone)
+        return platform.paragraph_text(locator.clone) unless block_given?
       end
       
-      common_definition_methods(identifier, locator, __method__)
-      common_definition_methods(identifier, locator, 'p')
+      common_definition_methods(identifier, locator, __method__, &block)
+      common_definition_methods(identifier, locator, 'p', &block)
     end
     
-    def div(identifier, locator)
+    def div(identifier, locator={index: 0}, &block)
       define_method(identifier) do
-        return platform.div_text(locator.clone)
+        return platform.div_text(locator.clone) unless block_given?
       end
       
-      common_definition_methods(identifier, locator, __method__)
+      common_definition_methods(identifier, locator, __method__, &block)
     end
     
-    def span(identifier, locator)
+    def span(identifier, locator={index: 0}, &block)
       define_method(identifier) do
-        return platform.span_text(locator.clone)
+        return platform.span_text(locator.clone) unless block_given?
       end
       
-      common_definition_methods(identifier, locator, __method__)
+      common_definition_methods(identifier, locator, __method__, &block)
     end
     
-    def button(identifier, locator)
+    def button(identifier, locator={index: 0}, &block)
       define_method(identifier) do
-        return platform.button_click(locator.clone)
+        return platform.button_click(locator.clone) unless block_given?
       end
       
-      common_definition_methods(identifier, locator, __method__)
+      common_definition_methods(identifier, locator, __method__, &block)
     end
     
-    def text_field(identifier, locator)
+    def text_field(identifier, locator={index: 0}, &block)
       define_method(identifier) do
-        return platform.text_field_get(locator.clone)
+        return platform.text_field_get(locator.clone) unless block_given?
       end
       
       alias_method "#{identifier}_get".to_sym, "#{identifier}".to_sym
       
       define_method("#{identifier}=") do |value|
-        return platform.text_field_set(locator.clone, value)
+        return platform.text_field_set(locator.clone, value) unless block_given?
       end
       
       alias_method "#{identifier}_set", "#{identifier}=".to_sym
       
-      common_definition_methods(identifier, locator, __method__)
-      common_definition_methods(identifier, locator, 'textfield')
+      common_definition_methods(identifier, locator, __method__, &block)
+      common_definition_methods(identifier, locator, 'textfield', &block)
     end
     
-    def text_area(identifier, locator)
+    def text_area(identifier, locator={index: 0}, &block)
       define_method(identifier) do
-        return platform.text_area_get(locator.clone)
+        return platform.text_area_get(locator.clone) unless block_given?
       end
 
       alias_method "#{identifier}_get".to_sym, "#{identifier}".to_sym
       
       define_method("#{identifier}=") do |value|
-        return platform.text_area_set(locator.clone, value)
+        return platform.text_area_set(locator.clone, value) unless block_given?
       end
 
       alias_method "#{identifier}_set", "#{identifier}=".to_sym
       
-      common_definition_methods(identifier, locator, __method__)
-      common_definition_methods(identifier, locator, 'textarea')
+      common_definition_methods(identifier, locator, __method__, &block)
+      common_definition_methods(identifier, locator, 'textarea', &block)
     end
     
-    def checkbox(identifier, locator)
+    def checkbox(identifier, locator={index: 0}, &block)
       define_method("#{identifier}_checked?") do
-        return platform.checkbox_check_state(locator.clone)
+        return platform.checkbox_check_state(locator.clone) unless block_given?
       end
 
       define_method("check_#{identifier}") do
-        return platform.checkbox_check(locator.clone)
+        return platform.checkbox_check(locator.clone) unless block_given?
       end
       
       alias_method "#{identifier}_check".to_sym, "check_#{identifier}".to_sym
       
       define_method("uncheck_#{identifier}") do
-        return platform.checkbox_uncheck(locator.clone)
+        return platform.checkbox_uncheck(locator.clone) unless block_given?
       end
 
       alias_method "#{identifier}_uncheck".to_sym, "uncheck_#{identifier}".to_sym
       
-      common_definition_methods(identifier, locator, __method__)
+      common_definition_methods(identifier, locator, __method__, &block)
     end
     
-    def select_list(identifier, locator)
+    def select_list(identifier, locator={index: 0}, &block)
       define_method(identifier) do
-        return platform.select_list_get_selected(locator.clone)
+        return platform.select_list_get_selected(locator.clone) unless block_given?
       end
 
       alias_method "#{identifier}_get".to_sym, "#{identifier}".to_sym
       alias_method "#{identifier}_option?".to_sym, "#{identifier}".to_sym
       
       define_method("#{identifier}_set") do |value|
-        return platform.select_list_set(locator.clone, value)
+        return platform.select_list_set(locator.clone, value) unless block_given?
       end
       
       alias_method "#{identifier}_select", "#{identifier}_set".to_sym
@@ -164,124 +164,124 @@ module Fluent
       end
 
       define_method("#{identifier}_value?") do
-        return platform.select_list_get_value(locator.clone)
+        return platform.select_list_get_value(locator.clone) unless block_given?
       end
       
-      common_definition_methods(identifier, locator, __method__)
+      common_definition_methods(identifier, locator, __method__, &block)
     end
     
-    def radio(identifier, locator)
+    def radio(identifier, locator={index: 0}, &block)
       define_method("set_#{identifier}") do
-        return platform.radio_select(locator.clone)
+        return platform.radio_select(locator.clone) unless block_given?
       end
 
       alias_method "#{identifier}_set".to_sym, "set_#{identifier}".to_sym
       
       define_method("#{identifier}_set?") do
-        return platform.radio_check_state(locator.clone)
+        return platform.radio_check_state(locator.clone) unless block_given?
       end
       
-      common_definition_methods(identifier, locator, __method__)
-      common_definition_methods(identifier, locator, 'radio_button')
+      common_definition_methods(identifier, locator, __method__, &block)
+      common_definition_methods(identifier, locator, 'radio_button', &block)
     end
     
-    def ordered_list(identifier, locator)
+    def ordered_list(identifier, locator={index: 0}, &block)
       define_method(identifier) do
-        return platform.ordered_list_text(locator.clone)
+        return platform.ordered_list_text(locator.clone) unless block_given?
       end
       
-      common_definition_methods(identifier, locator, __method__)
-      common_definition_methods(identifier, locator, 'ol')
+      common_definition_methods(identifier, locator, __method__, &block)
+      common_definition_methods(identifier, locator, 'ol', &block)
     end
 
-    def unordered_list(identifier, locator)
+    def unordered_list(identifier, locator={index: 0}, &block)
       define_method(identifier) do
-        return platform.unordered_list_text(locator.clone)
+        return platform.unordered_list_text(locator.clone) unless block_given?
       end
 
-      common_definition_methods(identifier, locator, __method__)
-      common_definition_methods(identifier, locator, 'ul')
+      common_definition_methods(identifier, locator, __method__, &block)
+      common_definition_methods(identifier, locator, 'ul', &block)
     end
     
-    def list_item(identifier, locator)
+    def list_item(identifier, locator={index: 0}, &block)
       define_method(identifier) do
-        return platform.list_item_text(locator.clone)
+        return platform.list_item_text(locator.clone) unless block_given?
       end
       
-      common_definition_methods(identifier, locator, __method__)
-      common_definition_methods(identifier, locator, 'li')
+      common_definition_methods(identifier, locator, __method__, &block)
+      common_definition_methods(identifier, locator, 'li', &block)
     end
     
-    def table(identifier, locator)
+    def table(identifier, locator={index: 0}, &block)
       define_method(identifier) do
-        return platform.table_text(locator.clone)
+        return platform.table_text(locator.clone) unless block_given?
       end
       
-      common_definition_methods(identifier, locator, __method__)
+      common_definition_methods(identifier, locator, __method__, &block)
     end
 
-    def cell(identifier, locator)
+    def cell(identifier, locator={index: 0}, &block)
       define_method(identifier) do
-        return platform.cell_text(locator.clone)
+        return platform.cell_text(locator.clone) unless block_given?
       end
 
-      common_definition_methods(identifier, locator, __method__)
-      common_definition_methods(identifier, locator, 'td')
+      common_definition_methods(identifier, locator, __method__, &block)
+      common_definition_methods(identifier, locator, 'td', &block)
     end
     
-    def label(identifier, locator)
+    def label(identifier, locator={index: 0}, &block)
       define_method(identifier) do
-        return platform.label_text(locator.clone)
+        return platform.label_text(locator.clone) unless block_given?
       end
 
-      common_definition_methods(identifier, locator, __method__)
+      common_definition_methods(identifier, locator, __method__, &block)
     end
     
-    def hidden(identifier, locator)
+    def hidden(identifier, locator={index: 0}, &block)
       define_method(identifier) do
-        return platform.hidden_value(locator.clone)
+        return platform.hidden_value(locator.clone) unless block_given?
       end
-
-      common_definition_methods(identifier, locator, __method__)
+      
+      common_definition_methods(identifier, locator, __method__, &block)
     end
     
-    def form(identifier, locator)
-      common_definition_methods(identifier, locator, __method__)
+    def form(identifier, locator={index: 0}, &block)
+      common_definition_methods(identifier, locator, __method__, &block)
     end
     
-    def image(identifier, locator)
+    def image(identifier, locator={index: 0}, &block)
       define_method("#{identifier}_loaded?") do
-        return platform.image_action(locator.clone, 'loaded?')
+        return platform.image_action(locator.clone, 'loaded?') unless block_given?
       end
 
       define_method("#{identifier}_height") do
-        return platform.image_action(locator.clone, 'height')
+        return platform.image_action(locator.clone, 'height') unless block_given?
       end
 
       define_method("#{identifier}_width") do
-        return platform.image_action(locator.clone, 'width')
+        return platform.image_action(locator.clone, 'width') unless block_given?
       end
       
       define_method("#{identifier}_src") do
-        return platform.image_get_source(locator.clone)
+        return platform.image_get_source(locator.clone) unless block_given?
       end
 
       define_method("#{identifier}_alt") do
-        return platform.image_get_alt_text(locator.clone)
+        return platform.image_get_alt_text(locator.clone) unless block_given?
       end
       
-      common_definition_methods(identifier, locator, __method__)
-      common_definition_methods(identifier, locator, 'img')
+      common_definition_methods(identifier, locator, __method__, &block)
+      common_definition_methods(identifier, locator, 'img', &block)
     end
     
     [:h1, :h2, :h3, :h4, :h5, :h6].each do |method|
-      define_method(method) do |identifier, locator|
+      define_method(method) do |identifier, locator={index: 0}, &block|
         define_method(identifier) do
           platform_method = "#{method.to_s}_text"
-          return platform.send(platform_method, locator.clone)
+          return platform.send(platform_method, locator.clone) unless block_given?
         end
         
-        common_definition_methods(identifier, locator, method)
+        common_definition_methods(identifier, locator, method, &block)
       end
     end
     
@@ -296,16 +296,19 @@ module Fluent
     alias_method :td, :cell
     alias_method :img, :image
     
-    def common_definition_methods(identifier, locator, method)
+    def common_definition_methods(identifier, locator, method, &block)
       define_method("#{identifier}_object") do
+        return process_block(&block) if block_given?
         platform.send(method, locator.clone)
       end
       
       define_method("#{identifier}_exists?") do
+        return process_block(&block).exists? if block_given?
         platform.send(method, locator.clone).exists?
       end
 
       define_method("#{identifier}_visible?") do
+        return process_block(&block).visible? if block_given?
         platform.send(method, locator.clone).visible?
       end
             
@@ -329,6 +332,7 @@ module Fluent
       
       if Fluent.can_be_enabled?(method)
         define_method("#{identifier}_enabled?") do
+          return process_block(&block).enabled? if block_given?
           platform.send(method, locator.clone).enabled?
         end
 
@@ -358,8 +362,9 @@ module Fluent
     element_set = ELEMENT_LIST.clone
     element_set[element_set.find_index(:checkbox)] = :checkboxe
     element_set.each do |selector|
-      define_method("#{selector}s") do |identifier, *locator|
+      define_method("#{selector}s") do |identifier, *locator, &block|
         define_method("#{identifier}_elements") do
+          return process_block(&block) unless block.nil?
           platform_method = "#{selector.to_s}s" unless selector == :checkboxe
           platform_method = "checkboxes" if selector == :checkboxe
           platform.send platform_method, (locator.first ? locator.first.clone : {})

data/lib/fluent/version.rb

@@ -1,3 +1,3 @@
 module Fluent
-  VERSION = '0.7.3'
+  VERSION = '0.7.4'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fluent
 version: !ruby/object:Gem::Version
-  version: 0.7.3
+  version: 0.7.4
 platform: ruby
 authors:
 - Jeff Nyman
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-18 00:00:00.000000000 Z
+date: 2013-12-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -39,33 +39,33 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: require_all
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: require_all
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
+        version: '2.0'
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: watir-webdriver
   requirement: !ruby/object:Gem::Requirement
@@ -86,14 +86,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.38.0
+        version: 2.39.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.38.0
+        version: 2.39.0
 - !ruby/object:Gem::Dependency
   name: mechanize
   requirement: !ruby/object:Gem::Requirement