watirgrid 0.0.8.pre → 0.0.9

data/spec/utilities_spec.rb

@@ -1,23 +1,26 @@
 require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
 
-describe 'WatirGrid Utilities' do
+describe 'Utility Functions for the Grid' do
   before(:all) do
-    controller = Controller.new(
-      :ring_server_port => 12351,
+    @controller = Controller.new(
+      :ring_server_port => 12353,
       :loglevel => Logger::ERROR)
-    controller.start
+    @controller.start
     1.upto(1) do 
       provider = Provider.new(
-        :ring_server_port => 12351, 
+        :ring_server_port => 12353, 
         :loglevel => Logger::ERROR, :browser_type => 'safari')
       provider.start
     end
-    grid = Watir::Grid.new(:ring_server_port => 12351, 
-    :ring_server_host => '127.0.0.1')
+    grid = Watir::Grid.new(:ring_server_port => 12353)
     grid.start(:read_all => true)
     @browser = grid.browsers[0]
   end
   
+  after(:all) do
+    @controller.stop
+  end
+
   it 'should get the logged-in user for the remote provider' do
     @browser[:object].get_logged_in_user.should == `whoami`.chomp
   end
@@ -48,4 +51,4 @@ describe 'WatirGrid Utilities' do
     @browser[:object].kill_all_browsers
     @browser[:object].get_running_browsers.size.should == 0
   end
-end
+end

data/spec/webdriver_remote_spec.rb

@@ -0,0 +1,35 @@
+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
+    @controller = Controller.new(
+      :loglevel => Logger::ERROR)
+    @controller.start
+    provider = Provider.new(
+      :loglevel => Logger::ERROR, :browser_type => 'webdriver_remote')
+    provider.start
+  end
+
+  after(:all) do
+    @controller.stop
+  end
+
+  it 'should take the last 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)
+    threads = []
+    grid.browsers.each do |browser|
+      threads << 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, "btnI").click
+        b.close
+      end
+    end
+    threads.each {|thread| thread.join}
+    grid.size.should == 1
+  end
+end

data/spec/webdriver_spec.rb

@@ -1,59 +1,45 @@
-require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
-
-describe 'WatirGrid' do
-  before(:all) do
-    controller = Controller.new(
-      :ring_server_port => 12351,
-      :loglevel => Logger::ERROR)
-    controller.start
-    1.upto(1) do 
-      provider = Provider.new(
-        :ring_server_port => 12351, 
-        :loglevel => Logger::ERROR, :browser_type => 'webdriver')
-      provider.start
-    end
-  end
-
-  it 'should return how many grid are available in the tuplespace' do
-    grid = Watir::Grid.new(:ring_server_port => 12351, 
-    :ring_server_host => '127.0.0.1')
-    grid.start(:read_all => true)
-    grid.size.should == 1
-  end
-
-  it 'should find at least one browser in the tuplespace' do
-    grid = Watir::Grid.new(:ring_server_port => 12351, 
-    :ring_server_host => '127.0.0.1')
-    grid.start(:quantity => 1, :read_all => true)
-    grid.size.should == 1
-  end
- 
-  it 'should take the first (and last) browser and execute some watir commands' do
-    grid = Watir::Grid.new(:ring_server_port => 12351, 
-    :ring_server_host => '127.0.0.1')
-    grid.start(:quantity => 1, :take_all => true)
-    threads = []
-    grid.browsers.each do |browser|
-      threads << Thread.new do 
-        browser[:hostname].should == `hostname`.strip
-        browser[:architecture].should == Config::CONFIG['arch']
-        browser[:browser_type].should == 'webdriver'
-        b = browser[:object].new_browser(:ie)
-        b.goto("http://www.google.com")
-        b.text_field(:name, 'q').set("watirgrid")
-        b.button(:name, "btnI").click
-      end
-    end
-    threads.each {|thread| thread.join}
-    grid.size.should == 1
-  end
-
-  it 'should find no more tuples in the tuplespace' do
-    grid = Watir::Grid.new(:ring_server_port => 12351, 
-    :ring_server_host => '127.0.0.1')
-    grid.start(:read_all => true)
-    grid.size.should == 0
-  end
-
-end
-
+require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
+describe 'Using the Grid with WebDriver' do
+  before(:all) do
+    @controller = Controller.new(
+      :ring_server_port => 12356,
+      :loglevel => Logger::ERROR)
+    @controller.start
+    1.upto(1) do 
+      provider = Provider.new(
+        :ring_server_port => 12356, 
+        :loglevel => Logger::ERROR, :browser_type => 'webdriver')
+      provider.start
+    end
+  end
+
+  after(:all) do
+    @controller.stop
+  end
+
+  it 'should take the last provider on the grid and execute some Watir code in WebDriver with Firefox' do
+    grid = Watir::Grid.new(:ring_server_port => 12356)
+    grid.start(:quantity => 1, :take_all => true)
+    threads = []
+    grid.browsers.each do |browser|
+      threads << Thread.new do 
+        browser[:hostname].should == `hostname`.strip
+        browser[:architecture].should == Config::CONFIG['arch']
+        browser[:browser_type].should == 'webdriver'
+        b = browser[:object].new_browser(:firefox)
+        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}
+    grid.size.should == 1
+  end
+
+  it 'should find no more providers on the grid' do
+    grid = Watir::Grid.new(:ring_server_port => 12356)
+    grid.start(:read_all => true)
+    grid.size.should == 0
+  end
+end

data/watirgrid.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{watirgrid}
-  s.version = "0.0.8.pre"
+  s.version = "0.0.9"
 
-  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{2010-10-11}
+  s.date = %q{2011-02-16}
   s.description = %q{WatirGrid allows for distributed testing across a grid network using Watir.}
   s.email = %q{tim.koops@gmail.com}
   s.executables = ["controller", "provider"]
@@ -21,61 +21,53 @@ Gem::Specification.new do |s|
     ".document",
      ".gitignore",
      "EXAMPLES.rdoc",
-     "HISTORY.rdoc",
      "LICENSE",
      "README.rdoc",
      "Rakefile",
      "bin/controller",
      "bin/provider",
-     "examples/find_by_uuid.rb",
-     "examples/google.rb",
-     "examples/info.rb",
-     "examples/restart_firefox.rb",
-     "examples/simple.rb",
+     "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",
      "lib/controller.rb",
+     "lib/extensions/remote.rb",
+     "lib/extensions/selenium-server-standalone-2.0b1.jar",
      "lib/provider.rb",
      "lib/watirgrid.rb",
+     "logo.png",
      "spec/grid_spec.rb",
-     "spec/spec.opts",
      "spec/spec_helper.rb",
-     "spec/stub.rb",
-     "spec/tuples_spec.rb",
      "spec/utilities_spec.rb",
-     "spec/watirgrid_spec.rb",
+     "spec/webdriver_remote_spec.rb",
+     "spec/webdriver_spec.rb",
      "watirgrid.gemspec"
   ]
   s.homepage = %q{http://github.com/90kts/watirgrid}
   s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.7}
+  s.rubygems_version = %q{1.4.2}
   s.summary = %q{WatirGrid: Web Application Testing in Ruby across a grid network.}
   s.test_files = [
     "spec/grid_spec.rb",
      "spec/spec_helper.rb",
-     "spec/stub.rb",
-     "spec/tuples_spec.rb",
      "spec/utilities_spec.rb",
-     "spec/watir_spec.rb",
-     "spec/watirgrid_spec.rb",
+     "spec/webdriver_remote_spec.rb",
      "spec/webdriver_spec.rb",
-     "examples/find_by_uuid.rb",
-     "examples/google.rb",
-     "examples/info.rb",
-     "examples/restart_firefox.rb",
-     "examples/simple.rb"
+     "examples/basic/example_safariwatir.rb",
+     "examples/basic/example_webdriver.rb",
+     "examples/basic/example_webdriver_remote.rb",
+     "examples/cucumber/step_definitions/example_steps.rb"
   ]
 
   if s.respond_to? :specification_version then
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_development_dependency(%q<rspec>, [">= 1.2.9"])
     else
-      s.add_dependency(%q<rspec>, [">= 1.2.9"])
     end
   else
-    s.add_dependency(%q<rspec>, [">= 1.2.9"])
   end
 end
 

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: watirgrid
 version: !ruby/object:Gem::Version 
-  hash: 961916004
-  prerelease: true
+  hash: 13
+  prerelease: 
   segments: 
   - 0
   - 0
-  - 8
-  - pre
-  version: 0.0.8.pre
+  - 9
+  version: 0.0.9
 platform: ruby
 authors: 
 - Tim Koopmans
@@ -16,25 +15,10 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-11 00:00:00 +11:00
+date: 2011-02-16 00:00:00 +11:00
 default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  name: rspec
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 13
-        segments: 
-        - 1
-        - 2
-        - 9
-        version: 1.2.9
-  type: :development
-  version_requirements: *id001
+dependencies: []
+
 description: WatirGrid allows for distributed testing across a grid network using Watir.
 email: tim.koops@gmail.com
 executables: 
@@ -49,30 +33,28 @@ files:
 - .document
 - .gitignore
 - EXAMPLES.rdoc
-- HISTORY.rdoc
 - LICENSE
 - README.rdoc
 - Rakefile
 - bin/controller
 - bin/provider
-- examples/find_by_uuid.rb
-- examples/google.rb
-- examples/info.rb
-- examples/restart_firefox.rb
-- examples/simple.rb
+- 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
 - lib/controller.rb
+- lib/extensions/remote.rb
+- lib/extensions/selenium-server-standalone-2.0b1.jar
 - lib/provider.rb
 - lib/watirgrid.rb
+- logo.png
 - spec/grid_spec.rb
-- spec/spec.opts
 - spec/spec_helper.rb
-- spec/stub.rb
-- spec/tuples_spec.rb
 - spec/utilities_spec.rb
-- spec/watirgrid_spec.rb
-- watirgrid.gemspec
-- spec/watir_spec.rb
+- spec/webdriver_remote_spec.rb
 - spec/webdriver_spec.rb
+- watirgrid.gemspec
 has_rdoc: true
 homepage: http://github.com/90kts/watirgrid
 licenses: []
@@ -94,32 +76,26 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version 
-      hash: 25
+      hash: 3
       segments: 
-      - 1
-      - 3
-      - 1
-      version: 1.3.1
+      - 0
+      version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.4.2
 signing_key: 
 specification_version: 3
 summary: "WatirGrid: Web Application Testing in Ruby across a grid network."
 test_files: 
 - spec/grid_spec.rb
 - spec/spec_helper.rb
-- spec/stub.rb
-- spec/tuples_spec.rb
 - spec/utilities_spec.rb
-- spec/watir_spec.rb
-- spec/watirgrid_spec.rb
+- spec/webdriver_remote_spec.rb
 - spec/webdriver_spec.rb
-- examples/find_by_uuid.rb
-- examples/google.rb
-- examples/info.rb
-- examples/restart_firefox.rb
-- examples/simple.rb
+- examples/basic/example_safariwatir.rb
+- examples/basic/example_webdriver.rb
+- examples/basic/example_webdriver_remote.rb
+- examples/cucumber/step_definitions/example_steps.rb

data/HISTORY.rdoc

@@ -1,18 +0,0 @@
-== Release Notes
-=== 0.0.1
-Added access control lists for the controller and provider. This lets the user specify ACLs by way of simple white/blacklist security similar to that used by the Unix /etc/hosts.allow and /etc/hosts.deny files. The ACL constructor takes an array of strings. The first string of a pair is always “allow” or “deny”, and it’s followed by the address or addresses to allow or deny access.
-
-e.g. 
-  provider.rb -a deny,all,allow,127.0.0.1
-This would deny all access to this provider by default and allow access only from the localhost (127.0.0.1). This is the default setting if no ACLs are specified from the command line. This would affect all connectivity from the controller to the providers.
-
-e.g. 
-  controller -a deny,all,allow,192.168.1.*
-This would deny all access to the controller by default with access allowed from any host in the 192.168.1.* subnet. This would affect all connectivity from the providers to the controller.
-
-Added startup bin scripts for the provider and controller. Ruby Gems will automatically deploy these on installation.
-
----
-=== 0.0.2
-Allowed specification of remote host for ring server with -h option on provider.
-

data/examples/find_by_uuid.rb

@@ -1,28 +0,0 @@
-require 'rubygems'
-require '../lib/watirgrid'
-
-grid = Watir::Grid.new(:ring_server_port => 12358, 
-:ring_server_host => '192.168.1.102', 
-:loglevel => Logger::DEBUG)
-grid.start(:read_all => true)
-
-threads = []
-grid.browsers.each do |browser|
-  threads << Thread.new do 
-    @uuid = browser[:uuid]
-    p @uuid
-  end
-end
-threads.each {|thread| thread.join}
-
-grid.start(:read_all => true, :uuid => @uuid)
-
-threads = []
-grid.browsers.each do |browser|
-  threads << Thread.new do 
-    @uuid = browser[:uuid]
-    p @uuid
-  end
-end
-threads.each {|thread| thread.join}
-

data/examples/google.rb

@@ -1,19 +0,0 @@
-require 'rubygems'
-require '../lib/watirgrid'
-
-grid = Watir::Grid.new(:ring_server_port => 12358, 
-:ring_server_host => '192.168.1.102', 
-:loglevel => Logger::DEBUG)
-grid.start(:read_all => true)
-
-threads = []
-grid.browsers.each do |browser|
-  threads << Thread.new do 
-    b = browser[:object].new_browser
-    b.goto("http://google.com.au/")
-    b.text_field(:name, 'q').set("performance & test automation specialists")
-    sleep 1
-    b.button(:name, 'btnI').click
-  end
-end
-threads.each {|thread| thread.join}

data/examples/info.rb

@@ -1,14 +0,0 @@
-require 'rubygems'
-require '../lib/watirgrid'
-
-grid = Watir::Grid.new(:ring_server_port => 12358, 
-:ring_server_host => '192.168.1.102', :loglevel => Logger::DEBUG)
-grid.start(:read_all => true)
-
-threads = []
-grid.browsers.each do |browser|
-  threads << Thread.new do 
-    p browser
-  end
-end
-threads.each {|thread| thread.join}

data/examples/restart_firefox.rb

@@ -1,14 +0,0 @@
-require 'rubygems'
-require '../lib/watirgrid'
-
-grid = Watir::Grid.new(:ring_server_port => 12358, 
-:ring_server_host => '192.168.1.102', :loglevel => Logger::DEBUG)
-grid.start(:read_all => true)
-
-threads = []
-grid.browsers.each do |browser|
-  threads << Thread.new do 
-    p browser
-  end
-end
-threads.each {|thread| thread.join}

data/examples/simple.rb

@@ -1,19 +0,0 @@
-require 'rubygems'
-require '../lib/watirgrid'
-
-grid = Watir::Grid.new(:ring_server_port => 12358, 
-:ring_server_host => '192.168.1.102', 
-:loglevel => Logger::DEBUG)
-grid.start(:read_all => true)
-
-threads = []
-grid.browsers.each do |browser|
-  threads << Thread.new do 
-    b = browser[:object].new_browser
-    b.goto("http://192.168.1.102:4567/")
-    b.text_field(:name, 'username').set("I am robot")
-    sleep 1
-    b.button(:id, 'go').click
-  end
-end
-threads.each {|thread| thread.join}

data/spec/spec.opts

@@ -1 +0,0 @@
---color

data/spec/stub.rb

@@ -1,48 +0,0 @@
-require 'rubygems'
-require 'sinatra'
-require 'haml'
-
-get '/load/:browser_id/:browser_object_id' do
-  params[:browser_object_id]
-end
-
-get '/' do
-   haml :example
-end
-
-post '/' do
-   "Congratulations #{params[:username]}, you hit the button!"
-end
-
-__END__
-
-@@ layout
-%html
-  = yield
-
-@@ example
-%style{:type=>"text/css"}
-  :plain
-    input {
-      border-bottom-style: inset;
-      border-bottom-width: 2px;
-      border-left-style: inset;
-      border-left-width: 2px;
-      border-right-style: inset;
-      border-right-width: 2px;
-      border-top-style: inset;
-      border-top-width: 2px;
-      font-family: arial, sans-serif;
-      font-size: 30px;
-      font-style: normal;
-      font-variant: normal;
-      font-weight: normal;
-      height: 40px;
-      width: 200px;
-    }
-%form{:action=>'/', :method=>'POST'}
-  %input{:name=>'username', :value=>'username'}
-  %button{:id=>'go', :type=>'submit'} GO
-
-
-

data/spec/tuples_spec.rb

@@ -1,46 +0,0 @@
-require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
-
-describe 'When taking tuples from the grid' do
-  before(:all) do
-    controller = Controller.new(
-      :ring_server_port => 12351,
-      :loglevel => Logger::ERROR)
-    controller.start
-    1.upto(5) do 
-      provider = Provider.new(
-        :ring_server_port => 12351, 
-        :loglevel => Logger::ERROR, :browser_type => 'safari')
-      provider.start
-    end
-  end
-
-  it 'should start 1st grid and take all tuples' do
-    grid1 = Watir::Grid.new(:ring_server_port => 12351, 
-    :ring_server_host => '127.0.0.1')
-    grid1.start(:take_all => true)
-    grid1.size.should == 5
-  
-    describe 'Then for subsequent grids' do
-      it 'should start 2nd grid and confirm there are no more tuples' do
-        grid2 = Watir::Grid.new(:ring_server_port => 12351, 
-        :ring_server_host => '127.0.0.1')
-        grid2.start(:take_all => true)
-        grid2.size.should == 0
-      end
-  
-      it 'should release the tuples taken by the 1st grid' do
-        grid1.release_tuples
-      end
-  
-      it 'should start 3rd grid and confirm there are tuples available' do
-        grid3 = Watir::Grid.new(:ring_server_port => 12351, 
-        :ring_server_host => '127.0.0.1')
-        grid3.start(:take_all => true)
-        grid3.size.should == 5
-      end  
-    
-    end
-
-end
-  
-end