watirgrid 1.1.1 → 1.1.2

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

data/examples/cucumber/example.feature

@@ -1,17 +1,11 @@
-@Example
-Feature: Watirgrid using WebDriver
-  In order to use Watirgrid 
-  Users must be able to create controllers, add providers and control a grid
+@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: Create a Controller with Providers
-    Given I have created and started a Controller
-    Then I should be able to create and start 2 "WebDriver" Providers
-
-  # Note: WebDriver can only control one instance of any particular browser on a single host.
-  # With Watirgrid, you'd typically have multiple instances across multiple hosts (Providers)
-  # For the sake of a demo, we'll just control 2 difference instances on a single host.
-  Scenario: Create a Grid and control the Providers
-    Given I have created and started a Grid with 2 Providers
-    Then I should be able to control the following browsers in parallel:
-      | Chrome |
-      | Firefox |
+  Scenario: Logon with 50 users in 1 minute
+    Given 50 users open "chrome"
+    And 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,39 +1,51 @@
 $LOAD_PATH.unshift(File.dirname(__FILE__))
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', '..', '..', 'lib'))
 require 'watirgrid'
-require 'rspec/expectations'; 
+require 'rspec/expectations';
+require 'watir-webdriver-performance'
 
-Given /^I have created and started a Controller$/ do
-  controller = Controller.new(
-    :loglevel => Logger::ERROR)
-  controller.start
+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
+  @grid.iterate {|browser| browser.goto "http://gridinit.com/examples/logon.html" }
 end
 
-Then /^I should be able to create and start (\d+) "(.+?)" Providers$/ do |total, browser_type|
-  1.upto(total.to_i) do 
-    provider = Provider.new(
-      :loglevel => Logger::ERROR, :browser_type => browser_type)
-    provider.start
+When /^they enter their credentials$/ do
+  @grid.iterate do |browser|
+    browser.text_field(:name => "email").set "tim@mahenterprize.com"
+    browser.text_field(:name => "password").set "mahsecretz"
+    browser.button(:type => "submit").click
   end
 end
 
-Given /^I have created and started a Grid with (\d+) Providers$/ do |total|
-  @grid = Watir::Grid.new
-  @grid.start(:take_all => true)
-  @grid.browsers.size.should == total.to_i
+Then /^they should see their account settings$/ do
+  @grid.iterate do |browser|
+    browser.text.should =~ /Maybe I should get a real Gridinit account/
+  end
 end
 
-Then /^I should be able to control the following browsers in parallel:$/ do |table|
-  browsers = table.raw.collect {|e| e.to_s.downcase.to_sym}
-  threads = []
-    @grid.browsers.each_with_index do |browser, index|
-      threads << Thread.new do
-        b = browser[:object].new_browser(browsers[index])
-        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}
+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
 end

data/lib/watirgrid.rb

@@ -10,7 +10,7 @@ module Watir
   # and instatiating remote browser objects on nominated providers.
   class Grid
 
-    attr_accessor :drb_server_uri, :ring_server, :browsers, :tuples
+    attr_accessor :drb_server_uri, :ring_server, :browsers, :tuples, :providers
 
     def initialize(params = {})
       @drb_server_host  = params[:drb_server_host]  || external_interface
@@ -23,9 +23,10 @@ module Watir
       @log  = Logger.new(logfile, 'daily')
       @log.level = params[:loglevel] || Logger::ERROR
       @log.datetime_format = "%Y-%m-%d %H:%M:%S "
-
+      @webdriver_browser_type = params[:browser].to_sym if params[:browser]
       @browsers = []
       @tuples = []
+      @providers = []
     end
 
     ##
@@ -34,6 +35,7 @@ module Watir
       start_drb_server
       find_ring_server(params)
       get_tuples(params)
+      setup if params[:initiate]
     end
 
     ##
@@ -48,6 +50,27 @@ module Watir
       @tuples.each { |tuple| @ring_server.write(tuple) }
     end
 
+    ##
+    # Instantiate new browser object on each of the remote providers
+    def setup
+      @browsers.each_with_index do |browser, index|
+        sleep 0.15
+        @providers[index] ||= browser[:object].new_browser(@webdriver_browser_type)
+      end
+    end
+
+    ##
+    # Iterate with a block over each of the remote providers
+    def iterate &block
+      threads = []
+      @providers.each do |browser|
+        threads << Thread.new do
+          yield browser
+        end
+      end
+      threads.each {|thread| thread.join}
+    end
+
     ##
     # This is a helper method to control a grid.
     def self.control(params = {}, &block)

data/spec/control_spec.rb

@@ -19,9 +19,18 @@ describe 'Using the Grid Control method' do
   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"
+      browser.goto "http://google.com"
       p browser.title
       browser.close
     end
   end
+
+  it 'should iterate over a grid' do
+    grid = Watir::Grid.new(:ring_server_port => 12357)
+    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.0"
+  s.version = "1.1.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Tim Koopmans"]
-  s.date = %q{2011-04-20}
+  s.date = %q{2011-05-04}
   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"]
@@ -32,13 +32,12 @@ Gem::Specification.new do |s|
     "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",
@@ -56,8 +55,8 @@ Gem::Specification.new do |s|
     "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",

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: watirgrid
 version: !ruby/object:Gem::Version 
-  hash: 17
+  hash: 23
   prerelease: 
   segments: 
   - 1
   - 1
-  - 1
-  version: 1.1.1
+  - 2
+  version: 1.1.2
 platform: ruby
 authors: 
 - Tim Koopmans
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-04 00:00:00 +10:00
+date: 2011-05-06 00:00:00 +10:00
 default_executable: 
 dependencies: []