sahi 1.2.1 → 1.3.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 4fc17be0dcd8a323688ef2554ac53d1753fa8959
+  data.tar.gz: dccf4f8ab3a528997966c27f712d66393f482e71
+SHA512:
+  metadata.gz: eaf53930e206010fb36a9e7b4942e41db34790b65c86c92e303171c7885708b04aa5db2a1bbf9a94caa4b1a84a19c5c1bb131b3ed7e63f3552fbe52e12ee0e17
+  data.tar.gz: 763f56c89466f704a7056f219a6f2b10fbecda3cf08ed822a86a771c66b64b4fc5b2f67ed8610229b5bec1e988e10ba167b3df4f98523db6e495c736aa6e7b23

data/lib/sahi.rb

@@ -111,7 +111,7 @@ module Sahi
     
     def exec_command(cmd, qs={})
       res = response("http://#{@proxy_host}:#{@proxy_port}/_s_/dyn/Driver_" + cmd, {"sahisid"=>@sahisid}.update(qs))
-      return res
+      return res.force_encoding("UTF-8")
     end
     
     def response(url, qs={})
@@ -147,23 +147,93 @@ module Sahi
       end      
     end
     
+    def prepare_window_action(oldTitle)
+		len = oldTitle.length
+		if (len > 30) 
+			len = 30
+		end
+		titleToUse = fetch("_sahi.trim(#{Utils.quoted(oldTitle[0..30].strip)})")
+		newTitle = titleToUse.gsub(/[^0-9a-zA-Z ]/, '') + ' _' + Time.now.getutc.to_s
+		execute_step("window.document.title =" + Utils.quoted(newTitle))
+		wait(2);
+		return newTitle
+  	end
+    
+    def window_action(action)
+		title = fetch("window.top.document.title")
+		title = prepare_window_action(title)
+		puts ">" + title + "<"
+		exec_command("windowAction", {"action" => action, "title" => title})
+	end
+	
+	def type_key_code_native(key)
+		exec_command("typeKeyCodeNative", {"key" => key})
+	end
+	
+	def get_windows(activePeriod=nil)
+		if(activePeriod == nil)
+    		str = exec_command("getWindowsAsJSON", {"activePeriod" => -1});
+     	else
+     		activePeriod = activePeriod * 1000
+			str = exec_command("getWindowsAsJSON", {"activePeriod" => activePeriod});
+     	end
+		return JSON.parse(str)
+	end
+	
+	def type_native(str)
+		exec_command("typeNative", {"str" => str})
+	end
+    
+    def execute_sahi(step)
+      if popup?() 
+        step = "_sahi._popup(#{Utils.quoted(@popup_name)})." + step
+      end
+      if domain?() 
+        step = "_sahi._domain(#{Utils.quoted(@domain_name)})." + step
+      end
+      #puts step
+      exec_command("setStep", {"step" => step, 'addSahi' => true})
+      i = 0
+      while (i < 500)
+        sleep(0.1)
+        i+=1
+        check_done = exec_command("doneStep")
+        done = "true".eql?(check_done)
+        
+        error = check_done.index("error:") == 0
+        return if done
+		if (error)
+          raise check_done
+		end        
+      end      
+    end
+    
     def method_missing(m, *args, &block)  
       return ElementStub.new(self, m.to_s, args)
     end 
     
     # evaluates a javascript expression on the browser and fetches its value
-	  def fetch(expression) 
+	def fetch(expression) 
       key = "___lastValue___" + Time.now.getutc.to_s;
       execute_step("_sahi.setServerVarPlain('"+key+"', " + expression + ")")
       return check_nil(exec_command("getVariable", {"key" => key}))
-	  end
+	end
     
     # evaluates a javascript expression on the browser and returns true if value is true or "true"
     def fetch_boolean(expression)
       return fetch(expression) == "true"
     end
 
-
+	# returns element attributes of all elements of type attr matching the identifier within relations
+    def collect(els, attr=nil)
+	  if(attr == nil)
+    	return els.collect_similar()
+      else
+		return fetch("_sahi.collectAttributes(#{Utils.quoted(attr)}, #{Utils.quoted(els.to_type())}, #{els.to_identifiers()})").split(",___sahi___")
+      end
+    end
+    
+    
     def browser_js=(js)
       exec_command("setBrowserJS", {"browserJS"=>js})
     end
@@ -270,6 +340,41 @@ module Sahi
       execute_step("_sahi._clearLastPrompt()")
     end          
     
+    # simulates the touch event
+    def touch()
+      execute_step("_sahi._touch(#{self.to_s()})")
+    end
+    
+    # simulates the tap event
+    def tap()
+      execute_step("_sahi._tap(#{self.to_s()})")
+    end
+
+	# simulates the touchStart event
+    def touchStart()
+      execute_step("_sahi._touchStart(#{self.to_s()})")
+    end
+    
+    # simulates the touchEnd event
+    def touchEnd()
+      execute_step("_sahi._touchEnd(#{self.to_s()})")
+    end
+    
+    # simulates the touchCancel event
+    def touchCancel()
+      execute_step("_sahi._touchCancel(#{self.to_s()})")
+    end
+    
+    # simulates the touchMove event
+    def touchMove(moveX, moveY, isRelative=true)
+      execute_step("_sahi._touchMove(#{self.to_s()}, moveX, moveY, isRelative)")
+    end
+    
+    # simulates the swipe event
+    def swipe(moveX, moveY, isRelative=true)
+      execute_step("_sahi._touchMove(#{self.to_s()}, moveX, moveY, isRelative)")
+    end
+    
     # set an expectation to set given value for specific prompt message
     def expect_prompt(message, input)
       execute_step("_sahi._expectPrompt(#{Utils.quoted(message)}, #{Utils.quoted(input) })")
@@ -305,6 +410,16 @@ module Sahi
     def title()
       return fetch("_sahi._title()")
     end    
+    
+    # return selection text 
+	
+	def selection_text(win = nil)
+	  if(win != nil)
+	    return fetch("_sahi._getSelectionText(#{win.to_s()})")
+	  else
+	    return fetch("_sahi._getSelectionText()")
+	  end	
+	end        
       
     # returns true if browser is Internet Explorer
     def ie?()
@@ -408,13 +523,31 @@ module Sahi
     # choose option in a select box
     def choose(val)
       @browser.execute_step("_sahi._setSelected(#{self.to_s()}, #{val.to_json})")
-    end    
+    end    	
       
     # sets the value for textboxes or textareas. Also triggers necessary events.
     def value=(val)
       @browser.execute_step("_sahi._setValue(#{self.to_s()}, #{Utils.quoted(val)})")
     end      
-      
+	
+	# select text for manipulation
+	
+	def select_range(rangeStart, rangeEnd, type=nil)
+	  if(type!= nil)
+	  	@browser.execute_step("_sahi._selectRange(#{self.to_s()}, rangeStart, rangeEnd, #{Utils.quoted(type)})")
+	  else
+	    @browser.execute_step("_sahi._selectRange(#{self.to_s()}, #{rangeStart}, #{rangeEnd})")
+	  end
+	end  
+	      
+	def select_text_range(searchText, position=nil)
+	  if(position != nil)
+		@browser.execute_step("_sahi._selectTextRange(#{self.to_s()}, #{Utils.quoted(searchText)}, #{Utils.quoted(position)})")
+	  else
+	    @browser.execute_step("_sahi._selectTextRange(#{self.to_s()}, #{Utils.quoted(searchText)})")
+	  end
+	end
+	
     # returns value of textbox or textareas and other relevant input elements
     def value()
       return @browser.fetch("_sahi._getValue(#{self.to_s()})")
@@ -428,7 +561,7 @@ module Sahi
 		else
 			return @browser.fetch("_sahi.getAttribute(#{self.to_s()}, #{Utils.quoted(attr)})")
 		end
-		else
+	  else
 			return @browser.fetch("#{self.to_s()}")
 	  end
 	end    
@@ -479,11 +612,41 @@ module Sahi
     #  browser.cell(0).under(browser.cell("Header")) will denote the cell visually under "Header"
     #  browser.cell(0).near(browser.cell("Book")).under(browser.cell("Cost")) may be used to denote the Cost of Book in a grid
     
-    def under(el2)
-      @identifiers << ElementStub.new(@browser, "under", [el2])
+    def under(el2, offset=nil, limit_under=nil)
+      ar = (offset!=nil || limit_under!=nil) ? [el2, offset, limit_under] : [el2];
+      @identifiers << ElementStub.new(@browser, "under", ar)
+      return self
+    end
+    
+    def above(el2, offset=nil, limit_under=nil)
+      ar = (offset!=nil || limit_under!=nil) ? [el2, offset, limit_under] : [el2];
+      @identifiers << ElementStub.new(@browser, "above", ar)
+      return self
+    end
+    
+    def above_or_under(el2, offset=nil, limit_under=nil)
+      ar = (offset!=nil || limit_under!=nil) ? [el2, offset, limit_under] : [el2];
+      @identifiers << ElementStub.new(@browser, "aboveOrUnder", ar)
+      return self
+    end
+    
+    def right_of(el2, offset=nil, limit_under=nil)
+      ar = (offset!=nil || limit_under!=nil) ? [el2, offset, limit_under] : [el2];
+      @identifiers << ElementStub.new(@browser, "rightOf", ar)
       return self
     end
     
+    def left_of(el2, offset=nil, limit_under=nil)
+      ar = (offset!=nil || limit_under!=nil) ? [el2, offset, limit_under] : [el2];
+      @identifiers << ElementStub.new(@browser, "leftOf", ar)
+      return self
+    end
+    
+    def left_or_right_of(el2, offset=nil, limit_under=nil)
+      ar = (offset!=nil || limit_under!=nil) ? [el2, offset, limit_under] : [el2];
+      @identifiers << ElementStub.new(@browser, "leftOrRightOf", ar)
+      return self
+    end
     
     # specifies exacts coordinates to click inside an element. The coordinates are relative to the element. x is from left and y is from top. Can be negative to specify other direction
     # browser.button("Menu Button with Arrow on side").xy(-5, 10).click will click on the button, 5 pixels from right and 10 pixels from top.
@@ -556,6 +719,14 @@ module Sahi
       return "_sahi._#{@type}(#{concat_identifiers(@identifiers).join(", ") })"
     end
     
+    def to_type
+      return "_#{@type}"
+    end
+    
+    def to_identifiers
+      return "#{concat_identifiers(@identifiers).join(", ") }"
+    end
+    
     def concat_identifiers(ids)
       return ids.collect {|id| id.kind_of?(String) ? Utils.quoted(id) : (id.is_a?(ElementStub) ? id.to_s() : id.to_json())}
     end

data/test/elementstub_test.rb

@@ -24,15 +24,100 @@ class TC_MyTest < Test::Unit::TestCase
     assert_equal("_sahi._div(\"id1\", _sahi._near(_sahi._div(\"id2\")))", stub1.to_s())
   end
   
-  def test_browser_multi_stubs()
-    browser = Sahi::Browser.new("", "", "")
-    assert_equal("_sahi._div(\"id\")", browser.div("id").to_s)
-    assert_equal("_sahi._div(\"id\", \"id2\")", browser.div("id", "id2").to_s())
-    assert_equal("_sahi._div(\"id1\", _sahi._near(_sahi._div(\"id2\")))", browser.div("id1").near(browser.div("id2")).to_s())
+  def test_browser_multi_stubs()
+	@b = Sahi::Browser.new("", "", "")
+    assert_equal("_sahi._div(\"id\")", @b.div("id").to_s)
+    assert_equal("_sahi._div(\"id\", \"id2\")", @b.div("id", "id2").to_s())
+    assert_equal("_sahi._div(\"id1\", _sahi._near(_sahi._div(\"id2\")))", @b.div("id1").near(@b.div("id2")).to_s())
   end
   
   def test_xy()
-    browser = Sahi::Browser.new("", "", "")
-    assert_equal("_sahi._xy(_sahi._div(\"id\"), 10, 20)", browser.div("id").xy(10, 20).to_s)
+	@b = Sahi::Browser.new("", "", "")
+    assert_equal("_sahi._xy(_sahi._div(\"id\"), 10, 20)", @b.div("id").xy(10, 20).to_s)
   end  
+  
+  def test_under_no_extra_params()
+	@b = Sahi::Browser.new("", "", "")
+    assert_equal("_sahi._cell(0, _sahi._under(_sahi._cell(\"Heading\")))", @b.cell(0).under(@b.cell("Heading")).to_s)
+  end 
+  
+  def test_right_of_no_extra_params()
+	@b = Sahi::Browser.new("", "", "")
+    assert_equal("_sahi._cell(0, _sahi._rightOf(_sahi._cell(\"Heading\")))", @b.cell(0).right_of(@b.cell("Heading")).to_s)
+  end
+
+  def test_left_of_no_extra_params()
+	@b = Sahi::Browser.new("", "", "")
+    assert_equal("_sahi._cell(0, _sahi._leftOf(_sahi._cell(\"Heading\")))", @b.cell(0).left_of(@b.cell("Heading")).to_s)
+  end   
+  
+  def test_left_or_right_of_no_extra_params()
+	@b = Sahi::Browser.new("", "", "")
+    assert_equal("_sahi._cell(0, _sahi._leftOrRightOf(_sahi._cell(\"Heading\")))", @b.cell(0).left_or_right_of(@b.cell("Heading")).to_s)
+  end 
+  
+  def test_above_no_extra_params()
+	@b = Sahi::Browser.new("", "", "")
+    assert_equal("_sahi._cell(0, _sahi._above(_sahi._cell(\"Heading\")))", @b.cell(0).above(@b.cell("Heading")).to_s)
+  end  
+  
+  def test_above_or_under_no_extra_params()
+	@b = Sahi::Browser.new("", "", "")
+    assert_equal("_sahi._cell(0, _sahi._aboveOrUnder(_sahi._cell(\"Heading\")))", @b.cell(0).above_or_under(@b.cell("Heading")).to_s)
+  end  
+  
+  def test_above_extra_params()
+	@b = Sahi::Browser.new("", "", "")
+    assert_equal("_sahi._cell(0, _sahi._above(_sahi._cell(\"Heading\"), [10,5], 20))", @b.cell(0).above(@b.cell("Heading"), [10,5], 20).to_s)
+    assert_equal("_sahi._cell(0, _sahi._above(_sahi._cell(\"Heading\"), 10, 20))", @b.cell(0).above(@b.cell("Heading"), 10, 20).to_s)
+    assert_equal("_sahi._cell(0, _sahi._above(_sahi._cell(\"Heading\"), 10, null))", @b.cell(0).above(@b.cell("Heading"), 10).to_s)
+    assert_equal("_sahi._cell(0, _sahi._above(_sahi._cell(\"Heading\"), null, 20))", @b.cell(0).above(@b.cell("Heading"), nil, 20).to_s)
+    assert_equal("_sahi._cell(0, _sahi._above(_sahi._cell(\"Heading\")))", @b.cell(0).above(@b.cell("Heading"), nil, nil).to_s)
+  end
+  
+  def test_above_or_under_extra_params()
+	@b = Sahi::Browser.new("", "", "")
+    assert_equal("_sahi._cell(0, _sahi._aboveOrUnder(_sahi._cell(\"Heading\"), [10,5], 20))", @b.cell(0).above_or_under(@b.cell("Heading"), [10,5], 20).to_s)
+    assert_equal("_sahi._cell(0, _sahi._aboveOrUnder(_sahi._cell(\"Heading\"), 10, 20))", @b.cell(0).above_or_under(@b.cell("Heading"), 10, 20).to_s)
+    assert_equal("_sahi._cell(0, _sahi._aboveOrUnder(_sahi._cell(\"Heading\"), 10, null))", @b.cell(0).above_or_under(@b.cell("Heading"), 10).to_s)
+    assert_equal("_sahi._cell(0, _sahi._aboveOrUnder(_sahi._cell(\"Heading\"), null, 20))", @b.cell(0).above_or_under(@b.cell("Heading"), nil, 20).to_s)
+    assert_equal("_sahi._cell(0, _sahi._aboveOrUnder(_sahi._cell(\"Heading\")))", @b.cell(0).above_or_under(@b.cell("Heading"), nil, nil).to_s)
+  end    
+    
+  def test_under_extra_params()
+	@b = Sahi::Browser.new("", "", "")
+    assert_equal("_sahi._cell(0, _sahi._under(_sahi._cell(\"Heading\"), [10,5], 20))", @b.cell(0).under(@b.cell("Heading"), [10,5], 20).to_s)
+    assert_equal("_sahi._cell(0, _sahi._under(_sahi._cell(\"Heading\"), 10, 20))", @b.cell(0).under(@b.cell("Heading"), 10, 20).to_s)
+    assert_equal("_sahi._cell(0, _sahi._under(_sahi._cell(\"Heading\"), 10, null))", @b.cell(0).under(@b.cell("Heading"), 10).to_s)
+    assert_equal("_sahi._cell(0, _sahi._under(_sahi._cell(\"Heading\"), null, 20))", @b.cell(0).under(@b.cell("Heading"), nil, 20).to_s)
+    assert_equal("_sahi._cell(0, _sahi._under(_sahi._cell(\"Heading\")))", @b.cell(0).under(@b.cell("Heading"), nil, nil).to_s)
+  end
+  
+  def test_left_of_extra_params()
+	@b = Sahi::Browser.new("", "", "")
+    assert_equal("_sahi._cell(0, _sahi._leftOf(_sahi._cell(\"Heading\"), [10,5], 20))", @b.cell(0).left_of(@b.cell("Heading"), [10,5], 20).to_s)
+    assert_equal("_sahi._cell(0, _sahi._leftOf(_sahi._cell(\"Heading\"), 10, 20))", @b.cell(0).left_of(@b.cell("Heading"), 10, 20).to_s)
+    assert_equal("_sahi._cell(0, _sahi._leftOf(_sahi._cell(\"Heading\"), 10, null))", @b.cell(0).left_of(@b.cell("Heading"), 10).to_s)
+    assert_equal("_sahi._cell(0, _sahi._leftOf(_sahi._cell(\"Heading\"), null, 20))", @b.cell(0).left_of(@b.cell("Heading"), nil, 20).to_s)
+    assert_equal("_sahi._cell(0, _sahi._leftOf(_sahi._cell(\"Heading\")))", @b.cell(0).left_of(@b.cell("Heading"), nil, nil).to_s)
+  end
+  
+  def test_right_of_extra_params()
+	@b = Sahi::Browser.new("", "", "")
+    assert_equal("_sahi._cell(0, _sahi._rightOf(_sahi._cell(\"Heading\"), [10,5], 20))", @b.cell(0).right_of(@b.cell("Heading"), [10,5], 20).to_s)
+    assert_equal("_sahi._cell(0, _sahi._rightOf(_sahi._cell(\"Heading\"), 10, 20))", @b.cell(0).right_of(@b.cell("Heading"), 10, 20).to_s)
+    assert_equal("_sahi._cell(0, _sahi._rightOf(_sahi._cell(\"Heading\"), 10, null))", @b.cell(0).right_of(@b.cell("Heading"), 10).to_s)
+    assert_equal("_sahi._cell(0, _sahi._rightOf(_sahi._cell(\"Heading\"), null, 20))", @b.cell(0).right_of(@b.cell("Heading"), nil, 20).to_s)
+    assert_equal("_sahi._cell(0, _sahi._rightOf(_sahi._cell(\"Heading\")))", @b.cell(0).right_of(@b.cell("Heading"), nil, nil).to_s)
+  end
+
+  def test_left_or_right_of_extra_params()
+	@b = Sahi::Browser.new("", "", "")
+    assert_equal("_sahi._cell(0, _sahi._leftOrRightOf(_sahi._cell(\"Heading\"), [10,5], 20))", @b.cell(0).left_or_right_of(@b.cell("Heading"), [10,5], 20).to_s)
+    assert_equal("_sahi._cell(0, _sahi._leftOrRightOf(_sahi._cell(\"Heading\"), 10, 20))", @b.cell(0).left_or_right_of(@b.cell("Heading"), 10, 20).to_s)
+    assert_equal("_sahi._cell(0, _sahi._leftOrRightOf(_sahi._cell(\"Heading\"), 10, null))", @b.cell(0).left_or_right_of(@b.cell("Heading"), 10).to_s)
+    assert_equal("_sahi._cell(0, _sahi._leftOrRightOf(_sahi._cell(\"Heading\"), null, 20))", @b.cell(0).left_or_right_of(@b.cell("Heading"), nil, 20).to_s)
+    assert_equal("_sahi._cell(0, _sahi._leftOrRightOf(_sahi._cell(\"Heading\")))", @b.cell(0).left_or_right_of(@b.cell("Heading"), nil, nil).to_s)
+  end
+  
 end

data/test/sahi_test.rb

@@ -3,15 +3,16 @@ require 'sahi'
 
 class SahiDriverTest < Test::Unit::TestCase
   def setup
-    @browser = init_browser()
-    @browser.open
+	@b = init_browser()
+	@browser = @b
+    @b.open
     @base_url = "http://sahi.co.in"
   end
   
   def teardown
-    if @browser
-      @browser.set_speed = 100
-      @browser.close
+    if @b
+      @b.set_speed = 100
+      @b.close
       sleep(1)
     end
   end  
@@ -22,406 +23,454 @@ class SahiDriverTest < Test::Unit::TestCase
     return Sahi::Browser.new(@browser_name)
   end
 
-
   def test1
-    @browser.navigate_to(@base_url + "/demo/formTest.htm")
-    @browser.textbox("t1").value = "aaa"            
-    @browser.link("Back").click
-    @browser.link("Table Test").click        
-    assert_equal("Cell with id", @browser.cell("CellWithId").text)
+    @b.navigate_to(@base_url + "/demo/formTest.htm")
+    @b.textbox("t1").value = "aaa"            
+    @b.link("Back").click
+    @b.link("Table Test").click        
+    assert_equal("Cell with id", @b.cell("CellWithId").text)
+  end
+  
+  def test_file_upload_native_events
+  	@b.navigate_to("http://sahi.co.in/demo/")
+	@b.link("File Upload Test").click
+	@b.wait(5) {@b.file("file").visible?}
+	@b.window_action("focus")
+	# focus on the element
+	@b.file("file").focus()
+	@b.wait(5)
+	@b.type_key_code_native(32)
+	@b.wait(7)
+	# type the file path
+	@b.type_native("D:\\abc.txt")
+	@b.wait(1)
+	# press enter
+	@b.type_key_code_native(10)
+	@b.wait(5)
+	@b.submit("Submit Single").click
+	assert(@b.span("abc.txt").exists?)
+	assert(@b.span("abc.txt").visible?)
+  end
+  
+  def test_select_text_range()
+	@b.navigate_to("http://developer.yahoo.com/yui/examples/editor/icon_editor_clean.html")
+	@b.rte(1).select_text_range("his is some more[1]", "before")
+	@b.link("Insert Image").click
+	
+	@b.navigate_to("http://developer.yahoo.com/yui/examples/editor/icon_editor_clean.html",true)
+	@b.rte(1).select_text_range("This is some more[3]", "before")
+	@b.link("Insert Image").click
+	
+	@b.navigate_to("http://developer.yahoo.com/yui/examples/editor/icon_editor_clean.html",true)
+	@b.rte(1).select_text_range("This is some more[3]")
+	@b.link("Insert Image").click
   end
 
   def xtest_ZK
-    @browser.speed = 200
-    @browser.navigate_to("http://www.zkoss.org/zkdemo/userguide/")
-    @browser.div("Hello World").click
-    @browser.span("Pure Java").click
-    @browser.div("Various Form").click
-    @browser.wait(5000) {@browser.textbox("z-intbox[1]").visible?}
+    @b.speed = 200
+    @b.navigate_to("http://www.zkoss.org/zkdemo/userguide/")
+    @b.div("Hello World").click
+    @b.span("Pure Java").click
+    @b.div("Various Form").click
+    @b.wait(5000) {@b.textbox("z-intbox[1]").visible?}
     
-    @browser.div("Comboboxes").click
-    @browser.textbox("z-combobox-inp").value = "aa"
-    @browser.italic("z-combobox-btn").click
-    @browser.cell("Simple and Rich").click
+    @b.div("Comboboxes").click
+    @b.textbox("z-combobox-inp").value = "aa"
+    @b.italic("z-combobox-btn").click
+    @b.cell("Simple and Rich").click
 
-    @browser.italic("z-combobox-btn[1]").click
-    @browser.span("The coolest technology").click
-    @browser.italic("z-combobox-btn[2]").click
-    @browser.image("CogwheelEye-32x32.gif").click
-    assert(@browser.textbox("z-combobox-inp[2]").exists?)    
+    @b.italic("z-combobox-btn[1]").click
+    @b.span("The coolest technology").click
+    @b.italic("z-combobox-btn[2]").click
+    @b.image("CogwheelEye-32x32.gif").click
+    assert(@b.textbox("z-combobox-inp[2]").exists?)    
   end
   
 
   def test_fetch() 
-    @browser.navigate_to(@base_url + "/demo/formTest.htm")
-    assert_equal(@base_url + "/demo/formTest.htm", @browser.fetch("window.location.href"))
+    @b.navigate_to(@base_url + "/demo/formTest.htm")
+    assert_equal(@base_url + "/demo/formTest.htm", @b.fetch("window.location.href"))
   end
   
   def test_accessors()
-    @browser.navigate_to(@base_url  + "/demo/formTest.htm")
-    assert_equal("", @browser.textbox("t1").value)
-    assert(@browser.textbox(1).exists?)
-    assert(@browser.textbox("$a_dollar").exists?)
-    @browser.textbox("$a_dollar").value = ("adas")
-    assert_equal("", @browser.textbox(1).value)
-    assert(@browser.textarea("ta1").exists?)
-    assert_equal("", @browser.textarea("ta1").value)
-    assert(@browser.textarea(1).exists?)
-    assert_equal("", @browser.textarea(1).value)
-    assert(@browser.checkbox("c1").exists?)
-    assert_equal("cv1", @browser.checkbox("c1").value)
-    assert(@browser.checkbox(1).exists?)
-    assert_equal("cv2", @browser.checkbox(1).value)
-    assert(@browser.checkbox("c1[1]").exists?)
-    assert_equal("cv3", @browser.checkbox("c1[1]").value)
-    assert(@browser.checkbox(3).exists?)
-    assert_equal("", @browser.checkbox(3).value)
-    assert(@browser.radio("r1").exists?)
-    assert_equal("rv1", @browser.radio("r1").value)
-    assert(@browser.password("p1").exists?)
-    assert_equal("", @browser.password("p1").value)
-    assert(@browser.password(1).exists?)
-    assert_equal("", @browser.password(1).value)
-    assert(@browser.select("s1").exists?)
-    assert_equal("o1", @browser.select("s1").selected_text())
-    assert(@browser.select("s1Id[1]").exists?)
-    assert_equal("o1", @browser.select("s1Id[1]").selected_text())
-    assert(@browser.select(2).exists?)
-    assert_equal("o1", @browser.select(2).selected_text())
-    assert(@browser.button("button value").exists?)
-    assert(@browser.button("btnName[1]").exists?)
-    assert(@browser.button("btnId[2]").exists?)
-    assert(@browser.button(3).exists?)
-    assert(@browser.submit("Add").exists?)
-    assert(@browser.submit("submitBtnName[1]").exists?)
-    assert(@browser.submit("submitBtnId[2]").exists?)
-    assert(@browser.submit(3).exists?)
-    assert(@browser.image("imageAlt1").exists?)
-    assert(@browser.image("imageId1[1]").exists?)
-    assert(@browser.image(2).exists?)
-    assert(!@browser.link("Back22").exists?)
-    assert(@browser.link("Back").exists?)
-    assert(@browser.accessor("document.getElementById('s1Id')").exists?)
+    @b.navigate_to(@base_url  + "/demo/formTest.htm")
+    assert_equal("", @b.textbox("t1").value)
+    assert(@b.textbox(1).exists?)
+    assert(@b.textbox("$a_dollar").exists?)
+    @b.textbox("$a_dollar").value = ("adas")
+    assert_equal("", @b.textbox(1).value)
+    assert(@b.textarea("ta1").exists?)
+    assert_equal("", @b.textarea("ta1").value)
+    assert(@b.textarea(1).exists?)
+    assert_equal("", @b.textarea(1).value)
+    assert(@b.checkbox("c1").exists?)
+    assert_equal("cv1", @b.checkbox("c1").value)
+    assert(@b.checkbox(1).exists?)
+    assert_equal("cv2", @b.checkbox(1).value)
+    assert(@b.checkbox("c1[1]").exists?)
+    assert_equal("cv3", @b.checkbox("c1[1]").value)
+    assert(@b.checkbox(3).exists?)
+    assert_equal("", @b.checkbox(3).value)
+    assert(@b.radio("r1").exists?)
+    assert_equal("rv1", @b.radio("r1").value)
+    assert(@b.password("p1").exists?)
+    assert_equal("", @b.password("p1").value)
+    assert(@b.password(1).exists?)
+    assert_equal("", @b.password(1).value)
+    assert(@b.select("s1").exists?)
+    assert_equal("o1", @b.select("s1").selected_text())
+    assert(@b.select("s1Id[1]").exists?)
+    assert_equal("o1", @b.select("s1Id[1]").selected_text())
+    assert(@b.select(2).exists?)
+    assert_equal("o1", @b.select(2).selected_text())
+    assert(@b.button("button value").exists?)
+    assert(@b.button("btnName[1]").exists?)
+    assert(@b.button("btnId[2]").exists?)
+    assert(@b.button(3).exists?)
+    assert(@b.submit("Add").exists?)
+    assert(@b.submit("submitBtnName[1]").exists?)
+    assert(@b.submit("submitBtnId[2]").exists?)
+    assert(@b.submit(3).exists?)
+    assert(@b.image("imageAlt1").exists?)
+    assert(@b.image("imageId1[1]").exists?)
+    assert(@b.image(2).exists?)
+    assert(!@b.link("Back22").exists?)
+    assert(@b.link("Back").exists?)
+    assert(@b.accessor("document.getElementById('s1Id')").exists?)
   end
   
   def test_select()
-    @browser.navigate_to(@base_url  + "/demo/formTest.htm")
-    assert_equal("o1", @browser.select("s1Id[1]").selected_text())
-    @browser.select("s1Id[1]").choose("o2")
-    assert_equal("o2", @browser.select("s1Id[1]").selected_text())
-    @browser.select(3).choose(["o1", "o3"])
-    assert_equal("o1,o3", @browser.select(3).selected_text())
+    @b.navigate_to(@base_url  + "/demo/formTest.htm")
+    assert_equal("o1", @b.select("s1Id[1]").selected_text())
+    @b.select("s1Id[1]").choose("o2")
+    assert_equal("o2", @b.select("s1Id[1]").selected_text())
+    @b.select(3).choose(["o1", "o3"])
+    assert_equal("o1,o3", @b.select(3).selected_text())
   end
     
   def test_set_file()
-    @browser.navigate_to(@base_url  + "/demo/php/fileUpload.htm")
-    @browser.file("file").file = "scripts/demo/uploadme.txt";
-    @browser.submit("Submit Single").click;
-    assert(@browser.span("size").exists?)
-    assert_not_nil(@browser.span("size").text().index("0.3046875 Kb"))
-    assert_not_nil(@browser.span("type").text().index("Single"))
-    @browser.link("Back to form").click;
+    @b.navigate_to(@base_url  + "/demo/php/fileUpload.htm")
+    @b.file("file").file = "scripts/demo/uploadme.txt";
+    @b.submit("Submit Single").click;
+    assert(@b.span("size").exists?)
+    assert_not_nil(@b.span("size").text().index("0.3046875 Kb"))
+    assert_not_nil(@b.span("type").text().index("Single"))
+    @b.link("Back to form").click;
   end
   
   def test_multi_file_upload()
-    @browser.navigate_to(@base_url  + "/demo/php/fileUpload.htm")
-    @browser.file("file[]").file = "scripts/demo/uploadme.txt";
-    @browser.file("file[]").file = "scripts/demo/uploadme2.txt";
-    @browser.submit("Submit Array").click;
-    assert_not_nil(@browser.span("type").text().index("Array"))
-    assert_not_nil(@browser.span("file").text().index("uploadme.txt"))
-    assert_not_nil(@browser.span("size").text().index("0.3046875 Kb"))
+    @b.navigate_to(@base_url  + "/demo/php/fileUpload.htm")
+    @b.file("file[]").file = "scripts/demo/uploadme.txt";
+    @b.file("file[]").file = "scripts/demo/uploadme2.txt";
+    @b.submit("Submit Array").click;
+    assert_not_nil(@b.span("type").text().index("Array"))
+    assert_not_nil(@b.span("file").text().index("uploadme.txt"))
+    assert_not_nil(@b.span("size").text().index("0.3046875 Kb"))
     
-    assert_not_nil(@browser.span("file[1]").text().index("uploadme2.txt"))
-    assert_not_nil(@browser.span("size[1]").text().index("0.32421875 Kb"))
+    assert_not_nil(@b.span("file[1]").text().index("uploadme2.txt"))
+    assert_not_nil(@b.span("size[1]").text().index("0.32421875 Kb"))
   end
   
   def test_clicks()
-    @browser.navigate_to(@base_url  + "/demo/formTest.htm")
-    assert_not_nil(@browser.checkbox("c1"))
-    @browser.checkbox("c1").click;
-    assert_equal("true", @browser.checkbox("c1").fetch("checked"))
-    @browser.checkbox("c1").click;
-    assert_equal("false", @browser.checkbox("c1").fetch("checked"))
+    @b.navigate_to(@base_url  + "/demo/formTest.htm")
+    assert_not_nil(@b.checkbox("c1"))
+    @b.checkbox("c1").click;
+    assert_equal("true", @b.checkbox("c1").fetch("checked"))
+    @b.checkbox("c1").click;
+    assert_equal("false", @b.checkbox("c1").fetch("checked"))
     
-    assert_not_nil(@browser.radio("r1"))
-    @browser.radio("r1").click;
-    assert_equal("true", @browser.radio("r1").fetch("checked"))
-    assert(@browser.radio("r1").checked?)
-    assert(!@browser.radio("r1[1]").checked?)
-    @browser.radio("r1[1]").click;
-    assert_equal("false", @browser.radio("r1").fetch("checked"))
-    assert(@browser.radio("r1[1]").checked?)
-    assert(!@browser.radio("r1").checked?)
+    assert_not_nil(@b.radio("r1"))
+    @b.radio("r1").click;
+    assert_equal("true", @b.radio("r1").fetch("checked"))
+    assert(@b.radio("r1").checked?)
+    assert(!@b.radio("r1[1]").checked?)
+    @b.radio("r1[1]").click;
+    assert_equal("false", @b.radio("r1").fetch("checked"))
+    assert(@b.radio("r1[1]").checked?)
+    assert(!@b.radio("r1").checked?)
   end
   
   def test_links()
-    @browser.navigate_to(@base_url  + "/demo/index.htm")
-    @browser.link("Link Test").click;
-    @browser.link("linkByContent").click;
-    @browser.link("Back").click;
-    @browser.link("link with return true").click;
-    assert(@browser.textarea("ta1").exists?)
-    assert_equal("", @browser.textarea("ta1").value)
-    @browser.link("Back").click;
-    @browser.link("Link Test").click;
-    @browser.link("link with return false").click;
-    assert(@browser.textbox("t1").exists?)
-    assert_equal("formTest link with return false", @browser.textbox("t1").value)
-    assert(@browser.link("linkByContent").exists?)
+    @b.navigate_to(@base_url  + "/demo/index.htm")
+    @b.link("Link Test").click;
+    @b.link("linkByContent").click;
+    @b.link("Back").click;
+    @b.link("link with return true").click;
+    assert(@b.textarea("ta1").exists?)
+    assert_equal("", @b.textarea("ta1").value)
+    @b.link("Back").click;
+    @b.link("Link Test").click;
+    @b.link("link with return false").click;
+    assert(@b.textbox("t1").exists?)
+    assert_equal("formTest link with return false", @b.textbox("t1").value)
+    assert(@b.link("linkByContent").exists?)
 
-    @browser.link("link with returnValue=false").click;
-    assert(@browser.textbox("t1").exists?)
-    assert_equal("formTest link with returnValue=false", @browser.textbox("t1").value)
-    @browser.link("added handler using js").click;
-    assert(@browser.textbox("t1").exists?)
-    assert_equal("myFn called", @browser.textbox("t1").value)
-    @browser.textbox("t1").value = ("")
-    @browser.image("imgWithLink").click;
-    @browser.link("Link Test").click;
-    @browser.image("imgWithLinkNoClick").click;
-    assert(@browser.textbox("t1").exists?)
-    assert_equal("myFn called", @browser.textbox("t1").value)
-    @browser.link("Back").click;        
+    @b.link("link with returnValue=false").click;
+    assert(@b.textbox("t1").exists?)
+    assert_equal("formTest link with returnValue=false", @b.textbox("t1").value)
+    @b.link("added handler using js").click;
+    assert(@b.textbox("t1").exists?)
+    assert_equal("myFn called", @b.textbox("t1").value)
+    @b.textbox("t1").value = ("")
+    @b.image("imgWithLink").click;
+    @b.link("Link Test").click;
+    @b.image("imgWithLinkNoClick").click;
+    assert(@b.textbox("t1").exists?)
+    assert_equal("myFn called", @b.textbox("t1").value)
+    @b.link("Back").click;        
   end
   
   
   def test_popup_title_name_mix() 
-    @browser.navigate_to(@base_url  + "/demo/index.htm")
-    @browser.link("Window Open Test").click;
-    @browser.link("Window Open Test With Title").click;
-    @browser.link("Table Test").click;
+    @b.navigate_to(@base_url  + "/demo/index.htm")
+    @b.link("Window Open Test").click;
+    @b.link("Window Open Test With Title").click;
+    @b.link("Table Test").click;
     
-    popup_popwin = @browser.popup("popWin")
+    popup_popwin = @b.popup("popWin")
     
     popup_popwin.link("Link Test").click;
-    @browser.link("Back").click;
+    @b.link("Back").click;
     
-    popup_with_title = @browser.popup("With Title")
+    popup_with_title = @b.popup("With Title")
     
     popup_with_title.link("Form Test").click;
-    @browser.link("Table Test").click;
+    @b.link("Table Test").click;
     popup_with_title.textbox("t1").value = ("d")
-    @browser.link("Back").click;
+    @b.link("Back").click;
     popup_with_title.textbox(1).value = ("e")
-    @browser.link("Table Test").click;
+    @b.link("Table Test").click;
     popup_with_title.textbox("name").value = ("f")
     assert_not_nil(popup_popwin.link("linkByHtml").exists?)
 
-    assert_not_nil(@browser.cell("CellWithId"))
-    assert_equal("Cell with id", @browser.cell("CellWithId").text)
+    assert_not_nil(@b.cell("CellWithId"))
+    assert_equal("Cell with id", @b.cell("CellWithId").text)
     popup_with_title.link("Break Frames").click;
     
-    popupSahiTests = @browser.popup("Sahi Tests")
+    popupSahiTests = @b.popup("Sahi Tests")
     popupSahiTests.close()
     
     popup_popwin.link("Break Frames").click;
     popup_popwin.close()
-    @browser.link("Back").click;
+    @b.link("Back").click;
   end
 
   
   def test_in() 
-    @browser.navigate_to(@base_url  + "/demo/tableTest.htm")
-    assert_equal("111", @browser.textarea("ta").near(@browser.cell("a1")).value)
-    assert_equal("222", @browser.textarea("ta").near(@browser.cell("a2")).value)
-	assert_equal("3", @browser.table(0).fetch("rows.length"))
-    @browser.link("Go back").in(@browser.cell("a1").parent_node()).click;
-    assert(@browser.link("Link Test").exists?)
+    @b.navigate_to(@base_url  + "/demo/tableTest.htm")
+    assert_equal("111", @b.textarea("ta").near(@b.cell("a1")).value)
+    assert_equal("222", @b.textarea("ta").near(@b.cell("a2")).value)
+	assert_equal("3", @b.table(0).fetch("rows.length"))
+    @b.link("Go back").in(@b.cell("a1").parent_node()).click;
+    assert(@b.link("Link Test").exists?)
   end
   
   def test_under() 
-    @browser.navigate_to(@base_url  + "/demo/tableTest.htm")
-    assert_equal("x1-2", @browser.cell(0).near(@browser.cell("x1-0")).under(@browser.tableHeader("header 3")).text());
-    assert_equal("x1-3", @browser.cell(0).near(@browser.cell("x1-0")).under(@browser.tableHeader("header 4")).text());
+    @b.navigate_to(@base_url  + "/demo/tableTest.htm")
+    assert_equal("x1-2", @b.cell(0).near(@b.cell("x1-0")).under(@b.tableHeader("header 3")).text())
+    assert_equal("x1-3", @b.cell(0).near(@b.cell("x1-0")).under(@b.tableHeader("header 4")).text())
   end
     
   def test_exists()
-    @browser.navigate_to(@base_url  + "/demo/index.htm")
-    assert(@browser.link("Link Test").exists?)
-    assert(!@browser.link("Link Test NonExistent").exists?)        
-  end
+    @b.navigate_to(@base_url  + "/demo/index.htm")
+    assert(@b.link("Link Test").exists?)
+    assert(!@b.link("Link Test NonExistent").exists?)        
+  end
+  
+  def test_range()
+  	@b.navigate_to(@base_url  + "/demo/")
+  	@b.link("Form Test").click
+  	@b.textarea("ta1").value = "abcdefgh";
+  	@b.textarea("ta1").select_range(2,4)
+  	assert_equal("cd", @b.selection_text())
+  	@b.navigate_to(@base_url + "/demo/", true)
+	@b.link("IFrames Test").click
+	@b.link("Form Test").click
+	@b.textarea("ta1").value = "abcdefgh"
+	@b.textarea("ta1").select_range(2, 4)
+	assert_equal("cd", @b.selection_text())
+  end	
   
   def alert1(message) 
-    @browser.navigate_to(@base_url  + "/demo/alertTest.htm")
-    @browser.textbox("t1").value = ("Message " + message)
-    @browser.button("Click For Alert").click;
-    @browser.navigate_to("/demo/alertTest.htm")
+    @b.navigate_to(@base_url  + "/demo/alertTest.htm")
+    @b.textbox("t1").value = ("Message " + message)
+    @b.button("Click For Alert").click;
+    @b.navigate_to("/demo/alertTest.htm")
     sleep(1)
-    assert_equal("Message " + message, @browser.last_alert())
-    @browser.clear_last_alert()
-    assert_nil(@browser.last_alert())
+    assert_equal("Message " + message, @b.last_alert())
+    @b.clear_last_alert()
+    assert_nil(@b.last_alert())
   end  
   
   def test_alert()
     alert1("One")
     alert1("Two")
     alert1("Three")
-    @browser.button("Click For Multiline Alert").click;
-    assert_equal("You must correct the following Errors:\nYou must select a messaging price plan.\nYou must select an international messaging price plan.\nYou must enter a value for the Network Lookup Charge", @browser.last_alert())
+    @b.button("Click For Multiline Alert").click;
+    assert_equal("You must correct the following Errors:\nYou must select a messaging price plan.\nYou must select an international messaging price plan.\nYou must enter a value for the Network Lookup Charge", @b.last_alert())
   end
   
   def test_confirm()
-    @browser.navigate_to(@base_url  + "/demo/confirmTest.htm")
-    @browser.expect_confirm("Some question?", true)
-    @browser.button("Click For Confirm").click;
-    assert_equal("oked", @browser.textbox("t1").value)
-    @browser.navigate_to("/demo/confirmTest.htm")
+    @b.navigate_to(@base_url  + "/demo/confirmTest.htm")
+    @b.expect_confirm("Some question?", true)
+    @b.button("Click For Confirm").click;
+    assert_equal("oked", @b.textbox("t1").value)
+    @b.navigate_to("/demo/confirmTest.htm")
     sleep(1)
-    assert_equal("Some question?", @browser.last_confirm())
-    @browser.clear_last_confirm()
-    assert_nil(@browser.last_confirm())
+    assert_equal("Some question?", @b.last_confirm())
+    @b.clear_last_confirm()
+    assert_nil(@b.last_confirm())
 
-    @browser.expect_confirm("Some question?", false)
-    @browser.button("Click For Confirm").click;
-    assert_equal("canceled", @browser.textbox("t1").value)
-    assert_equal("Some question?", @browser.last_confirm())
-    @browser.clear_last_confirm()
-    assert_nil(@browser.last_confirm())
+    @b.expect_confirm("Some question?", false)
+    @b.button("Click For Confirm").click;
+    assert_equal("canceled", @b.textbox("t1").value)
+    assert_equal("Some question?", @b.last_confirm())
+    @b.clear_last_confirm()
+    assert_nil(@b.last_confirm())
 
-    @browser.expect_confirm("Some question?", true)
-    @browser.button("Click For Confirm").click;
-    assert_equal("oked", @browser.textbox("t1").value)
-    assert_equal("Some question?", @browser.last_confirm())                
-    @browser.clear_last_confirm()
-    assert_nil(@browser.last_confirm())
+    @b.expect_confirm("Some question?", true)
+    @b.button("Click For Confirm").click;
+    assert_equal("oked", @b.textbox("t1").value)
+    assert_equal("Some question?", @b.last_confirm())                
+    @b.clear_last_confirm()
+    assert_nil(@b.last_confirm())
   end
   
   def test_prompt()
-    @browser.navigate_to(@base_url  + "/demo/promptTest.htm")
-    @browser.expect_prompt("Some prompt?", "abc")
-    @browser.button("Click For Prompt").click;
-    assert_not_nil(@browser.textbox("t1"))
-    assert_equal("abc", @browser.textbox("t1").value)
-    @browser.navigate_to("/demo/promptTest.htm")
-    @browser.waitFor(2000)
-    assert_equal("Some prompt?", @browser.last_prompt())
-    @browser.clear_last_prompt()
-    assert_nil(@browser.last_prompt())        
+    @b.navigate_to(@base_url  + "/demo/promptTest.htm")
+    @b.expect_prompt("Some prompt?", "abc")
+    @b.button("Click For Prompt").click;
+    assert_not_nil(@b.textbox("t1"))
+    assert_equal("abc", @b.textbox("t1").value)
+    @b.navigate_to("/demo/promptTest.htm")
+    @b.wait(2000)
+    assert_equal("Some prompt?", @b.last_prompt())
+    @b.clear_last_prompt()
+    assert_nil(@b.last_prompt())        
   end
   
 
   def test_visible
-    @browser.navigate_to(@base_url  + "/demo/index.htm")
-    @browser.link("Visible Test").click;
-    assert(@browser.spandiv("using display").visible?)
+    @b.navigate_to(@base_url  + "/demo/index.htm")
+    @b.link("Visible Test").click;
+    assert(@b.spandiv("using display").visible?)
 
-    @browser.button("Display none").click;
-    assert(!@browser.spandiv("using display").visible?)
-    @browser.button("Display block").click;
-    assert(@browser.spandiv("using display").visible?)
+    @b.button("Display none").click;
+    assert(!@b.spandiv("using display").visible?)
+    @b.button("Display block").click;
+    assert(@b.spandiv("using display").visible?)
 
-    @browser.button("Display none").click;
-    assert(!@browser.spandiv("using display").visible?)
-    @browser.button("Display inline").click;
-    assert(@browser.spandiv("using display").visible?)
+    @b.button("Display none").click;
+    assert(!@b.spandiv("using display").visible?)
+    @b.button("Display inline").click;
+    assert(@b.spandiv("using display").visible?)
 
-    assert(@browser.spandiv("using visibility").visible?)
-    @browser.button("Visibility hidden").click;
-    assert(!@browser.spandiv("using visibility").visible?)
-    @browser.button("Visibility visible").click;
-    assert(@browser.spandiv("using visibility").visible?)
+    assert(@b.spandiv("using visibility").visible?)
+    @b.button("Visibility hidden").click;
+    assert(!@b.spandiv("using visibility").visible?)
+    @b.button("Visibility visible").click;
+    assert(@b.spandiv("using visibility").visible?)
 
-    assert(!@browser.byId("nestedBlockInNone").visible?)
-    assert(!@browser.byId("absoluteNestedBlockInNone").visible?)        
+    assert(!@b.byId("nestedBlockInNone").visible?)
+    assert(!@b.byId("absoluteNestedBlockInNone").visible?)        
   end
   
   def test_check() 
-    @browser.navigate_to(@base_url  + "/demo/")
-    @browser.link("Form Test").click;
-    assert_equal("false", @browser.checkbox("c1").fetch("checked"))
-    assert(!@browser.checkbox("c1").checked?)
-    @browser.checkbox("c1").check()
-    assert_equal("true", @browser.checkbox("c1").fetch("checked"))
-    assert(@browser.checkbox("c1").checked?)
-    @browser.checkbox("c1").check()
-    assert_equal("true", @browser.checkbox("c1").fetch("checked"))
-    @browser.checkbox("c1").uncheck()
-    assert_equal("false", @browser.checkbox("c1").fetch("checked"))
-    @browser.checkbox("c1").uncheck()
-    assert_equal("false", @browser.checkbox("c1").fetch("checked"))
-    @browser.checkbox("c1").click;
-    assert_equal("true", @browser.checkbox("c1").fetch("checked"))
+    @b.navigate_to(@base_url  + "/demo/")
+    @b.link("Form Test").click;
+    assert_equal("false", @b.checkbox("c1").fetch("checked"))
+    assert(!@b.checkbox("c1").checked?)
+    @b.checkbox("c1").check()
+    assert_equal("true", @b.checkbox("c1").fetch("checked"))
+    assert(@b.checkbox("c1").checked?)
+    @b.checkbox("c1").check()
+    assert_equal("true", @b.checkbox("c1").fetch("checked"))
+    @b.checkbox("c1").uncheck()
+    assert_equal("false", @b.checkbox("c1").fetch("checked"))
+    @b.checkbox("c1").uncheck()
+    assert_equal("false", @b.checkbox("c1").fetch("checked"))
+    @b.checkbox("c1").click;
+    assert_equal("true", @b.checkbox("c1").fetch("checked"))
   end
   
   def test_focus() 
-    @browser.navigate_to(@base_url  + "/demo/focusTest.htm")
-    @browser.textbox("t2").focus()
-    assert_equal("focused", @browser.textbox("t1").value)
-    @browser.textbox("t2").remove_focus()
-    assert_equal("not focused", @browser.textbox("t1").value)
-    @browser.textbox("t2").focus()
-    assert_equal("focused", @browser.textbox("t1").value)        
+    @b.navigate_to(@base_url  + "/demo/focusTest.htm")
+    @b.textbox("t2").focus()
+    assert_equal("focused", @b.textbox("t1").value)
+    @b.textbox("t2").remove_focus()
+    assert_equal("not focused", @b.textbox("t1").value)
+    @b.textbox("t2").focus()
+    assert_equal("focused", @b.textbox("t1").value)        
   end
   
   def test_title() 
-    @browser.navigate_to(@base_url  + "/demo/index.htm")
-    assert_equal("Sahi Tests", @browser.title)
-    @browser.link("Form Test").click;
-    assert_equal("Form Test", @browser.title)
-    @browser.link("Back").click;
-    @browser.link("Window Open Test With Title").click;
-    assert_equal("With Title", @browser.popup("With Title").title)
+    @b.navigate_to(@base_url  + "/demo/index.htm")
+    assert_equal("Sahi Tests", @b.title)
+    @b.link("Form Test").click;
+    assert_equal("Form Test", @b.title)
+    @b.link("Back").click;
+    @b.link("Window Open Test With Title").click;
+    assert_equal("With Title", @b.popup("With Title").title)
   end
   
   def test_area() 
-    @browser.navigate_to(@base_url  + "/demo/map.htm")
-    @browser.navigate_to("map.htm")
-    assert(@browser.area("Record").exists?)
-    assert(@browser.area("Playback").exists?)
-    assert(@browser.area("Info").exists?)
-    assert(@browser.area("Circular").exists?)
-    @browser.area("Record").mouse_over()
-    assert_equal("Record", @browser.div("output").text)
-    @browser.button("Clear").mouse_over()
-    assert_equal("", @browser.div("output").text)
-    @browser.area("Record").click;
-    assert(@browser.link("linkByContent").exists?)
-    #@browser.navigate_to("map.htm")        
+    @b.navigate_to(@base_url  + "/demo/map.htm")
+    @b.navigate_to("map.htm")
+    assert(@b.area("Record").exists?)
+    assert(@b.area("Playback").exists?)
+    assert(@b.area("Info").exists?)
+    assert(@b.area("Circular").exists?)
+    @b.area("Record").mouse_over()
+    assert_equal("Record", @b.div("output").text)
+    @b.button("Clear").mouse_over()
+    assert_equal("", @b.div("output").text)
+    @b.area("Record").click;
+    assert(@b.link("linkByContent").exists?)
+    #@b.navigate_to("map.htm")        
   end  
   
   def test_dragdrop()
-    @browser.navigate_to("http://www.snook.ca/technical/mootoolsdragdrop/")
-    @browser.div("Drag me").drag_and_drop_on(@browser.xy(@browser.div("Item 2"), 5, 5))
-    assert @browser.div("dropped").exists?
-    assert @browser.div("Item 1").exists?
-    assert @browser.div("Item 3").exists?
-    assert @browser.div("Item 4").exists?
+    @b.navigate_to("http://www.snook.ca/technical/mootoolsdragdrop/")
+    @b.div("Drag me").drag_and_drop_on(@b.xy(@b.div("Item 2"), 5, 5))
+    assert @b.div("dropped").exists?
+    assert @b.div("Item 1").exists?
+    assert @b.div("Item 3").exists?
+    assert @b.div("Item 4").exists?
   end 
   
   def test_wait() 
-    @browser.navigate_to(@base_url  + "/demo/waitCondition1.htm")
-    @browser.wait(15) {"populated" == @browser.textbox("t1").value}
-    assert_equal("populated", @browser.textbox("t1").value)
+    @b.navigate_to(@base_url  + "/demo/waitCondition1.htm")
+    @b.wait(15) {"populated" == @b.textbox("t1").value}
+    assert_equal("populated", @b.textbox("t1").value)
   end
   
   def test_google()
-    @browser.navigate_to("http://www.google.com")
-    @browser.textbox("q").value = "sahi forums"
-    @browser.submit("Google Search").click
-    @browser.link("Sign In").click        
-    assert @browser.textbox("Form/Email").visible?
+    @b.navigate_to("http://www.google.com")
+    @b.textbox("q").value = "sahi forums"
+    @b.submit("Google Search").click
+    @b.link("Sign In").click        
+    assert @b.textbox("Form/Email").visible?
   end
 
   def test_dblclick()
-    @browser.navigate_to("#{@base_url}/demo/clicks.htm")
-    @browser.div("dbl click me").dblclick
-    assert_equal("[DOUBLE_CLICK]", @browser.textarea("t2").value)
-    @browser.button("Clear").click
+    @b.navigate_to("#{@base_url}/demo/clicks.htm")
+    @b.div("dbl click me").dblclick
+    assert_equal("[DOUBLE_CLICK]", @b.textarea("t2").value)
+    @b.button("Clear").click
   end
   
   def test_right_click()
-    @browser.navigate_to("#{@base_url}/demo/clicks.htm")
-    @browser.div("right click me").right_click
-    assert_equal("[RIGHT_CLICK]", @browser.textarea("t2").value)
-    @browser.button("Clear").click
+    @b.navigate_to("#{@base_url}/demo/clicks.htm")
+    @b.div("right click me").right_click
+    assert_equal("[RIGHT_CLICK]", @b.textarea("t2").value)
+    @b.button("Clear").click
   end
   
   def test_different_domains()
-    @browser.navigate_to("#{@base_url}/demo/")
-    @browser.link("Different Domains External").click
-    domain_tyto = @browser.domain("www.tytosoftware.com")
-    domain_bing = @browser.domain("www.bing.com")
+    @b.navigate_to("#{@base_url}/demo/")
+    @b.link("Different Domains External").click
+    domain_tyto = @b.domain("www.tytosoftware.com")
+    domain_bing = @b.domain("www.bing.com")
     
     domain_tyto.link("Link Test").click
     domain_bing.textbox("q").value = "fdsfsd"
@@ -429,79 +478,139 @@ class SahiDriverTest < Test::Unit::TestCase
     domain_tyto.link("Back").click
     domain_bing.div("bgDiv").click
 
-    @browser.navigate_to("#{@base_url}/demo/");
+    @b.navigate_to("#{@base_url}/demo/");
   end
   
   def test_browser_types()
-    @browser.navigate_to("#{@base_url}/demo/")
+    @b.navigate_to("#{@base_url}/demo/")
     if (@browser_name == "firefox")
-      assert(!@browser.ie?())
-      assert(@browser.firefox?())
+      assert(!@b.ie?())
+      assert(@b.firefox?())
     elsif (@browser_name == "ie")
-      assert(@browser.ie?())
-      assert(!@browser.firefox?())
+      assert(@b.ie?())
+      assert(!@b.firefox?())
     end
   end
   
   def test_browser_js()
-    @browser.browser_js = "function giveMyNumber(){return '23';}"
-    @browser.navigate_to("#{@base_url}/demo/")
-    assert_equal("23", @browser.fetch("giveMyNumber()"))
-    @browser.link("Link Test").click()
-    assert_equal("23", @browser.fetch("giveMyNumber()"))
-    @browser.link("Back").click()
+    @b.browser_js = "function giveMyNumber(){return '23';}"
+    @b.navigate_to("#{@base_url}/demo/")
+    assert_equal("23", @b.fetch("giveMyNumber()"))
+    @b.link("Link Test").click()
+    assert_equal("23", @b.fetch("giveMyNumber()"))
+    @b.link("Back").click()
   end
   
   def test_count()
-    @browser.navigate_to("#{@base_url}/demo/count.htm")
-    assert_equal(4, @browser.link("group 0 link").count_similar())
-	assert_equal(0, @browser.link("group non existent link").count_similar());
-	assert_equal(5, @browser.link("/group 1/").count_similar());
-	assert_equal(2, @browser.link("/group 1/").in(@browser.div("div1")).count_similar());    
+    @b.navigate_to("#{@base_url}/demo/count.htm")
+    assert_equal(4, @b.link("group 0 link").count_similar())
+	assert_equal(0, @b.link("group non existent link").count_similar());
+	assert_equal(5, @b.link("/group 1/").count_similar());
+	assert_equal(2, @b.link("/group 1/").in(@b.div("div1")).count_similar());    
   end
   
   def test_collect()
-    @browser.navigate_to("#{@base_url}/demo/count.htm")
-	els = @browser.link("/group 1/").collect_similar();
+    @b.navigate_to("#{@base_url}/demo/count.htm")
+	elsAttr = @b.collect(@b.link("/group 1/").in(@b.div("div1")), "sahiText");
+    assert_equal(2, elsAttr.size());
+	assert_equal("group 1 link3", elsAttr[0]);
+	assert_equal("group 1 link4", elsAttr[1]);
+	
+	elsAttr2 = @b.collect(@b.link("/group 1/").in(@b.div("div1")));
+    assert_equal(2, elsAttr.size());
+	assert_equal("group 1 link3", elsAttr2[0].text);
+	assert_equal("group 1 link4", elsAttr2[1].text);
+	
+	els = @b.link("/group 1/").collect_similar();
 	assert_equal(5, els.size());
 	assert_equal("group 1 link1", els[0].text);
 	assert_equal("group 1 link2", els[1].text);
 
-	@browser.navigate_to("#{@base_url}/demo/count.htm")
-	els2 = @browser.link("/group 1/").in(@browser.div("div1")).collect_similar();
+	@b.navigate_to("#{@base_url}/demo/count.htm")
+	els2 = @b.link("/group 1/").in(@b.div("div1")).collect_similar();
 	assert_equal(2, els2.size());
 	assert_equal("group 1 link3", els2[0].text);
 	assert_equal("group 1 link4", els2[1].text);
   end
 
   def test_strict_visible()
-  	@browser.navigate_to("#{@base_url}/demo/strict_visible.htm")
-	assert_equal("b", @browser.textbox("q[1]").value)
-	@browser.strict_visibility_check = true
-	assert_equal("c", @browser.textbox("q[1]").value)
-	@browser.strict_visibility_check = false
-	assert_equal("b", @browser.textbox("q[1]").value)
+  	@b.navigate_to("#{@base_url}/demo/strict_visible.htm")
+	assert_equal("b", @b.textbox("q[1]").value)
+	@b.strict_visibility_check = true
+	assert_equal("c", @b.textbox("q[1]").value)
+	@b.strict_visibility_check = false
+	assert_equal("b", @b.textbox("q[1]").value)
   end
 
   def test_active_element()
-  	@browser.navigate_to("#{@base_url}/demo/training/login.htm")
-  	@browser.textbox("user").focus()
-  	assert_equal("user", @browser.activeElement().fetch("name"))
-	@browser.password("password").focus()
-  	assert_equal("password", @browser.activeElement().fetch("name"))
+  	@b.navigate_to("#{@base_url}/demo/training/login.htm")
+  	@b.textbox("user").focus()
+  	assert_equal("user", @b.activeElement().fetch("name"))
+	@b.password("password").focus()
+  	assert_equal("password", @b.activeElement().fetch("name"))
   end
   
   def test_identify_by_multiple_attributes()
-  	@browser.navigate_to("#{@base_url}/demo/training/books.htm")
-  	@browser.textbox("q[2]").value = "aaa"
-  	assert_equal("aaa", @browser.textbox({"name"=>"q", "sahiIndex"=>2}).value)
+  	@b.navigate_to("#{@base_url}/demo/training/books.htm")
+  	@b.textbox("q[2]").value = "aaa"
+  	assert_equal("aaa", @b.textbox({"name"=>"q", "sahiIndex"=>2}).value)
   end
   
   def test_key_press()
-  	@browser.navigate_to("#{@base_url}/demo/formTest.htm")
-  	@browser.textbox("t1").key_press("a")
-  	assert_equal("a", @browser.textbox("t1").value)
-  	@browser.textbox("t1").key_press([66,98]);
-  	assert_equal("ab", @browser.textbox("t1").value)
+  	@b.navigate_to("#{@base_url}/demo/formTest.htm")
+  	@b.textbox("t1").key_press("a")
+  	assert_equal("a", @b.textbox("t1").value)
+  	@b.textbox("t1").key_press([66,98]);
+  	assert_equal("ab", @b.textbox("t1").value)
+  end
+  
+  def test_execute_sahi()
+    @b.navigate_to(@base_url + "/demo/")
+    #@b.execute_step("_sahi._click(_sahi._link('Link Test'))")
+    @b.execute_sahi("_click(_link('Link Test'))") 
+    assert_equal("Link Test", @b.heading2("Link Test").text)           
+  end
+  
+  def test_get_win_simple
+  	@b.navigate_to(@base_url + "/demo/")
+	@b.wait(2)
+	windows = @b.get_windows()
+	assert_equal(1, windows.length)
+	assert_equal("0", windows[0]["wasOpened"])
+	assert_equal("Sahi Tests", windows[0]["windowTitle"])
+  end
+  
+  def test_get_win_popup_with_title
+		@b.navigate_to(@base_url + "/demo/")
+		@b.link("Window Open Test With Title").click
+		@b.wait(2)
+		windows = @b.get_windows()
+		assert_equal(2, windows.length);
+		assert_equal("1", windows[1]["wasOpened"]);
+		assert_equal("With Title", windows[1]["windowTitle"]);
+  end
+  
+  def test_get_win_popup_without_title
+ 		@b.navigate_to(@base_url + "/demo/")
+		@b.link("Window Open Test").click
+		@b.wait(2)
+		windows = @b.get_windows()
+		assert_equal(2, windows.length)
+		assert_equal("1", windows[1]["wasOpened"])
+		assert_equal("", windows[1]["windowTitle"])
+  end
+  
+  def test_get_win_popup_with_param
+ 		@b.navigate_to(@base_url + "/demo/")
+		@b.link("Window Open Test").click
+		popup_popwin = @b.popup("popWin")
+		popup_popwin.close
+		@b.wait(3)
+		windows = @b.get_windows()
+		windows2 = @b.get_windows(0)
+		windows3 = @b.get_windows(2)
+		assert_equal(2, windows.length)
+		assert_equal(2, windows2.length)
+		assert_equal(1, windows3.length)
   end
 end