watirgrid 1.1.0 → 1.1.1

data/Rakefile

@@ -9,7 +9,7 @@ begin
     gem.email = "tim.koops@gmail.com"
     gem.homepage = "http://github.com/90kts/watirgrid"
     gem.authors = ["Tim Koopmans"]
-    gem.version = "1.1.0"
+    gem.version = "1.1.1"
   end
 rescue LoadError
   puts "Jeweler (or a dependency) not available. Install it with: sudo gem install jeweler"

data/lib/provider.rb

@@ -37,6 +37,10 @@ module Watir
           require 'watir-webdriver'
           require 'watir-webdriver-performance'
           @browser = Watir::Browser
+        when :webdriver_remote
+          require 'watir-webdriver'
+          require 'selenium-webdriver'
+          @browser = Watir::Browser
         when :selenium
           require 'selenium-webdriver'
           @browser = Selenium::WebDriver
@@ -46,9 +50,19 @@ module Watir
     def new_browser(webdriver_browser_type = :firefox)
       case @browser.inspect
       when "Selenium::WebDriver"
-        @browser.for webdriver_browser_type
+        if webdriver_browser_type == :htmlunit
+          caps = Selenium::WebDriver::Remote::Capabilities.htmlunit(:javascript_enabled => true)
+          @browser.for(:remote, :url => "http://127.0.0.1:4444/wd/hub", :desired_capabilities => caps)
+        else
+          @browser.for webdriver_browser_type
+        end
       when "Watir::Browser"
-        @browser.new webdriver_browser_type
+        if webdriver_browser_type == :htmlunit
+          caps = Selenium::WebDriver::Remote::Capabilities.htmlunit(:javascript_enabled => true)
+          @browser.new(:remote, :url => "http://127.0.0.1:4444/wd/hub", :desired_capabilities => caps)
+        else
+          @browser.new webdriver_browser_type
+        end
       when "Watir::Safari"
         @browser.new
       when "FireWatir::Firefox"

data/lib/watirgrid.rb

@@ -50,33 +50,21 @@ module Watir
 
     ##
     # This is a helper method to control a grid.
-    # It involves some general block thuggery and could
-    # honestly benefit from some brutal refactoring...
     def self.control(params = {}, &block)
       log  = Logger.new(STDOUT, 'daily')
       log.level = params[:loglevel] || Logger::ERROR
       grid = self.new(params)
-      grid.start(:take_all => true)
-      log.debug("Grid size                         : #{grid.size}")
-      log.debug("Grid rampup                       : #{rampup(grid.size, params)} secs")
+      grid.start(:read_all => true)
       threads = []
       grid.browsers.each_with_index do |browser, index|
         sleep rampup(grid.size, params)
         threads << Thread.new do
           start = ::Time.now
-          log.debug("Browser #{index+1}##{Thread.current.object_id} start         : #{::Time.now}")
-          log.debug("Browser #{index+1}##{Thread.current.object_id} architecture  : #{browser[:architecture]}")
-          log.debug("Browser #{index+1}##{Thread.current.object_id} type          : #{browser[:browser_type]}")
-          log.debug("Browser #{index+1}##{Thread.current.object_id} hostname      : #{browser[:hostname]}")
           @browser = browser[:object].new_browser
-          yield @browser, "#{index+1}##{Thread.current.object_id}"
-          log.debug("Browser #{index+1}##{Thread.current.object_id} stop          : #{::Time.now}")
-          log.debug("Browser #{index+1}##{Thread.current.object_id} elapsed       : #{(::Time.now - start).to_i} secs")
-          #@browser.close
+          yield @browser, "#{index}"
         end
       end
       threads.each {|thread| thread.join}
-      grid.release_tuples
     end
 
     private

data/spec/control_spec.rb

@@ -0,0 +1,27 @@
+require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
+
+describe 'Using the Grid Control method' do
+  before(:all) do
+    @controller = Controller.new(
+      :ring_server_port => 12357,
+      :loglevel => Logger::ERROR)
+    @controller.start
+    provider = Provider.new(
+      :ring_server_port => 12357,
+      :loglevel => Logger::ERROR, :browser_type => 'safari')
+    provider.start
+  end
+
+  after(:all) do
+    @controller.stop
+  end
+
+  it 'should control a grid' do
+    Watir::Grid.control(:ring_server_port => 12357) do |browser, index|
+      p "I am browser index #{index}"
+      browser.goto "google.com"
+      p browser.title
+      browser.close
+    end
+  end
+end

data/spec/webdriver_remote_spec.rb

@@ -1,6 +1,5 @@
 require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', '..', 'lib'))
-require 'extensions/remote'
 
 describe 'Using the Grid with WebDriver Remote' do
   before(:all) do
@@ -16,12 +15,12 @@ describe 'Using the Grid with WebDriver Remote' do
     @controller.stop
   end
 
-  it 'should take the last provider on the grid and execute some Watir code in WebDriver with HtmlUnit' do
+  it 'should read the provider on the grid and execute some Watir code in WebDriver with HtmlUnit' do
     grid = Watir::Grid.new
-    grid.start(:quantity => 1, :take_all => true)
+    grid.start(:quantity => 1, :read_all => true)
     threads = []
     grid.browsers.each do |browser|
-      threads << Thread.new do 
+      threads << Thread.new do
         b = browser[:object].new_browser(:htmlunit)
         b.goto("http://www.google.com")
         b.text_field(:name, 'q').set("watirgrid")
@@ -32,4 +31,30 @@ describe 'Using the Grid with WebDriver Remote' do
     threads.each {|thread| thread.join}
     grid.size.should == 1
   end
+
+  it 'should read the provider on the grid and execute some Watir code in WebDriver with HtmlUnit' do
+    grid = Watir::Grid.new
+    grid.start(:quantity => 1, :read_all => true)
+    threads = []
+    grid.browsers.each do |browser|
+      threads << Thread.new do
+        vusers = []
+        3.times do
+          vusers << Thread.new do
+            b = browser[:object].new_browser(:htmlunit)
+            b.goto("http://www.google.com")
+            b.text_field(:name => "q").set "watirgrid"
+            b.button(:name => "btnG").click
+            b.div(:id => "resultStats").wait_until_present
+            p "Displaying page: '#{b.title}' with results: '#{b.div(:id => "resultStats").text}'"
+            b.close
+          end
+          vusers.each {|vuser| vuser.join}
+        end
+      end
+    end
+    threads.each {|thread| thread.join}
+    grid.size.should == 1
+  end
+
 end

data/watirgrid.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{watirgrid}
-  s.version = "1.0.6"
+  s.version = "1.1.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Tim Koopmans"]
-  s.date = %q{2011-04-19}
+  s.date = %q{2011-04-20}
   s.description = %q{WatirGrid allows for distributed testing across a grid network using Watir.}
   s.email = %q{tim.koops@gmail.com}
   s.executables = ["listener", "controller", "provider"]

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: watirgrid
 version: !ruby/object:Gem::Version 
-  hash: 19
+  hash: 17
   prerelease: 
   segments: 
   - 1
   - 1
-  - 0
-  version: 1.1.0
+  - 1
+  version: 1.1.1
 platform: ruby
 authors: 
 - Tim Koopmans
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-20 00:00:00 +10:00
+date: 2011-05-04 00:00:00 +10:00
 default_executable: 
 dependencies: []
 
@@ -45,13 +45,12 @@ files:
 - examples/cucumber/example.feature
 - examples/cucumber/step_definitions/example_steps.rb
 - lib/controller.rb
-- lib/extensions/remote.rb
 - lib/listener.rb
 - lib/provider.rb
 - lib/watirgrid.rb
 - rdoc/logo.png
+- spec/control_spec.rb
 - spec/grid_spec.rb
-- spec/gridinit_spec.rb
 - spec/memory_spec.rb
 - spec/selenium_webdriver_spec.rb
 - spec/spec_helper.rb
@@ -98,8 +97,8 @@ test_files:
 - examples/basic/example_webdriver.rb
 - examples/basic/example_webdriver_remote.rb
 - examples/cucumber/step_definitions/example_steps.rb
+- spec/control_spec.rb
 - spec/grid_spec.rb
-- spec/gridinit_spec.rb
 - spec/memory_spec.rb
 - spec/selenium_webdriver_spec.rb
 - spec/spec_helper.rb

data/lib/extensions/remote.rb

@@ -1,39 +0,0 @@
-#!/usr/bin/env ruby 
-# remote.rb
-# Rinda Ring Provider
-
-require 'rinda/ring'
-require 'rinda/tuplespace'
-require 'logger'
-require 'drb/acl'
-require 'uuid'
-require 'selenium/server'
-include Selenium
-@server = Selenium::Server.new(File.expand_path(File.dirname(__FILE__)) + '/selenium-server-standalone-2.0b1.jar', :background => true)
-@server.start  
-
-module Watir
-  class Provider
-
-    include DRbUndumped # all objects will be proxied, not copied
-
-    attr_reader :browser
-
-    def initialize(browser = nil)
-      browser = (browser || 'tmp').downcase.to_sym 
-      case browser
-				when :webdriver_remote
-					require 'watir-webdriver'
-          @browser = Watir::Browser
-      end    
-    end
-  
-    def new_browser(webdriver_browser_type = nil)
-      if webdriver_browser_type == :htmlunit 
-        capabilities = WebDriver::Remote::Capabilities.htmlunit(:javascript_enabled => true)
-        @browser.new(:remote, :url => "http://127.0.0.1:4444/wd/hub", :desired_capabilities => capabilities)
-      end
-    end
-  
-  end
-end

data/spec/gridinit_spec.rb

@@ -1,63 +0,0 @@
-require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
-
-describe 'Using the Grid in GRIDinit style' do
-  before(:all) do
-    @controller = Controller.new(
-      :drb_server_port  => 12357,
-      :ring_server_port => 12358,
-      :ring_server_host => '127.0.0.1',
-      :loglevel => Logger::ERROR)
-    @controller.start
-    1.upto(5) do
-      provider = Provider.new(
-        :ring_server_port => 12358,
-        :ring_server_host => '127.0.0.1',
-        :drb_server_host => '127.0.0.1',
-        :loglevel => Logger::ERROR,
-        :browser_type => 'webdriver')
-      provider.start
-    end
-  end
-
-  after(:all) do
-    @controller.stop
-  end
-
-  it 'should take 1 provider via a direct controller_uri' do
-    grid = Watir::Grid.new(:controller_uri => 'druby://127.0.0.1:12357',
-                           :drb_server_host => '127.0.0.1')
-    grid.start(:quantity => 3, :take_all => true, :browser_type => 'webdriver')
-    grid.size.should == 3
-  end
-
-  it 'should control the grid using a helper method' do
-    Watir::Grid.control({:controller_uri => 'druby://127.0.0.1:12357',:loglevel => Logger::DEBUG}) do |browser, id|
-      3.times do |iteration|
-        browser.goto "http://127.0.0.1/#id=#{id}&iter=#{iteration}"
-        sleep 0.5
-      end
-      browser.close
-    end
-  end
-
-  it 'should take all remaining providers via a direct controller_uri' do
-    grid = Watir::Grid.new(:controller_uri => 'druby://127.0.0.1:12357',
-                           :drb_server_host => '127.0.0.1')
-    grid.start(:take_all => true, :browser_type => 'webdriver')
-    grid.size.should == 2
-  end
-
-  it 'should add new providers via a direct controller_uri' do
-    provider = Provider.new(
-      :controller_uri => 'druby://127.0.0.1:12357',
-      :drb_server_host => '127.0.0.1',
-      :loglevel => Logger::ERROR,
-      :browser_type => 'webdriver')
-    provider.start
-    grid = Watir::Grid.new(:controller_uri => 'druby://127.0.0.1:12357',
-                           :drb_server_host => '127.0.0.1')
-    grid.start(:take_all => true, :browser_type => 'webdriver')
-    grid.size.should == 1
-  end
-
-end