fluent 0.3.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 53bf5738dcf39690dc07ba2dddb31c18a6258738
-  data.tar.gz: 6d0786f388d7317f0b973da560f9acb1e9fb72e6
+  metadata.gz: 83879b044030a03d6874a004d81a15013eb36507
+  data.tar.gz: 8d373bac702368bb6b66af1f762a0e95d527ceb9
 SHA512:
-  metadata.gz: 44341db669c208f238ee6ea76845f7de15d441a116bfd7865c51d0bcf1230acc7d260416c254f1c543b9bf2af5bb83f93a7d368466a7748d7ddb9e508db9b879
-  data.tar.gz: 9153f09f1b8a7b31e847ae69e3de19281dd5543f4dbd51da2a77f479e2b387f5f8182760bdc5209ceff11fc5938e068fe42a379f65f2c28ca0c7363d1ecc7fc0
+  metadata.gz: 54a3cee3e749c9f5a704bd5d0a1d8a2cb9c5db3173cfe0258bc0807bb52436e1c17e926c4ebeb0d407ffe615515e74df86bf1c356708ef391ca0d33511fb2b52
+  data.tar.gz: b020387965fde7eb8e7574c1cca3924303796da4a4e5f50da033257a727e15f7a8864ee411743dec4a4d32cf05e2a8efc801dbdbfc024d06cbf20cc3f2aa077b

data/HISTORY.md

@@ -1,6 +1,13 @@
 Change Log and History
 ======================
 
+Version 0.4.0 / 2013-11-13
+--------------------------
+
+This release is relatively minor in terms of number of changes but it does change some aspects of how drivers are specified. Prior to this release, Fluent counted on there being a @browser instance in order to create a platform object. That is now a @driver instance. Further, Fluent used to default solely to testing with browsers and thus Watir WebDriver was used as a default. The ability to support drivers by default is now removed.
+
+The reason for that is Fluent is now supporting Mechanize. While that is technically "just another browser" it is different enough in interface implementation, that it was no longer feasible to assume GUI-based browsers as a default option. What this means is that Fluent can now create a platform object for Mechanize.
+
 Version 0.3.0 / 2013-10-29
 --------------------------
 

data/fluent.gemspec

@@ -29,4 +29,5 @@ Gem::Specification.new do |spec|
 
   spec.add_runtime_dependency 'watir-webdriver', '0.6.4'
   spec.add_runtime_dependency 'selenium-webdriver', '2.37.0'
+  spec.add_runtime_dependency 'mechanize', '2.7.2'
 end

data/lib/fluent.rb

@@ -9,6 +9,7 @@ require 'fluent/generators'
 
 require 'watir-webdriver'
 require 'selenium-webdriver'
+require 'mechanize'
 
 module Fluent
   include Platforms
@@ -19,7 +20,7 @@ module Fluent
   # [Watir::Browser] or [Selenium::WebDriver::Driver]
   #
   # @return [Object] browser driver reference
-  attr_reader :browser
+  attr_reader :driver
 
   # Platform references will be:
   # [Fluent::Platforms::WatirWebDriver::PlatformObject]
@@ -51,15 +52,13 @@ module Fluent
   #   (1) A browser instance is being created.
   #   (2) A platform object is created for that browser.
   #
-  # @param browser [Object] a browser instance with a tool driver
-  def initialize(browser=nil, visit=nil)
-    @browser = browser
-    @browser = Watir::Browser.new if browser.nil? or browser == :watir
-    @browser = Selenium::WebDriver.for :firefox if browser == :selenium
-
-    Fluent::trace("Fluent attached to browser: #{@browser}")
+  # @param driver [Object] a tool driver instance
+  def initialize(driver=nil, visit=nil)
+    @driver = driver
+    
+    Fluent::trace("Fluent attached to driver: #{@driver}")
     
-    establish_platform_object_for @browser
+    establish_platform_object_for @driver
     
     view if visit && respond_to?(:view)
   end

data/lib/fluent/evaluators.rb

@@ -55,7 +55,7 @@ module Fluent
     def wait_for_pending_requests(time_limit=30, message_if_timeout=nil)
       end_time = ::Time.now + time_limit
       until ::Time.now > end_time
-        return if browser.execute_script('return jQuery.active') == 0
+        return if driver.execute_script('return jQuery.active') == 0
         wait_for_app 0.5
       end
       message = 'Pending jQuery requests never indicated completion.' unless message_if_timeout

data/lib/fluent/factory.rb

@@ -10,7 +10,7 @@ module Fluent
       definition = get_object_for(definition) if definition.is_a? String
       
       return @active if @active.kind_of?(definition)
-      @active = definition.new(@browser, visit)
+      @active = definition.new(@driver, visit)
       block.call @active if block
       
       @active

data/lib/fluent/generators.rb

@@ -10,8 +10,8 @@ module Fluent
       end
       
       define_method('check_url') do
-        msg  = "Expected url: '#{url}'; Actual url: '#{browser.url}'"
-        valid_url = url == browser.url
+        msg  = "Expected url: '#{url}'; Actual url: '#{driver.url}'"
+        valid_url = url == driver.url
         raise Fluent::Errors::UrlNotMatched, msg unless valid_url
       end
     end
@@ -21,9 +21,9 @@ module Fluent
       raise Fluent::Errors::NoTitleForDefinition, msg if title.nil?
       
       define_method('check_title') do
-        msg  = "Expected title: '#{title}'; Actual title: '#{browser.title}'"
-        valid_title = title == browser.title if title.kind_of?(String)
-        valid_title = title =~ browser.title if title.kind_of?(Regexp)
+        msg  = "Expected title: '#{title}'; Actual title: '#{driver.title}'"
+        valid_title = title == driver.title if title.kind_of?(String)
+        valid_title = title =~ driver.title if title.kind_of?(Regexp)
         raise Fluent::Errors::TitleNotMatched, msg unless valid_title
         valid_title
       end

data/lib/fluent/platform_mechanize.rb

@@ -0,0 +1,18 @@
+module Fluent
+  module Platforms
+    module MechanizeDriver
+
+      def self.create_platform_object_for(driver)
+        require 'fluent/platform_mechanize/platform_object'
+        return MechanizeDriver::PlatformObject.new(driver)
+      end
+
+      def self.works_with?(driver)
+        driver.is_a?(::Mechanize)
+      end
+
+    end
+  end
+end
+
+Fluent::Platforms.register(:mechanize, Fluent::Platforms::MechanizeDriver)

data/lib/fluent/platform_mechanize/platform_object.rb

@@ -0,0 +1,21 @@
+module Fluent
+  module Platforms
+    module MechanizeDriver
+      class PlatformObject
+
+        attr_reader :driver
+
+        def initialize(driver)
+          @driver = driver
+        end
+
+        ## Browser-Level Actions ##
+
+        def visit(url)
+          driver.get(url)
+        end
+
+      end
+    end
+  end
+end

data/lib/fluent/platform_selenium.rb

@@ -2,13 +2,13 @@ module Fluent
   module Platforms
     module SeleniumWebDriver
 
-      def self.create_platform_object_for(browser)
+      def self.create_platform_object_for(driver)
         require 'fluent/platform_selenium/platform_object'
-        return SeleniumWebDriver::PlatformObject.new(browser)
+        return SeleniumWebDriver::PlatformObject.new(driver)
       end
 
-      def self.works_with?(browser)
-        browser.is_a?(::Selenium::WebDriver::Driver)
+      def self.works_with?(driver)
+        driver.is_a?(::Selenium::WebDriver::Driver)
       end
 
     end

data/lib/fluent/platform_selenium/platform_object.rb

@@ -3,16 +3,16 @@ module Fluent
     module SeleniumWebDriver
       class PlatformObject
 
-        attr_reader :browser
+        attr_reader :driver
         
-        def initialize(browser)
-          @browser = browser
+        def initialize(driver)
+          @driver = driver
         end
 
         ## Browser-Level Actions ##
 
         def visit(url)
-          browser.navigate.to(url)
+          driver.navigate.to(url)
         end
         
       end

data/lib/fluent/platform_watir.rb

@@ -2,13 +2,13 @@ module Fluent
   module Platforms
     module WatirWebDriver
       
-      def self.create_platform_object_for(browser)
+      def self.create_platform_object_for(driver)
         require 'fluent/platform_watir/platform_object'
-        return WatirWebDriver::PlatformObject.new(browser)
+        return WatirWebDriver::PlatformObject.new(driver)
       end
       
-      def self.works_with?(browser)
-        browser.is_a?(::Watir::Browser)
+      def self.works_with?(driver)
+        driver.is_a?(::Watir::Browser)
       end
       
     end

data/lib/fluent/platform_watir/platform_object.rb

@@ -3,54 +3,54 @@ module Fluent
     module WatirWebDriver
       class PlatformObject
         
-        attr_reader :browser
+        attr_reader :driver
         
-        def initialize(browser)
-          @browser = browser
+        def initialize(driver)
+          @driver = driver
         end
         
         ## Browser-Level Actions ##
         
         def visit(url)
-          browser.goto(url)
+          driver.goto(url)
         end
         
         def url
-          browser.url
+          driver.url
         end
 
         def remove_cookies
-          browser.cookies.clear
+          driver.cookies.clear
         end
 
         def refresh
-          browser.refresh
+          driver.refresh
         end
 
         def run_script(script)
-          browser.execute_script(script)
+          driver.execute_script(script)
         end
 
         def screenshot(file)
-          browser.wd.save_screenshot(file)
+          driver.wd.save_screenshot(file)
         end
         
         ## Page-Level Actions ##
 
         def markup
-          browser.html
+          driver.html
         end
         
         def title
-          browser.title
+          driver.title
         end
         
         def text
-          browser.text
+          driver.text
         end
 
         def wait_until(timeout, message='wait condition was not found', &block)
-          browser.wait_until(timeout, message, &block)
+          driver.wait_until(timeout, message, &block)
         end
         
         ## Encloser Actions ##
@@ -58,9 +58,9 @@ module Fluent
         def will_alert(&block)
           yield
           value = nil
-          if browser.alert.exists?
-            value = browser.alert.text
-            browser.alert.ok
+          if driver.alert.exists?
+            value = driver.alert.text
+            driver.alert.ok
           end
           value
         end
@@ -68,18 +68,18 @@ module Fluent
         def will_confirm(response, &block)
           yield
           value = nil
-          if browser.alert.exists?
-            value = browser.alert.text
-            response ? browser.alert.ok : browser.alert.close
+          if driver.alert.exists?
+            value = driver.alert.text
+            response ? driver.alert.ok : driver.alert.close
           end
           value
         end
         
         def will_prompt(response, &block)
-          cmd = "window.prompt = function(text, value) {window.__lastWatirPrompt = {message: text, default_value: value}; return #{!!response};}"
-          browser.wd.execute_script(cmd)
+          cmd = "window.prompt = function(text, value) {window.__lastWatirPrompt = {message: text, default_value: value}; return '#{response}';}"
+          driver.wd.execute_script(cmd)
           yield
-          result = browser.wd.execute_script('return window.__lastWatirPrompt')
+          result = driver.wd.execute_script('return window.__lastWatirPrompt')
           result && result.dup.each_key { |k| result[k.to_sym] = result.delete(k) }
           result
         end
@@ -326,7 +326,7 @@ module Fluent
         # @return [Object] the web object identified by the action
         def reference_web_element(action, object, locator)
           encloser = locator.delete(:frame)
-          element_object = browser.instance_eval("#{enclosed_by(encloser)}#{action}")
+          element_object = driver.instance_eval("#{enclosed_by(encloser)}#{action}")
           object.new(element_object, :platform => :watir_webdriver)
         end
 
@@ -340,7 +340,7 @@ module Fluent
         # @return [Any] the information or object returned by the action
         def access_web_element(action, locator, value=nil)
           encloser = locator.delete(:frame)
-          browser.instance_eval("#{enclosed_by(encloser)}#{action}")
+          driver.instance_eval("#{enclosed_by(encloser)}#{action}")
         end
         
         def enclosed_by(encloser)

data/lib/fluent/platforms.rb

@@ -15,13 +15,13 @@ module Fluent
     # decision is based on the browser that has been established for the
     # execution profile.
     #
-    # @param browser [Object] the browser to establish the platform for
+    # @param driver [Object] the browser to establish the platform for
     # @return [Object] a platform object to execute tests against
-    def get_platform_for(browser)
-      Fluent::Platforms.list.each_value do |driver|
-        return driver.create_platform_object_for(browser) if driver.works_with?(browser)
+    def get_platform_for(driver)
+      Fluent::Platforms.list.each_value do |drv|
+        return drv.create_platform_object_for(driver) if drv.works_with?(driver)
       end
-      msg = "Unable to create a platform object for #{browser}."
+      msg = "Unable to create a platform object for #{driver}."
       raise Fluent::Errors::UnableToCreatePlatform, msg
     end
     
@@ -29,4 +29,5 @@ module Fluent
 end
 
 require 'fluent/platform_watir'
-require 'fluent/platform_selenium'
+require 'fluent/platform_selenium'
+require 'fluent/platform_mechanize'

data/lib/fluent/version.rb

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

data/spec/factory_spec.rb

@@ -4,7 +4,7 @@ require 'mock_app'
 class TestFactory
   include Fluent::Factory
 
-  attr_accessor :browser
+  attr_accessor :driver
 end
 
 class DefinitionTest
@@ -16,18 +16,18 @@ end
 describe Fluent::Factory do
   before(:each) do
     @factory = TestFactory.new
-    @factory.browser = mock_browser_for_watir
+    @factory.driver = mock_browser_for_watir
   end
   
   it 'should create a new definition object and view it, using on_view' do
-    @factory.browser.should_receive(:goto)
+    @factory.driver.should_receive(:goto)
     @factory.on_view DefinitionTest do |page|
       page.should be_instance_of DefinitionTest
     end
   end
 
   it 'should create a new definition object, using on' do
-    @factory.browser.should_not_receive(:goto)
+    @factory.driver.should_not_receive(:goto)
     @factory.on DefinitionTest do |page|
       page.should be_instance_of DefinitionTest
     end
@@ -40,7 +40,7 @@ describe Fluent::Factory do
   end
   
   it 'should create a new definition based on a string' do
-    @factory.browser.should_receive(:goto)
+    @factory.driver.should_receive(:goto)
     @factory.on_view "DefinitionTest" do |page|
       page.should be_instance_of DefinitionTest
     end

data/spec/generators_spec.rb

@@ -17,12 +17,7 @@ describe Fluent::Generators do
         selenium_browser.should_receive(:title).twice.and_return('Test App')
         selenium_definition.check_title
       end
-
-      it 'should specify and verify the page url' do
-        watir_browser.should_receive(:url).twice.and_return('http://localhost:4567')
-        watir_definition.check_url
-      end
-      
+    
       it 'should raise an error if the page title is not verified' do
         msg = "Expected title: 'Test App'; Actual title: 'Testing'"
         watir_browser.should_receive(:title).twice.and_return('Testing')
@@ -38,29 +33,34 @@ describe Fluent::Generators do
         watir_browser.should_receive(:title).twice.and_return('Symbiote')
         QuickDefinition.new(watir_browser).check_title
       end
+    end
+    
+    it 'should specify and verify the page url' do
+      watir_browser.should_receive(:url).twice.and_return('http://localhost:4567')
+      watir_definition.check_url
+    end
 
-      it 'should allow frames to act as a context' do
-        watir_browser.should_receive(:frame).with(id: 'frame').and_return(watir_browser)
-        watir_browser.should_receive(:text_field).and_return(watir_browser)
-        web_element = watir_definition.framedName_text_field
-        web_element.should_not be_nil
-        web_element.should be_instance_of Fluent::WebElements::TextField
-      end
-
-      context 'automatically looking for an element' do
-        it 'should specify and verify an expected elements' do
-          watir_definition.should_receive(:name_object).and_return(watir_browser)
-          watir_browser.should_receive(:when_present).with(5).and_return(watir_browser)
-          watir_definition.check_objects
-        end
+    it 'should allow frames to act as a context' do
+      watir_browser.should_receive(:frame).with(id: 'frame').and_return(watir_browser)
+      watir_browser.should_receive(:text_field).and_return(watir_browser)
+      web_element = watir_definition.framedName_text_field
+      web_element.should_not be_nil
+      web_element.should be_instance_of Fluent::WebElements::TextField
+    end
 
-        it 'should raise an error if an expected elements are not verified' do
-          class QuickDefinition
-            include Fluent
-            look_for :fakeLink
-          end
-          expect { QuickDefinition.new(watir_browser).check_objects }.to raise_error
+    context 'automatically looking for an element' do
+      it 'should specify and verify an expected elements' do
+        watir_definition.should_receive(:name_object).and_return(watir_browser)
+        watir_browser.should_receive(:when_present).with(5).and_return(watir_browser)
+        watir_definition.check_objects
+      end
+      
+      it 'should raise an error if an expected elements are not verified' do
+        class QuickDefinition
+          include Fluent
+          look_for :fakeLink
         end
+        expect { QuickDefinition.new(watir_browser).check_objects }.to raise_error
       end
     end
 
@@ -82,6 +82,6 @@ describe Fluent::Generators do
         end
       end
     end
-    
+ 
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fluent
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors:
 - Jeff Nyman
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-29 00:00:00.000000000 Z
+date: 2013-11-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -94,6 +94,20 @@ dependencies:
     - - '='
       - !ruby/object:Gem::Version
         version: 2.37.0
+- !ruby/object:Gem::Dependency
+  name: mechanize
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 2.7.2
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 2.7.2
 description: Provides a semantic DSL to construct a fluent interface for test execution
   libraries.
 email: jeffnyman@gmail.com
@@ -116,6 +130,8 @@ files:
 - lib/fluent/factory.rb
 - lib/fluent/generators.rb
 - lib/fluent/logger.rb
+- lib/fluent/platform_mechanize.rb
+- lib/fluent/platform_mechanize/platform_object.rb
 - lib/fluent/platform_selenium.rb
 - lib/fluent/platform_selenium/platform_object.rb
 - lib/fluent/platform_watir.rb