watir-webdriver 0.0.6 → 0.0.7

data/spec/input_spec.rb

@@ -0,0 +1,65 @@
+require File.expand_path 'watirspec/spec_helper', File.dirname(__FILE__)
+
+describe Watir::Input do
+
+  before do
+    browser.goto(WatirSpec.files + "/forms_with_input_elements.html")
+  end
+
+  describe "#to_checkbox" do
+    it "returns a CheckBox instance" do
+      e = browser.input(:xpath => "//input[@type='checkbox']").to_checkbox
+      e.should be_kind_of(Watir::CheckBox)
+    end
+
+    it "raises an error if the element is not a checkbox" do
+      lambda {
+        browser.input(:xpath => "//input[@type='text']").to_checkbox
+      }.should raise_error(TypeError)
+    end
+  end
+
+  describe "#to_radio" do
+    it "returns a Radio instance" do
+      e = browser.input(:xpath => "//input[@type='radio']").to_radio
+      e.should be_kind_of(Watir::Radio)
+    end
+
+    it "raises an error if the element is not a radio button" do
+      lambda {
+        browser.input(:xpath => "//input[@type='text']").to_checkbox
+      }.should raise_error(TypeError)
+    end
+  end
+
+  describe "#to_button" do
+    it "returns a Button instance" do
+      es = [
+        browser.input(:xpath => "//input[@type='button']").to_button,
+        browser.input(:xpath => "//input[@type='submit']").to_button
+      ]
+
+      es.each { |e| e.should be_kind_of(Watir::Button) }
+    end
+
+    it "raises an error if the element is not a button" do
+      lambda {
+        browser.input(:xpath => "//input[@type='text']").to_button
+      }.should raise_error(TypeError)
+    end
+  end
+
+  describe "#to_text_field" do
+    it "returns a TextField instance" do
+      e = browser.input(:xpath => "//input[@type='text']").to_text_field
+      e.should be_kind_of(Watir::TextField)
+    end
+
+    it "raises an error if the element is not a text field" do
+      lambda {
+        browser.input(:xpath => "//input[@type='radio']").to_text_field
+      }.should raise_error(TypeError)
+    end
+  end
+
+end

data/spec/spec_helper.rb

@@ -14,6 +14,13 @@ include Watir::Exception
 if defined?(WatirSpec)
   browser = (ENV['WATIR_WEBDRIVER_BROWSER'] || :firefox).to_sym
 
-  WatirSpec.browser_args   = [browser]
-  WatirSpec.implementation = :webdriver
+  WatirSpec.implementation do |imp|
+    imp.name          = :webdriver
+    imp.browser_class = Watir::Browser
+    imp.browser_args  = [browser]
+
+    imp.guard_proc = lambda { |args|
+      args.any? { |arg| arg == :webdriver || arg == [:webdriver, browser] }
+    }
+  end
 end

data/spec/watirspec/area_spec.rb

@@ -1,5 +1,5 @@
 # encoding: utf-8
-require File.dirname(__FILE__) + '/spec_helper'
+require File.expand_path('spec_helper', File.dirname(__FILE__))
 
 describe "Area" do
 
@@ -15,12 +15,10 @@ describe "Area" do
       browser.area(:title, "Tables").should exist
       browser.area(:title, /Tables/).should exist
 
-      bug "WTR-342", :watir do
-        browser.area(:url, "tables.html").should exist
-        browser.area(:url, /tables/).should exist
-        browser.area(:href, "tables.html").should exist
-        browser.area(:href, /tables/).should exist
-      end
+      browser.area(:url, "tables.html").should exist
+      browser.area(:url, /tables/).should exist
+      browser.area(:href, "tables.html").should exist
+      browser.area(:href, /tables/).should exist
 
       browser.area(:index, 0).should exist
       browser.area(:xpath, "//area[@id='NCE']").should exist
@@ -32,12 +30,10 @@ describe "Area" do
       browser.area(:title, "no_such_title").should_not exist
       browser.area(:title, /no_such_title/).should_not exist
 
-      bug "WTR-342", :watir do
-        browser.area(:url, "no_such_href").should_not exist
-        browser.area(:url, /no_such_href/).should_not exist
-        browser.area(:href, "tables.html").should exist
-        browser.area(:href, /tables/).should exist
-      end
+      browser.area(:url, "no_such_href").should_not exist
+      browser.area(:url, /no_such_href/).should_not exist
+      browser.area(:href, "no-tables.html").should_not exist
+      browser.area(:href, /no-tables/).should_not exist
 
       browser.area(:index, 1337).should_not exist
       browser.area(:xpath, "//area[@id='no_such_id']").should_not exist

data/spec/watirspec/areas_spec.rb

@@ -1,5 +1,5 @@
 # encoding: utf-8
-require File.dirname(__FILE__) + '/spec_helper'
+require File.expand_path('spec_helper', File.dirname(__FILE__))
 
 describe "Areas" do
 
@@ -21,10 +21,16 @@ describe "Areas" do
 
   describe "#each" do
     it "iterates through areas correctly" do
+      count = 0
+
       browser.areas.each_with_index do |a, index|
         a.id.should == browser.area(:index, index).id
         a.title.should == browser.area(:index, index).title
+
+        count += 1
       end
+
+      count.should > 0
     end
   end
 

data/spec/watirspec/browser_spec.rb

@@ -1,5 +1,5 @@
 # encoding: utf-8
-require File.dirname(__FILE__) + '/spec_helper'
+require File.expand_path('spec_helper', File.dirname(__FILE__))
 
 describe "Browser" do
 
@@ -9,38 +9,32 @@ describe "Browser" do
       browser.should exist
     end
 
-    not_compliant_on :webdriver do
-      it "returns false after IE#close" do
-        b = WatirSpec.new_browser
-        b.close
-        b.should_not exist
-      end
+    it "returns false after Browser#close" do
+      b = WatirSpec.new_browser
+      b.close
+      b.should_not exist
     end
   end
 
   # this should be rewritten - the actual string returned varies alot between implementations
   describe "#html" do
-    deviates_on :celerity do
-      it "returns the downloaded HTML of the page" do
-        browser.goto(WatirSpec.files + "/non_control_elements.html")
-        browser.html.should == File.read(File.dirname(__FILE__) + "/html/non_control_elements.html")
-      end
-    end
-
-    deviates_on :watir do
+    not_compliant_on [:webdriver, :ie] do
       it "returns the DOM of the page as an HTML string" do
         browser.goto(WatirSpec.files + "/right_click.html")
-        browser.html.should == "<HTML><HEAD><TITLE>Right Click Test</TITLE>\r\n<META http-equiv=Content-type content=\"text/html; charset=utf-8\">\r\n<SCRIPT src=\"javascript/helpers.js\" type=text/javascript charset=utf-8></SCRIPT>\r\n</HEAD>\r\n<BODY>\r\n<DIV id=messages></DIV>\r\n<DIV oncontextmenu='WatirSpec.addMessage(\"right-clicked\")' id=click>Right click!</DIV></BODY></HTML>"
+        html = browser.html.downcase # varies between browsers
+
+        html.should =~ /^<html/
+        html.should include('<meta http-equiv="content-type" content="text/html; charset=utf-8">')
       end
     end
 
-    deviates_on :webdriver do
+    deviates_on [:webdriver, :ie] do
       it "returns the DOM of the page as an HTML string" do
         browser.goto(WatirSpec.files + "/right_click.html")
         html = browser.html.downcase # varies between browsers
 
         html.should =~ /^<html/
-        html.should include("<meta http-equiv=\"content-type\" content=\"text/html; charset=utf-8\">")
+        html.should include('<meta content="text/html; charset=utf-8" http-equiv=content-type>')
       end
     end
   end
@@ -54,15 +48,13 @@ describe "Browser" do
 
   describe "#status" do
     not_compliant_on :webdriver do # need to set Firefox preference, might do this when selenium-webdriver exposes the profile used
-      bug "WTR-348", :watir do
-        it "returns the current value of window.status" do
-          browser.goto(WatirSpec.files + "/non_control_elements.html")
-
-          # for firefox, this needs to be enabled in
-          # Preferences -> Content -> Advanced -> Change status bar text
-          browser.execute_script "window.status = 'All done!';"
-          browser.status.should == "All done!"
-        end
+      it "returns the current value of window.status" do
+        browser.goto(WatirSpec.files + "/non_control_elements.html")
+
+        # for firefox, this needs to be enabled in
+        # Preferences -> Content -> Advanced -> Change status bar text
+        browser.execute_script "window.status = 'All done!';"
+        browser.status.should == "All done!"
       end
     end
   end
@@ -87,12 +79,11 @@ describe "Browser" do
     end
   end
 
-  not_compliant_on :webdriver do
-    # just hangs with watir-webdriver + IE
+  not_compliant_on [:webdriver, :ie] do # hang?
     describe ".start" do
       it "goes to the given URL and return an instance of itself" do
-        browser = Browser.start("#{WatirSpec.files}/non_control_elements.html")
-        browser.should be_instance_of(Browser)
+        browser = WatirSpec.implementation.browser_class.start("#{WatirSpec.files}/non_control_elements.html")
+        browser.should be_instance_of(WatirSpec.implementation.browser_class)
         browser.title.should == "Non-control elements"
         browser.quit
       end
@@ -179,57 +170,61 @@ describe "Browser" do
   end
 
   describe "#element_by_xpath" do
-    before :each do
-      browser.goto(WatirSpec.files + "/forms_with_input_elements.html")
-    end
-
-    bug "WTR-343", :watir do
-      it "finds submit buttons matching the given xpath" do
-        browser.element_by_xpath("//input[@type='submit']").should exist
-      end
-
-      it "finds reset buttons matching the given xpath" do
-        browser.element_by_xpath("//input[@type='reset']").should exist
-      end
-
-      it "finds image buttons matching the given xpath" do
-        browser.element_by_xpath("//input[@type='image']").should exist
-      end
-
-      it "finds the element matching the given xpath" do
-        browser.element_by_xpath("//input[@type='password']").should exist
-      end
-    end
-
-    bug "WTR-327", :watir do
-      it "will not find elements that doesn't exist" do
-        e = browser.element_by_xpath("//input[@type='foobar']")
-        e.should_not exist
-        lambda { e.text }.should raise_error(UnknownObjectException)
-      end
-    end
-  end
-
+     before :each do
+       browser.goto(WatirSpec.files + "/forms_with_input_elements.html")
+     end
+  
+     it "finds submit buttons matching the given xpath" do
+       browser.element_by_xpath("//input[@type='submit']").should exist
+     end
+  
+     it "finds reset buttons matching the given xpath" do
+       browser.element_by_xpath("//input[@type='reset']").should exist
+     end
+  
+     it "finds image buttons matching the given xpath" do
+       browser.element_by_xpath("//input[@type='image']").should exist
+     end
+  
+     it "finds the element matching the given xpath" do
+       browser.element_by_xpath("//input[@type='password']").should exist
+     end
+  
+     it "will not find elements that doesn't exist" do
+       e = browser.element_by_xpath("//input[@type='foobar']")
+       e.should_not exist
+       lambda { e.text }.should raise_error(UnknownObjectException)
+     end
+   end
+ 
   describe "#elements_by_xpath" do
     before :each do
       browser.goto(WatirSpec.files + "/forms_with_input_elements.html")
     end
 
-    bug "WTR-344", :watir do
+    not_compliant_on [:webdriver, :ie] do
       it "returns an Array of matching elements" do
         objects = browser.elements_by_xpath("//*[@type='text']")
         objects.should be_kind_of(Array)
+
         objects.size.should == 5
       end
     end
 
-    bug "WTR-328", :watir do
-      it "returns an empty Array if there are no matching elements" do
-        objects = browser.elements_by_xpath("//*[@type='foobar']")
+    deviates_on [:webdriver, :ie] do
+      it "returns an Array of matching elements" do
+        objects = browser.elements_by_xpath("//*[@type='text']")
         objects.should be_kind_of(Array)
-        objects.size.should == 0
+
+        objects.size.should == 6
       end
     end
+
+    it "returns an empty Array if there are no matching elements" do
+      objects = browser.elements_by_xpath("//*[@type='foobar']")
+      objects.should be_kind_of(Array)
+      objects.size.should == 0
+    end
   end
 
   describe "#add_checker" do
@@ -237,16 +232,17 @@ describe "Browser" do
       lambda { browser.add_checker }.should raise_error(ArgumentError)
     end
 
-    not_compliant_on :webdriver do
-      # if on IE, this slows the rest of the suite way down for some reason
-      it "runs the given proc on each page load" do
-        output = ''
-        proc = Proc.new { |browser| output << browser.text }
+    it "runs the given proc on each page load" do
+      output = ''
+      proc = Proc.new { |browser| output << browser.text }
 
+      begin
         browser.add_checker(proc)
         browser.goto(WatirSpec.files + "/non_control_elements.html")
 
         output.should include('Dubito, ergo cogito, ergo sum')
+      ensure
+        browser.disable_checker(proc)
       end
     end
   end

data/spec/watirspec/button_spec.rb

@@ -1,5 +1,5 @@
 # encoding: utf-8
-require File.dirname(__FILE__) + '/spec_helper'
+require File.expand_path('spec_helper', File.dirname(__FILE__))
 
 describe "Button" do
 
@@ -50,6 +50,13 @@ describe "Button" do
       browser.button(:xpath, "//input[@id='no_such_id']").should_not exist
     end
 
+    bug "http://github.com/jarib/watir-webdriver/issues#issue/6", :webdriver do
+      it "checks the tag name and type attribute when locating by xpath" do
+        browser.button(:xpath, "//input[@type='text']").should_not exist
+        browser.button(:xpath, "//input[@type='button']").should exist
+      end
+    end
+
     it "raises TypeError when 'what' argument is invalid" do
       lambda { browser.button(:id, 3.14).exists? }.should raise_error(TypeError)
     end
@@ -100,15 +107,15 @@ describe "Button" do
   end
 
   describe "#src" do
-    not_compliant_on :watir do
+    not_compliant_on [:webdriver, :ie], [:webdriver, :firefox] do
       it "returns the src attribute for the button image" do
         browser.button(:name, "new_user_image").src.should == "images/button.jpg"
       end
     end
 
-    deviates_on :watir do
-      it "returns the full url for the button image" do
-        browser.button(:name, "new_user_image").src.should == "file:///#{File.dirname(__FILE__)}/images/button.jpg"
+    deviates_on [:webdriver, :ie], [:webdriver, :firefox] do
+      it "returns the src attribute for the button image" do
+        browser.button(:name, "new_user_image").src.should == "file:///#{File.expand_path(File.dirname(__FILE__))}/html/images/button.jpg"
       end
     end
 
@@ -118,15 +125,15 @@ describe "Button" do
   end
 
   describe "#style" do
-    deviates_on :watir do
+    not_compliant_on [:webdriver, :ie] do
       it "returns the style attribute if the button exists" do
-        browser.button(:id, 'delete_user_submit').style.should == "border-right: red 4px solid; border-top: red 4px solid; border-left: red 4px solid; border-bottom: red 4px solid"
+        browser.button(:id, 'delete_user_submit').style.should == "border: 4px solid red;"
       end
     end
 
-    not_compliant_on :watir do
+    deviates_on [:webdriver, :ie] do
       it "returns the style attribute if the button exists" do
-        browser.button(:id, 'delete_user_submit').style.should == "border: 4px solid red;"
+        browser.button(:id, 'delete_user_submit').style.should == "BORDER-BOTTOM: red 4px solid; BORDER-LEFT: red 4px solid; BORDER-TOP: red 4px solid; BORDER-RIGHT: red 4px solid"
       end
     end
 

data/spec/watirspec/buttons_spec.rb

@@ -1,5 +1,5 @@
 # encoding: utf-8
-require File.dirname(__FILE__) + '/spec_helper'
+require File.expand_path('spec_helper', File.dirname(__FILE__))
 
 describe "Buttons" do
 
@@ -8,10 +8,8 @@ describe "Buttons" do
   end
 
   describe "#length" do
-    bug "WTR-349", :watir do
-      it "returns the number of buttons" do
-        browser.buttons.length.should == 8
-      end
+    it "returns the number of buttons" do
+      browser.buttons.length.should == 8
     end
   end
 
@@ -28,20 +26,24 @@ describe "Buttons" do
   end
 
   describe "#last" do
-    bug "WTR-349", :watir do
-      it "returns the last element in the collection" do
-        browser.buttons.last.value.should == browser.buttons[-1].value
-      end
+    it "returns the last element in the collection" do
+      browser.buttons.last.value.should == browser.buttons[-1].value
     end
   end
 
   describe "#each" do
     it "iterates through buttons correctly" do
+      count = 0
+
       browser.buttons.each_with_index do |b, index|
         b.name.should == browser.button(:index, index).name
         b.id.should == browser.button(:index, index).id
         b.value.should == browser.button(:index, index).value
+
+		count += 1
       end
+
+      count.should > 0
     end
   end