grid 0.3.1 → 0.3.3

data/Gemfile.lock

@@ -23,7 +23,7 @@ GEM
     rspec-expectations (2.3.0)
       diff-lcs (~> 1.1.2)
     rspec-mocks (2.3.0)
-    watirgrid (1.0.4)
+    watirgrid (1.0.6)
 
 PLATFORMS
   ruby

data/VERSION

@@ -1 +1 @@
-0.3.1
+0.3.3

data/bin/grid

@@ -39,6 +39,10 @@ OptionParser.new do |opts|
   "Optional URI of the Gridinit API, default http://gridin.it/api/v0") do |u|
     options[:uri] = u || nil
   end
+  opts.on("-a", "--api API", String,
+  "Specify the Watir API to use, default webdriver [watir, firewatir, webdriver_performance]}") do |a|
+    options[:api] = b || 'webdriver'
+  end
 
   opts.on_tail("-h", "--help", "Show this message") do
     puts opts
@@ -52,6 +56,7 @@ helper = Grid::Helper.new(
   :email      => options[:email],
   :password   => options[:password],
   :uri        => options[:uri],
+  :api        => options[:api],
   :args       => ARGV
 )
 helper.send(ARGV[0])

data/examples/cucumber/example.feature

@@ -0,0 +1,11 @@
+@NFR001
+Feature: User logons
+  In order to use the web applicaion users must be
+  able to logon and access the portal in 3 seconds
+
+  Scenario: Logon with 50 users in 3 minutes
+    Given 200 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

@@ -0,0 +1,25 @@
+$LOAD_PATH.unshift(File.dirname(__FILE__))
+$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', '..', '..', 'lib'))
+require 'grid'
+require 'rspec/expectations';
+
+Given /^(\d+) users open "([^"]*)"$/ do |arg1, arg2|
+  pending # express the regexp above with the code you wish you had
+end
+
+Given /^navigate to the portal$/ do
+  pending # express the regexp above with the code you wish you had
+end
+
+When /^they enter their credentials$/ do
+  pending # express the regexp above with the code you wish you had
+end
+
+Then /^they should see their account settings$/ do
+  pending # express the regexp above with the code you wish you had
+end
+
+Then /^the response time should be less than (\d+) seconds$/ do |arg1|
+  pending # express the regexp above with the code you wish you had
+end
+

data/grid.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{grid}
-  s.version = "0.3.1"
+  s.version = "0.3.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Tim Koopmans"]
-  s.date = %q{2011-04-17}
+  s.date = %q{2011-04-20}
   s.default_executable = %q{grid}
   s.description = %q{Gridinit command line utilities to help you use the Gridinit API}
   s.email = %q{tim.koops@gmail.com}
@@ -28,6 +28,9 @@ Gem::Specification.new do |s|
     "Rakefile",
     "VERSION",
     "bin/grid",
+    "examples/cucumber/example.feature",
+    "examples/cucumber/step_definitions/.DS_Store",
+    "examples/cucumber/step_definitions/example_steps.rb",
     "grid.gemspec",
     "lib/grid.rb",
     "spec/grid_spec.rb",
@@ -39,6 +42,7 @@ Gem::Specification.new do |s|
   s.rubygems_version = %q{1.4.2}
   s.summary = %q{Gridinit command line utilities}
   s.test_files = [
+    "examples/cucumber/step_definitions/example_steps.rb",
     "spec/grid_spec.rb",
     "spec/spec_helper.rb"
   ]

data/lib/grid.rb

@@ -20,6 +20,9 @@ class Grid
     log.level = params[:loglevel] || Logger::DEBUG
     grid = Watir::Grid.new(params)
     grid.start(:take_all => true)
+    if grid.first[:browser_type] =~ /webdriver/
+      webdriver_browser_type = ask('What browser type?') { |q| q.default = "firefox" } unless params[:browser]
+    end
     log.debug("Grid size                         : #{grid.size}")
     log.debug("Grid rampup                       : #{rampup(grid.size, params)} secs")
     threads = []
@@ -32,7 +35,11 @@ class Grid
         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
+        if browser[:browser_type] =~ /webdriver/
+          @browser = browser[:object].new_browser(webdriver_browser_type.to_sym)
+        else
+           @browser = browser[:object].new_browser
+        end
         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")
@@ -63,6 +70,7 @@ class Grid
   class Helper
     def initialize(params = {})
       @grid_id  = params[:grid_id]
+      @api      = params[:api]
       @uri = params[:uri] || "http://gridin.it/api/v0"
       logfile = STDOUT
       @log  = Logger.new(logfile, 'daily')
@@ -159,7 +167,7 @@ class Grid
       description = ask("Grid description: ") { |q| q.default = "Grid created #{Time.now}" }
       nodes = ask("Number of nodes: ") { |q| q.default = 5 }
       location = ask("Location of nodes: ") { |q| q.default = "us-east" }
-      browser_type = ask("Node type: ") { |q| q.default = "webdriver" }
+      browser_type = ask("Node type: ") { |q| q.default = "webdriver" } unless @api
       @grid_id = create_grid(name, description)
       create_intranode(@grid_id, browser_type, location, nodes)
       show
@@ -169,7 +177,7 @@ class Grid
       @grid_id = ask("Grid ID: ") unless @grid_id
       nodes = ask("Number of nodes: ") { |q| q.default = 5 }
       location = ask("Location of nodes: ") { |q| q.default = "us-east" }
-      browser_type = ask("Node type: ") { |q| q.default = "webdriver" }
+      browser_type = ask("Node type: ") { |q| q.default = "webdriver" } unless @api
       create_intranode(@grid_id, browser_type, location, nodes)
       show
     end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: grid
 version: !ruby/object:Gem::Version 
-  hash: 17
+  hash: 21
   prerelease: 
   segments: 
   - 0
   - 3
-  - 1
-  version: 0.3.1
+  - 3
+  version: 0.3.3
 platform: ruby
 authors: 
 - Tim Koopmans
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-17 00:00:00 +10:00
+date: 2011-04-20 00:00:00 +10:00
 default_executable: grid
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -253,6 +253,9 @@ files:
 - Rakefile
 - VERSION
 - bin/grid
+- examples/cucumber/example.feature
+- examples/cucumber/step_definitions/.DS_Store
+- examples/cucumber/step_definitions/example_steps.rb
 - grid.gemspec
 - lib/grid.rb
 - spec/grid_spec.rb
@@ -292,5 +295,6 @@ signing_key:
 specification_version: 3
 summary: Gridinit command line utilities
 test_files: 
+- examples/cucumber/step_definitions/example_steps.rb
 - spec/grid_spec.rb
 - spec/spec_helper.rb