spec/grid_spec.rb in watirgrid-0.0.3 vs spec/grid_spec.rb in watirgrid-0.0.4

@@ -12,107 +12,106 @@
         :loglevel => Logger::ERROR, :browser_type => 'safari')
       provider.start
     end
   end
 
-  it 'should return how many browsers are available in the tuplespace' do
-    browsers = Watir::Grid.new(:ring_server_port => 12351)
-    browsers.start(:read_all => true)
-    browsers.size.should == 5
+  it 'should return how many grid are available in the tuplespace' do
+    grid = Watir::Grid.new(:ring_server_port => 12351)
+    grid.start(:read_all => true)
+    grid.size.should == 5
   end
 
-  it 'should read any 2 browsers in the tuplespace' do
-    browsers = Watir::Grid.new(:ring_server_port => 12351)
-    browsers.start(:quantity => 2, :read_all => true)
-    browsers.size.should == 2
+  it 'should read any 2 grid in the tuplespace' do
+    grid = Watir::Grid.new(:ring_server_port => 12351)
+    grid.start(:quantity => 2, :read_all => true)
+    grid.size.should == 2
   end
 
   it 'should take any 1 browser in the tuplespace' do
-    browsers = Watir::Grid.new(:ring_server_port => 12351)
-    browsers.start(:quantity => 1, :take_all => true)
-    browsers.size.should == 1 
+    grid = Watir::Grid.new(:ring_server_port => 12351)
+    grid.start(:quantity => 1, :take_all => true)
+    grid.size.should == 1 
   end
 
-  it 'should take all browsers remaining in tuplespace' do
-    browsers = Watir::Grid.new(:ring_server_port => 12351)
-    browsers.start(:take_all => true)
-    browsers.size.should == 4
+  it 'should take all grid remaining in tuplespace' do
+    grid = Watir::Grid.new(:ring_server_port => 12351)
+    grid.start(:take_all => true)
+    grid.size.should == 4
   end
 
-  it 'should find no more browsers in the tuplespace' do
-    browsers = Watir::Grid.new(:ring_server_port => 12351)
-    browsers.start(:read_all => true)
-    browsers.size.should == 0
+  it 'should find no more grid in the tuplespace' do
+    grid = Watir::Grid.new(:ring_server_port => 12351)
+    grid.start(:read_all => true)
+    grid.size.should == 0
   end
 
-  it 'should register 4 new browsers in the tuplespace' do
+  it 'should register 4 new grid in the tuplespace' do
     1.upto(4) do 
       provider = Provider.new(:ring_server_port => 12351, 
         :loglevel => Logger::ERROR, :browser_type => 'safari')
       provider.start
     end
   end
 
   it 'should take any 1 browser based on browser type' do
-    browsers = Watir::Grid.new(:ring_server_port => 12351)
-    browsers.start(:quantity => 1,
+    grid = Watir::Grid.new(:ring_server_port => 12351)
+    grid.start(:quantity => 1,
       :take_all => true, :browser_type => 'safari')
-    browsers.size.should == 1
+    grid.size.should == 1
   end
 
-  it 'should fail to find any browsers based on a specific browser type' do
-    browsers = Watir::Grid.new(:ring_server_port => 12351)
-    browsers.start(:quantity => 1,
+  it 'should fail to find any grid based on a specific browser type' do
+    grid = Watir::Grid.new(:ring_server_port => 12351)
+    grid.start(:quantity => 1,
       :take_all => true, :browser_type => 'firefox')
-    browsers.size.should == 0
+    grid.size.should == 0
   end
 
-  it 'should fail to find any browsers based on a unknown browser type' do
-    browsers = Watir::Grid.new(:ring_server_port => 12351)
-    browsers.start(:quantity => 1,
+  it 'should fail to find any grid based on a unknown browser type' do
+    grid = Watir::Grid.new(:ring_server_port => 12351)
+    grid.start(:quantity => 1,
       :take_all => true, :browser_type => 'penguin')
-    browsers.size.should == 0
+    grid.size.should == 0
   end
 
   it 'should take any 1 browser based on specific architecture type' do
-    browsers = Watir::Grid.new(:ring_server_port => 12351)
-    browsers.start(:quantity => 1, 
+    grid = Watir::Grid.new(:ring_server_port => 12351)
+    grid.start(:quantity => 1, 
       :take_all => true, :architecture => 'universal-darwin10.0')
-    browsers.size.should == 1
+    grid.size.should == 1
   end
 
-  it 'should fail to find any browsers based on unknown architecture type' do
-    browsers = Watir::Grid.new(:ring_server_port => 12351)
-    browsers.start(:quantity => 1, 
+  it 'should fail to find any grid based on unknown architecture type' do
+    grid = Watir::Grid.new(:ring_server_port => 12351)
+    grid.start(:quantity => 1, 
       :take_all => true, :architecture => 'geos-1992')
-    browsers.size.should == 0
+    grid.size.should == 0
   end
 
   it 'should take any 1 browser based on specific hostname' do
     hostname = `hostname`.strip
-    browsers = Watir::Grid.new(:ring_server_port => 12351)
-    browsers.start(:quantity => 1,
+    grid = Watir::Grid.new(:ring_server_port => 12351)
+    grid.start(:quantity => 1,
       :take_all => true, 
       :hostnames => { hostname => "127.0.0.1"}
       )
-    browsers.size.should == 1
+    grid.size.should == 1
   end
 
-  it 'should fail to find any browsers based on unknown hostname' do
-    browsers = Watir::Grid.new(:ring_server_port => 12351)
-    browsers.start(:quantity => 1,
+  it 'should fail to find any grid based on unknown hostname' do
+    grid = Watir::Grid.new(:ring_server_port => 12351)
+    grid.start(:quantity => 1,
       :take_all => true, :hostnames => { 
         "tokyo" => "127.0.0.1"})
-    browsers.size.should == 0
+    grid.size.should == 0
   end
 
   it 'should take the last browser and execute some watir commands' do
-    browsers = Watir::Grid.new(:ring_server_port => 12351)
-    @browsers = browsers.start(:quantity => 1,
-      :take_all => true)
+    grid = Watir::Grid.new(:ring_server_port => 12351)
+    grid.start(:quantity => 1, :take_all => true)
     threads = []
-    @browsers.each do |browser|
+    grid.browsers.each do |browser|
       threads << Thread.new do 
         browser[:hostname].should == `hostname`.strip
         browser[:architecture].should == Config::CONFIG['arch']
         browser[:browser_type].should == 'safari'
         b = browser[:object].new_browser
@@ -120,21 +119,21 @@
         b.text_field(:name, 'q').set("watirgrid")
         b.button(:name, "btnI").click
       end
     end
     threads.each {|thread| thread.join}
-    browsers.size.should == 1
+    grid.size.should == 1
   end
 
-  it 'should find no more browsers in the tuplespace' do
-    browsers = Watir::Grid.new(:ring_server_port => 12351)
-    browsers.start(:read_all => true)
-    browsers.size.should == 0
+  it 'should find no more grid in the tuplespace' do
+    grid = Watir::Grid.new(:ring_server_port => 12351)
+    grid.start(:read_all => true)
+    grid.size.should == 0
   end
 
   it 'should register a new browser on a remote provider' do
     pending('provision of remote registration') do
-      browsers.size.should == 0
+      grid.size.should == 0
     end
   end
 
 end