watirgrid 1.1.2 → 1.1.3.pre

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.2"
+    gem.version = "1.1.3.pre"
   end
 rescue LoadError
   puts "Jeweler (or a dependency) not available. Install it with: sudo gem install jeweler"

data/bin/provider

@@ -10,7 +10,7 @@ optparse = OptionParser.new do |opts|
   opts.separator ""
   opts.separator "Specific options:"
   opts.on("-b", "--browser-type TYPE",
-  "Specify browser type to register {ie|firefox|safari|webdriver}") do |b|
+  "Specify driver for browser type to register {watir|firewatir|safariwatir|webdriver|zombie}") do |b|
     options[:browser_type] = b
   end
   opts.on("-c", "--controller-uri [URI]",

data/examples/cucumber/example.feature

@@ -4,8 +4,7 @@ Feature: User logons
   able to logon and access the portal in 3 seconds
 
   Scenario: Logon with 50 users in 1 minute
-    Given 50 users open "chrome"
-    And navigate to the portal
+    Given users navigate to the portal
     When they enter their credentials
     Then they should see their account settings
     And the response time should be less than 3 seconds

data/examples/cucumber/step_definitions/example_steps.rb

@@ -1,32 +1,4 @@
-$LOAD_PATH.unshift(File.dirname(__FILE__))
-$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', '..', '..', 'lib'))
-require 'watirgrid'
-require 'rspec/expectations';
-require 'watir-webdriver-performance'
-
-controller = Controller.new(
-  :ring_server_port => 12357,
-  :loglevel => Logger::ERROR)
-controller.start
-
-provider = Provider.new(
-  :ring_server_port => 12357,
-  :loglevel => Logger::ERROR, :browser_type => 'webdriver')
-provider.start
-
-Given /^(\d+) users open "([^"]*)"$/ do |quantity, browser|
-  params={}
-  params[:ring_server_port] = 12357
-  # optionall connect via a controller_uri environment variable
-  # params[:controller_uri]  = ENV["controller_uri"]
-  params[:browser]         = browser        # type of webdriver browser to spawn
-  params[:quantity]        = quantity.to_i  # max number of browsers to use
-  params[:rampup]          = 10             # seconds
-  @grid = Watir::Grid.new(params)
-  @grid.start(:initiate => true)
-end
-
-Given /^navigate to the portal$/ do
+Given /^users navigate to the portal$/ do
   @grid.iterate {|browser| browser.goto "http://gridinit.com/examples/logon.html" }
 end
 
@@ -44,7 +16,7 @@ Then /^they should see their account settings$/ do
   end
 end
 
-Then /^the response time should be less than (d+) seconds$/ do |response_time|
+Then /^the response time should be less than (\d+) seconds$/ do |response_time|
   @grid.iterate do |browser|
     browser.performance.summary[:response_time].should < response_time.to_i * 1000
   end

data/examples/cucumber/support/env.rb

@@ -0,0 +1,72 @@
+$LOAD_PATH.unshift(File.dirname(__FILE__))
+$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', '..', '..', 'lib'))
+require 'watirgrid'
+require 'rspec/expectations';
+require 'watir-webdriver-performance'
+
+# Setup a grid network, normally this is done outside of env.rb
+controller = Controller.new(
+  :ring_server_port => 12357,
+  :loglevel => Logger::ERROR)
+controller.start
+
+1.times do
+  provider = Provider.new(
+    :ring_server_port => 12357,
+    :loglevel => Logger::ERROR, :browser_type => 'webdriver')
+  provider.start
+end
+
+ENV["GRID"] = 'true'
+
+if ENV["GRID"] then
+  params = {}
+  # discover controller via ring server broadcast on UDP port
+  params[:ring_server_port] = 12357
+
+  # OR
+  # optionally connect via a controller_uri environment variable
+  # params[:controller_uri]  = ENV["controller_uri"]
+
+  # Now for the other params
+  params[:browser]         = 'chrome' # type of webdriver browser to spawn
+  params[:quantity]        = 20       # max number of browsers to use
+  params[:rampup]          = 10       # seconds
+  grid ||= Watir::Grid.new(params)
+  grid.start(:initiate => true)
+else
+  grid = []
+  ##
+  # Creating a dummy class when we're not using WatirGrid
+  # so that the design steps can still call an iterate method.
+  class Grid
+    def initialize
+      @browser ||= Watir::Browser.new :chrome
+    end
+    def iterate
+      yield @browser
+    end
+  end
+  grid = Grid.new
+end
+
+##
+# This would be cool if I could modify the instance variable
+# @browser within the proc block created... Then I could get
+# rid of the @grid.iterate method from the design steps ...
+#Around do |scenario, block|
+  #grid.iterate do |browser|
+    #@browser = browser # this doesn't work =(
+    #block.call
+  #end
+#end
+
+Before do
+  @grid = grid
+end
+
+at_exit do
+  grid.iterate do |browser|
+    browser.close
+  end
+end

data/examples/parallel/cucumber/example.feature

@@ -0,0 +1,13 @@
+@NFR-001
+Feature: User logons
+  In order to use the web application users must be
+  able to logon and access the portal in 3 seconds
+
+  Scenario: Logon with 50 users in 1 minute
+    Given users navigate to the portal
+    When they enter their credentials
+    Then they should see their account settings
+
+  Scenario: Bypass logon
+    Given users navigate to the portal
+    When they enter a direct url

data/examples/parallel/cucumber/step_definitions/example_steps.rb

@@ -0,0 +1,17 @@
+Given /^users navigate to the portal$/ do
+  @browser.goto "http://localhost:4567/examples/logon.html"
+end
+
+When /^they enter their credentials$/ do
+  @browser.text_field(:name => "email").set "tim@mahenterprize.com"
+  @browser.text_field(:name => "password").set "mahsecretz"
+  @browser.button(:type => "submit").click
+end
+
+Then /^they should see their account settings$/ do
+  @browser.text.should =~ /Maybe I should get a real Gridinit account/
+end
+
+When /^they enter a direct url$/ do
+  @browser.goto "http://localhost:4567/"
+end

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

@@ -0,0 +1,28 @@
+$LOAD_PATH.unshift(File.dirname(__FILE__))
+$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', '..', '..', '..', 'lib'))
+require 'watirgrid'
+require 'rspec/expectations';
+
+ENV["GRID"] = 'true'
+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
+  grid ||= Watir::Grid.new(params)
+  grid.start(:initiate => true, :quantity => 1, :take_all => true)
+else
+  @browser ||= Watir::Browser.new :chrome
+end
+
+Before do |scenario|
+  @browser = grid.providers.first
+end
+
+at_exit do
+  grid.iterate do |browser|
+    browser.close
+  end
+  grid.release_tuples
+end

data/lib/provider.rb

@@ -41,6 +41,9 @@ module Watir
           require 'watir-webdriver'
           require 'selenium-webdriver'
           @browser = Watir::Browser
+        when :zombie
+          require 'watir-zombie'
+          @browser = Watir::Zombie
         when :selenium
           require 'selenium-webdriver'
           @browser = Selenium::WebDriver

data/watirgrid.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{watirgrid}
-  s.version = "1.1.1"
+  s.version = "1.1.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Tim Koopmans"]
-  s.date = %q{2011-05-04}
+  s.date = %q{2011-05-06}
   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,14 @@
 --- !ruby/object:Gem::Specification 
 name: watirgrid
 version: !ruby/object:Gem::Version 
-  hash: 23
-  prerelease: 
+  hash: 961915984
+  prerelease: 6
   segments: 
   - 1
   - 1
-  - 2
-  version: 1.1.2
+  - 3
+  - pre
+  version: 1.1.3.pre
 platform: ruby
 authors: 
 - Tim Koopmans
@@ -15,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-06 00:00:00 +10:00
+date: 2011-05-16 00:00:00 +10:00
 default_executable: 
 dependencies: []
 
@@ -44,6 +45,10 @@ files:
 - examples/basic/example_webdriver_remote.rb
 - examples/cucumber/example.feature
 - examples/cucumber/step_definitions/example_steps.rb
+- examples/cucumber/support/env.rb
+- examples/parallel/cucumber/example.feature
+- examples/parallel/cucumber/step_definitions/example_steps.rb
+- examples/parallel/cucumber/support/env.rb
 - lib/controller.rb
 - lib/listener.rb
 - lib/provider.rb
@@ -79,12 +84,14 @@ 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: 
@@ -97,6 +104,9 @@ test_files:
 - 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/control_spec.rb
 - spec/grid_spec.rb
 - spec/memory_spec.rb