watirgrid 1.1.3 → 1.1.4.pre

data/Rakefile

@@ -9,13 +9,12 @@ begin
     gem.email = "tim.koops@gmail.com"
     gem.homepage = "http://github.com/90kts/watirgrid"
     gem.authors = ["Tim Koopmans"]
-    gem.version = "1.1.3"
+    gem.version = "1.1.4.pre"
   end
 rescue LoadError
   puts "Jeweler (or a dependency) not available. Install it with: sudo gem install jeweler"
 end
 
-require 'spec/rake/spectask'
 require 'rake/rdoctask'
 Rake::RDocTask.new do |rdoc|
   version = File.exist?('VERSION') ? File.read('VERSION') : ""

data/bin/provider

@@ -95,6 +95,7 @@ provider = Provider.new(
   :ring_server_host => options[:ring_server_host],
   :ring_server_port => options[:ring_server_port] || 12358,
   :driver           => options[:driver] || nil,
+  :browser_type     => options[:browser_type] || nil,
   :controller_uri   => options[:controller_uri] || nil,
   :acls             => options[:acls] || %w{ allow all },
   :loglevel         => options[:loglevel])

data/examples/basic/example_safariwatir.rb

@@ -8,24 +8,15 @@ controller = Controller.new
 controller.start
 
 # Start a Provider with SafariWatir
-provider = Provider.new(:browser_type => 'safari')
+provider = Provider.new(:driver => 'safariwatir')
 provider.start
 
-# Start a Grid
-grid = Watir::Grid.new
-grid.start(:take_all => true)
-
 # Control the Providers via the Grid
-# We only have one Provider on the Grid so no real need for threads
-# however keeping the thread construct for example only
-threads = []
-  grid.browsers.each_with_index do |browser, index|
-    threads << Thread.new do
-      b = browser[:object].new_browser
-      b.goto("http://www.google.com")
-      b.text_field(:name, 'q').set("watirgrid")
-      b.button(:name, "btnI").click
-      b.close
-    end
-  end
-threads.each {|thread| thread.join}
+Watir::Grid.control do |browser, index|
+  p "I am browser index #{index}"
+  browser.goto "http://google.com"
+  p browser.title
+  browser.text_field(:name, 'q').set("watirgrid")
+  browser.button(:name, "btnI").click
+  browser.close
+end

data/examples/basic/example_webdriver.rb

@@ -9,32 +9,16 @@ controller.start
 
 # Start 2 Providers with WebDriver
 1.upto(2) do
-  provider = Provider.new(:browser_type => 'webdriver')
+  provider = Provider.new(:driver => 'webdriver')
   provider.start
 end
 
-# Start another Grid
-grid = Watir::Grid.new
-grid.start(:take_all => true)
-
-# Control the first Provider via the Grid using Firefox
-# Note when we have a WebDriver object we also need to specify the target 
-# browser in new_browser method
-thread = Thread.new do 
-  b = grid.browsers[0][:object].new_browser(:firefox)
-  b.goto("http://google.com")
-  b.text_field(:name, 'q').set("watirgrid")
-  b.button(:name, "btnI").click
-  b.close
-end
-thread.join
-
-# Control the second Provider via the Grid, this time using Chrome
-thread = Thread.new do 
-  b = grid.browsers[1][:object].new_browser(:chrome)
-  b.goto("http://google.com")
-  b.text_field(:name, 'q').set("watirgrid")
-  b.button(:name, "btnI").click
-  b.close
+# Control the Providers via the Grid
+Watir::Grid.control(:browser_type => 'firefox') do |browser, index|
+  p "I am browser index #{index}"
+  browser.goto "http://google.com"
+  p browser.title
+  browser.text_field(:name, 'q').set("watirgrid")
+  browser.button(:name, "btnI").click
+  browser.close
 end
-thread.join

data/examples/cucumber/support/env.rb

@@ -10,10 +10,10 @@ controller = Controller.new(
   :loglevel => Logger::ERROR)
 controller.start
 
-1.times do
+2.times do
   provider = Provider.new(
     :ring_server_port => 12357,
-    :loglevel => Logger::ERROR, :browser_type => 'webdriver')
+    :loglevel => Logger::ERROR, :driver => 'webdriver')
   provider.start
 end
 
@@ -29,7 +29,7 @@ if ENV["GRID"] then
   # params[:controller_uri]  = ENV["controller_uri"]
 
   # Now for the other params
-  params[:browser]         = 'chrome' # type of webdriver browser to spawn
+  params[:browser_type]    = 'firefox' # type of webdriver browser to spawn
   params[:quantity]        = 20       # max number of browsers to use
   params[:rampup]          = 10       # seconds
   grid ||= Watir::Grid.new(params)

data/examples/parallel/cucumber/support/env.rb

@@ -9,7 +9,7 @@ ENV["controller_uri"] = "druby://10.0.1.3:11235"
 if ENV["GRID"] then
   params = {}
   params[:controller_uri]   = ENV["controller_uri"]
-  params[:browser]          = 'chrome' # type of webdriver browser to spawn
+  params[:browser_type]     = 'chrome' # type of webdriver browser to spawn
   grid ||= Watir::Grid.new(params)
   grid.start(:initiate => true, :quantity => 1, :take_all => true)
 else

data/lib/listener.rb

@@ -17,11 +17,11 @@ class Listener
   def start
     DRb.start_service
     ring_server = DRbObject.new(nil, @controller_uri)
-    service = ring_server.read([:WatirGrid, nil, nil, nil, nil, nil, nil])
+    service = ring_server.read([:WatirGrid, nil, nil, nil, nil, nil, nil, nil])
     observers = []
-    observers << ring_server.notify('write',[:WatirGrid, nil, nil, nil, nil, nil, nil], nil)
-    observers << ring_server.notify('take', [:WatirGrid, nil, nil, nil, nil, nil, nil], nil)
-    observers << ring_server.notify('delete', [:WatirGrid, nil, nil, nil, nil, nil, nil], nil)
+    observers << ring_server.notify('write',[:WatirGrid, nil, nil, nil, nil, nil, nil, nil], nil)
+    observers << ring_server.notify('take', [:WatirGrid, nil, nil, nil, nil, nil, nil, nil], nil)
+    observers << ring_server.notify('delete', [:WatirGrid, nil, nil, nil, nil, nil, nil, nil], nil)
     @log.debug("Listener started on   : #{@controller_uri}")
     threads = []
     observers.each do |observer|

data/lib/provider.rb

@@ -129,7 +129,8 @@ class Provider
                 'A watir provider',
                 hostname,
                 architecture,
-                @driver
+                @driver,
+                @browser_type
     ]
 
     # locate the Rinda Ring Server via a UDP broadcast

data/lib/watirgrid.rb

@@ -55,7 +55,7 @@ module Watir
     def setup
       @browsers.each_with_index do |browser, index|
         sleep 0.15
-        @providers[index] ||= browser[:object].new_browser @browser_type
+        @providers[index] ||= browser[:object].new_browser((browser[:browser_type] || @browser_type))
       end
     end
 
@@ -83,7 +83,7 @@ module Watir
         sleep rampup(grid.size, params)
         threads << Thread.new do
           start = ::Time.now
-          @browser = browser[:object].new_browser params[:browser_type]
+          @browser = browser[:object].new_browser((params[:browser_type] || browser[:browser_type]))
           yield @browser, "#{index}"
         end
       end
@@ -176,7 +176,8 @@ module Watir
         nil, # provider description
         nil, # hostname
         params[:architecture],
-        params[:driver]
+        params[:driver],
+        params[:browser_type]
         ])
     end
 
@@ -213,6 +214,7 @@ module Watir
       tuple_hash[:hostname]     = tuple[4]
       tuple_hash[:architecture] = tuple[5]
       tuple_hash[:driver]       = tuple[6]
+      tuple_hash[:browser_type] = tuple[7]
       tuple_hash
     end
 

data/spec/grid_mixed_spec.rb

@@ -0,0 +1,37 @@
+require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
+require 'childprocess'
+
+describe 'Using the Grid with different Drivers AND Browser Types' do
+  before(:all) do
+    @controller = ChildProcess.build("~/.rvm/gems/ruby-1.8.7-p334/bin/controller -h 127.0.0.1").start
+    sleep 1
+    @provider1  = ChildProcess.build("~/.rvm/gems/ruby-1.8.7-p334/bin/provider -h 127.0.0.1 -p 8001 -d safariwatir").start
+    sleep 1
+    @provider2  = ChildProcess.build("~/.rvm/gems/ruby-1.8.7-p334/bin/provider -h 127.0.0.1 -p 8002 -d webdriver -b firefox").start
+    sleep 2
+  end
+
+  after(:all) do
+    @controller.stop if @controller.alive?
+    @provider1.stop  if @provider1.alive?
+    @provider2.stop  if @provider2.alive?
+  end
+
+  it 'should control a grid' do
+    Watir::Grid.control(:controller_uri => 'druby://127.0.0.1:11235') do |browser, index|
+      p "I am browser index #{index}"
+      browser.goto "http://google.com"
+      p browser.title
+      browser.close
+    end
+  end
+
+  it 'should iterate over a grid' do
+    grid = Watir::Grid.new(:controller_uri => 'druby://127.0.0.1:11235')
+    grid.start(:initiate => true)
+    grid.iterate do |browser|
+      browser.goto "http://google.com"
+      browser.close
+    end
+  end
+end

data/watirgrid.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{watirgrid}
-  s.version = "1.1.3.pre"
+  s.version = "1.1.3"
 
-  s.required_rubygems_version = Gem::Requirement.new("> 1.3.1") if s.respond_to? :required_rubygems_version=
+  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Tim Koopmans"]
-  s.date = %q{2011-05-16}
+  s.date = %q{2011-05-26}
   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"]
@@ -19,7 +19,6 @@ Gem::Specification.new do |s|
   ]
   s.files = [
     ".document",
-    "EXAMPLES.rdoc",
     "LICENSE",
     "README.rdoc",
     "Rakefile",
@@ -40,13 +39,11 @@ Gem::Specification.new do |s|
     "lib/provider.rb",
     "lib/watirgrid.rb",
     "rdoc/logo.png",
-    "spec/control_spec.rb",
-    "spec/grid_spec.rb",
+    "spec/grid_control_spec.rb",
+    "spec/grid_management_spec.rb",
     "spec/memory_spec.rb",
     "spec/selenium_webdriver_spec.rb",
     "spec/spec_helper.rb",
-    "spec/utilities_spec.rb",
-    "spec/webdriver_remote_spec.rb",
     "spec/webdriver_spec.rb",
     "watirgrid.gemspec"
   ]
@@ -62,13 +59,11 @@ Gem::Specification.new do |s|
     "examples/cucumber/support/env.rb",
     "examples/parallel/cucumber/step_definitions/example_steps.rb",
     "examples/parallel/cucumber/support/env.rb",
-    "spec/control_spec.rb",
-    "spec/grid_spec.rb",
+    "spec/grid_control_spec.rb",
+    "spec/grid_management_spec.rb",
     "spec/memory_spec.rb",
     "spec/selenium_webdriver_spec.rb",
     "spec/spec_helper.rb",
-    "spec/utilities_spec.rb",
-    "spec/webdriver_remote_spec.rb",
     "spec/webdriver_spec.rb"
   ]
 

metadata

@@ -1,13 +1,14 @@
 --- !ruby/object:Gem::Specification 
 name: watirgrid
 version: !ruby/object:Gem::Version 
-  hash: 21
-  prerelease: 
+  hash: 961915980
+  prerelease: 6
   segments: 
   - 1
   - 1
-  - 3
-  version: 1.1.3
+  - 4
+  - pre
+  version: 1.1.4.pre
 platform: ruby
 authors: 
 - Tim Koopmans
@@ -15,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-26 00:00:00 +10:00
+date: 2011-06-05 00:00:00 +10:00
 default_executable: 
 dependencies: []
 
@@ -40,7 +41,6 @@ files:
 - bin/provider
 - examples/basic/example_safariwatir.rb
 - examples/basic/example_webdriver.rb
-- examples/basic/example_webdriver_remote.rb
 - examples/cucumber/example.feature
 - examples/cucumber/step_definitions/example_steps.rb
 - examples/cucumber/support/env.rb
@@ -54,6 +54,7 @@ files:
 - rdoc/logo.png
 - spec/grid_control_spec.rb
 - spec/grid_management_spec.rb
+- spec/grid_mixed_spec.rb
 - spec/memory_spec.rb
 - spec/selenium_webdriver_spec.rb
 - spec/spec_helper.rb
@@ -80,30 +81,20 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version 
-      hash: 3
+      hash: 25
       segments: 
-      - 0
-      version: "0"
+      - 1
+      - 3
+      - 1
+      version: 1.3.1
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.4.2
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: "WatirGrid: Web Application Testing in Ruby across a grid network."
-test_files: 
-- examples/basic/example_safariwatir.rb
-- examples/basic/example_webdriver.rb
-- examples/basic/example_webdriver_remote.rb
-- examples/cucumber/step_definitions/example_steps.rb
-- examples/cucumber/support/env.rb
-- examples/parallel/cucumber/step_definitions/example_steps.rb
-- examples/parallel/cucumber/support/env.rb
-- spec/grid_control_spec.rb
-- spec/grid_management_spec.rb
-- spec/memory_spec.rb
-- spec/selenium_webdriver_spec.rb
-- spec/spec_helper.rb
-- spec/webdriver_spec.rb
+test_files: []
+

data/examples/basic/example_webdriver_remote.rb

@@ -1,34 +0,0 @@
-$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', '..', 'lib'))
-require 'watirgrid'
-require 'extensions/remote'
-
-# Here's some basic examples in plain Ruby with Watirgrid and WebDriver Remote / HtmlUnit
-
-# Start a Controller using defaults
-controller = Controller.new
-controller.start
-
-# Start 50 Providers with WebDriver Remote
-1.upto(50) do
-  provider = Provider.new(:browser_type => 'webdriver_remote')
-  provider.start
-end
-
-# Start another Grid
-@grid = Watir::Grid.new
-@grid.start(:take_all => true)
-threads = []
-  @grid.browsers.each_with_index do |browser, index|
-    sleep 0.5 # let's sleep a little to give a more natural rampup
-    threads << Thread.new do
-      require 'selenium/server'
-      include Selenium
-
-      b = browser[:object].new_browser(:htmlunit)
-      t = Time.now
-      b.goto("http://90kts.local/")
-      puts "#{Thread.current.object_id} : #{b.title} : Elapsed #{Time.now - t}"
-      b.close
-    end
-  end
-threads.each {|thread| thread.join}