watirgrid 0.0.7 → 0.0.8.pre

data/spec/stub.rb

@@ -1,48 +1,48 @@
-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
-
-
-
+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 +1,46 @@
-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
+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

data/spec/utilities_spec.rb

@@ -1,51 +1,51 @@
-require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
-
-describe 'WatirGrid Utilities' 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 => 'safari')
-      provider.start
-    end
-    grid = Watir::Grid.new(:ring_server_port => 12351, 
-    :ring_server_host => '127.0.0.1')
-    grid.start(:read_all => true)
-    @browser = grid.browsers[0]
-  end
-  
-  it 'should get the logged-in user for the remote provider' do
-    @browser[:object].get_logged_in_user.should == `whoami`.chomp
-  end
-
-  it 'should enumerate any running browsers on the remote provider' do
-    @browser[:object].get_running_browsers(['firefox-bin']).size.should == 0
-  end
-
-  it 'should be able to start a new firefox browser' do
-    @browser[:object].start_firefox_jssh
-    sleep 5
-    @browser[:object].get_running_browsers(['firefox-bin']).size.should == 1
-  end
-  
-  it 'should be able to kill all firefox browsers' do
-    @browser[:object].kill_browser('firefox-bin')
-    @browser[:object].get_running_browsers(['firefox-bin']).size.should == 0
-  end
-  
-  it 'should be able to start a new firefox browser specified by path' do
-    @browser[:object].start_firefox_jssh
-      ("/Applications/Firefox.app/Contents/MacOS/firefox-bin")
-    sleep 5
-    @browser[:object].get_running_browsers(['firefox-bin']).size.should == 1
-  end
-  
-  it 'should be able to kill all browsers' do
-    @browser[:object].kill_all_browsers
-    @browser[:object].get_running_browsers.size.should == 0
-  end
+require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
+
+describe 'WatirGrid Utilities' 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 => 'safari')
+      provider.start
+    end
+    grid = Watir::Grid.new(:ring_server_port => 12351, 
+    :ring_server_host => '127.0.0.1')
+    grid.start(:read_all => true)
+    @browser = grid.browsers[0]
+  end
+  
+  it 'should get the logged-in user for the remote provider' do
+    @browser[:object].get_logged_in_user.should == `whoami`.chomp
+  end
+
+  it 'should enumerate any running browsers on the remote provider' do
+    @browser[:object].get_running_browsers(['firefox-bin']).size.should == 0
+  end
+
+  it 'should be able to start a new firefox browser' do
+    @browser[:object].start_firefox_jssh
+    sleep 5
+    @browser[:object].get_running_browsers(['firefox-bin']).size.should == 1
+  end
+  
+  it 'should be able to kill all firefox browsers' do
+    @browser[:object].kill_browser('firefox-bin')
+    @browser[:object].get_running_browsers(['firefox-bin']).size.should == 0
+  end
+  
+  it 'should be able to start a new firefox browser specified by path' do
+    @browser[:object].start_firefox_jssh
+      ("/Applications/Firefox.app/Contents/MacOS/firefox-bin")
+    sleep 5
+    @browser[:object].get_running_browsers(['firefox-bin']).size.should == 1
+  end
+  
+  it 'should be able to kill all browsers' do
+    @browser[:object].kill_all_browsers
+    @browser[:object].get_running_browsers.size.should == 0
+  end
 end

data/spec/watir_spec.rb

@@ -0,0 +1,59 @@
+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 => 'ie')
+      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 == 'ie'
+        b = browser[:object].new_browser
+        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
+

data/spec/watirgrid_spec.rb

@@ -1,51 +1,51 @@
-require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
-
-describe Controller do
-  it 'should start a DRb and Ring Server when specifying NO interface or port' do
-    controller = Controller.new
-    controller.start
-    controller.drb_server_uri.should =~ /druby/
-    controller.stop
-  end
-
-  it 'should start a DRb and Ring Server on a specified interface' do
-    controller = Controller.new(
-      :drb_server_host => '127.0.0.1', 
-      :ring_server_host => '127.0.0.1')
-    controller.start
-    controller.drb_server_uri.should =~ /druby/
-    controller.stop
-  end
-
-  it 'should start a DRb and Ring Server on specified ports' do
-    controller = Controller.new(
-      :drb_server_port => 11235, 
-      :ring_server_port => 12358)
-    controller.start
-    controller.drb_server_uri.should =~ /druby/
-    controller.stop
-  end
-end
-
-describe Provider do
-  before(:all) do
-    @controller = Controller.new(
-      :drb_server_host => '127.0.0.1', 
-      :ring_server_host => '127.0.0.1',
-      :ring_server_port => 12350)
-    @controller.start
-  end
-
-  it 'should register a new provider on a specified port' do
-    provider = Provider.new(
-    :drb_server_host => '127.0.0.1', 
-    :ring_server_host => '127.0.0.1',
-    :ring_server_port => 12350)
-    provider.start
-  end
-
-  after(:all) do
-    @controller.stop
-  end
-end
-
+require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
+
+describe Controller do
+  it 'should start a DRb and Ring Server when specifying NO interface or port' do
+    controller = Controller.new
+    controller.start
+    controller.drb_server_uri.should =~ /druby/
+    controller.stop
+  end
+
+  it 'should start a DRb and Ring Server on a specified interface' do
+    controller = Controller.new(
+      :drb_server_host => '127.0.0.1', 
+      :ring_server_host => '127.0.0.1')
+    controller.start
+    controller.drb_server_uri.should =~ /druby/
+    controller.stop
+  end
+
+  it 'should start a DRb and Ring Server on specified ports' do
+    controller = Controller.new(
+      :drb_server_port => 11235, 
+      :ring_server_port => 12358)
+    controller.start
+    controller.drb_server_uri.should =~ /druby/
+    controller.stop
+  end
+end
+
+describe Provider do
+  before(:all) do
+    @controller = Controller.new(
+      :drb_server_host => '127.0.0.1', 
+      :ring_server_host => '127.0.0.1',
+      :ring_server_port => 12350)
+    @controller.start
+  end
+
+  it 'should register a new provider on a specified port' do
+    provider = Provider.new(
+    :drb_server_host => '127.0.0.1', 
+    :ring_server_host => '127.0.0.1',
+    :ring_server_port => 12350)
+    provider.start
+  end
+
+  after(:all) do
+    @controller.stop
+  end
+end
+

data/spec/webdriver_spec.rb

@@ -0,0 +1,59 @@
+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
+

data/watirgrid.gemspec

@@ -5,13 +5,14 @@
 
 Gem::Specification.new do |s|
   s.name = %q{watirgrid}
-  s.version = ""
+  s.version = "0.0.8.pre"
 
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  s.required_rubygems_version = Gem::Requirement.new("> 1.3.1") if s.respond_to? :required_rubygems_version=
   s.authors = ["Tim Koopmans"]
-  s.date = %q{2009-11-05}
+  s.date = %q{2010-10-11}
   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"]
   s.extra_rdoc_files = [
     "LICENSE",
      "README.rdoc"
@@ -19,38 +20,56 @@ Gem::Specification.new do |s|
   s.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",
      "lib/controller.rb",
-     "lib/extend.rb",
      "lib/provider.rb",
      "lib/watirgrid.rb",
+     "spec/grid_spec.rb",
      "spec/spec.opts",
      "spec/spec_helper.rb",
-     "spec/tuple_spec.rb",
+     "spec/stub.rb",
+     "spec/tuples_spec.rb",
+     "spec/utilities_spec.rb",
      "spec/watirgrid_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.5}
+  s.rubygems_version = %q{1.3.7}
   s.summary = %q{WatirGrid: Web Application Testing in Ruby across a grid network.}
   s.test_files = [
-    "spec/spec_helper.rb",
-     "spec/tuple_spec.rb",
-     "spec/watirgrid_spec.rb"
+    "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_spec.rb",
+     "examples/find_by_uuid.rb",
+     "examples/google.rb",
+     "examples/info.rb",
+     "examples/restart_firefox.rb",
+     "examples/simple.rb"
   ]
-  
-  s.add_dependency('uuid', '>= 2.2.0')
-  
 
   if s.respond_to? :specification_version then
     current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
-    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
+    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"])