watir-webdriver 0.0.9 → 0.1.0

data/spec/alert_spec.rb

@@ -0,0 +1,49 @@
+require File.expand_path("watirspec/spec_helper", File.dirname(__FILE__))
+require "watir-webdriver/extensions/alerts"
+
+describe "AlertHelper" do
+  before do
+    browser.goto("file://" + File.expand_path("html/alerts.html", File.dirname(__FILE__)))
+  end
+
+  it "handles an alert()" do
+    returned = browser.alert do
+      browser.button(:id => "alert").click
+    end
+
+    returned.should == "ok"
+  end
+
+  it "handles a confirmed confirm()" do
+    returned = browser.confirm(true) do
+      browser.button(:id => "confirm").click
+    end
+
+    returned.should == "set the value"
+
+    browser.button(:id => "confirm").value.should == "true"
+  end
+
+  it "handles a cancelled confirm()" do
+    returned = browser.confirm(false) do
+      browser.button(:id => "confirm").click
+    end
+
+    returned.should == "set the value"
+
+    browser.button(:id => "confirm").value.should == "false"
+  end
+
+  it "handles a prompt()" do
+    returned = browser.prompt("my name") do
+      browser.button(:id => "prompt").click
+    end
+
+    returned.should == {
+      :message => "enter your name",
+      :default => "John Doe"
+    }
+
+    browser.button(:id => "prompt").value.should == "my name"
+  end
+end

data/spec/element_locator_spec.rb

@@ -27,18 +27,18 @@ describe Watir::ElementLocator do
       end
 
       it "handles selector with tag name and multiple attributes" do
-        expect_one :xpath, %r".//div\[(@class='foo' and @title='bar'|@title='bar' and @class='foo')\]"
+        expect_one :xpath, ".//div[@class='foo' and @title='bar']"
 
-        locate_one :tag_name => "div",
-                   :class    => "foo",
-                   :title    => 'bar'
+        locate_one [:tag_name, "div",
+                    :class   , "foo",
+                    :title   , 'bar']
       end
 
       it "handles selector with no tag name and multiple attributes" do
-        expect_one :xpath, %r".//\*\[(@class='foo' and @title='bar'|@title='bar' and @class='foo')\]"
+        expect_one :xpath, ".//*[@class='foo' and @title='bar']"
 
-        locate_one :class => "foo",
-                   :title => "bar"
+        locate_one [:class, "foo",
+                    :title, "bar"]
       end
     end
 
@@ -85,11 +85,11 @@ describe Watir::ElementLocator do
       it "uses the corresponding <label>'s @for attribute when locating by label" do
         expect_one :xpath, ".//input[@type='text' and @id=//label[normalize-space()='foo']/@for]"
 
-        selector = {
-          :tag_name => "input",
-          :type     => "text",
-          :label    => "foo"
-        }
+        selector = [
+          :tag_name, "input",
+          :type    , "text",
+          :label   , "foo"
+        ]
 
         locate_one selector, Watir::Input.attributes
       end
@@ -203,7 +203,6 @@ describe Watir::ElementLocator do
 
       selector = {
         :tag_name => "input",
-        :type     => "radio",
         :xpath    => "//div"
       }
 
@@ -255,9 +254,9 @@ describe Watir::ElementLocator do
       it "handles selector with tag name and multiple attributes" do
         expect_all :xpath, ".//div[@class='foo' and @title='bar']"
 
-        locate_all :tag_name => "div",
-                   :class    => "foo",
-                   :title    => 'bar'
+        locate_all [:tag_name, "div",
+                    :class   , "foo",
+                    :title   , 'bar']
       end
     end
 

data/spec/element_spec.rb

@@ -11,36 +11,4 @@ describe Watir::Element do
     end
   end
 
-  describe "#== and #eql?" do
-    before { browser.goto(WatirSpec.files + "/definition_lists.html") }
-
-    it "returns true if the two elements point to the same DOM element" do
-      a = browser.dl(:id => "experience-list")
-      b = browser.dl
-
-      a.should == b
-      a.should eql(b)
-    end
-
-    it "returns false if the two elements are not the same" do
-      a = browser.dls[0]
-      b = browser.dls[1]
-
-      a.should_not == b
-      a.should_not eql(b)
-    end
-  end
-
-  describe "data-* attributes" do
-    before { browser.goto("file://" + File.expand_path("html/data_attributes.html", File.dirname(__FILE__))) }
-
-    it "finds elements by a data-* attribute" do
-      browser.p(:data_type => "ruby-library").should exist
-    end
-
-    it "returns the value of a data-* attribute" do
-      browser.p.data_type.should == "ruby-library"
-    end
-  end
-
 end

data/spec/html/alerts.html

@@ -0,0 +1,11 @@
+<!DOCTYPE html>
+<html>
+  <head>
+    <title>Alerts</title>
+  </head>
+  <body>
+    <input id=alert type=button onclick="alert('ok')" value=Alert>
+    <input id=confirm type=button onclick="this.value = confirm('set the value')" value=Confirm>
+    <input id=prompt type=button onclick='this.value = prompt("enter your name", "John Doe")' value=Prompt>
+  </body>
+</html>

data/spec/input_spec.rb

@@ -6,72 +6,34 @@ describe Watir::Input do
     browser.goto(WatirSpec.files + "/forms_with_input_elements.html")
   end
 
-  describe "#to_checkbox" do
+  describe "#to_subtype" do
     it "returns a CheckBox instance" do
-      e = browser.input(:xpath => "//input[@type='checkbox']").to_checkbox
+      e = browser.input(:xpath => "//input[@type='checkbox']").to_subtype
       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 = browser.input(:xpath => "//input[@type='radio']").to_subtype
       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_radio
-      }.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
+        browser.input(:xpath => "//input[@type='button']").to_subtype,
+        browser.input(:xpath => "//input[@type='submit']").to_subtype
       ]
 
-      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)
+      es.all? { |e| e.should be_kind_of(Watir::Button) }
     end
-  end
 
-  describe "#to_text_field" do
     it "returns a TextField instance" do
-      e = browser.input(:xpath => "//input[@type='text']").to_text_field
+      e = browser.input(:xpath => "//input[@type='text']").to_subtype
       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
-
-  describe "#to_file_field" do
     it "returns a TextField instance" do
-      e = browser.input(:xpath => "//input[@type='file']").to_file_field
+      e = browser.input(:xpath => "//input[@type='file']").to_subtype
       e.should be_kind_of(Watir::FileField)
     end
-
-    it "raises an error if the element is not a text field" do
-      lambda {
-        browser.input(:xpath => "//input[@type='radio']").to_file_field
-      }.should raise_error(TypeError)
-    end
   end
 end

data/spec/locator_spec_helper.rb

@@ -1,9 +1,12 @@
+require 'active_support/ordered_hash'
+
 module LocatorSpecHelper
   def driver
     @driver ||= mock(Selenium::WebDriver::Driver)
   end
 
-  def locator(selector, attrs = Watir::HTMLElement.attributes)
+  def locator(selector, attrs)
+    attrs ||= Watir::HTMLElement.attributes
     Watir::ElementLocator.new(driver, selector, attrs)
   end
 
@@ -15,12 +18,12 @@ module LocatorSpecHelper
     driver.should_receive(:find_elements).with(*args)
   end
 
-  def locate_one(*args)
-    locator(*args).locate
+  def locate_one(selector, attrs = nil)
+    locator(ordered_hash(selector), attrs).locate
   end
 
-  def locate_all(*args)
-    locator(*args).locate_all
+  def locate_all(selector, attrs = nil)
+    locator(ordered_hash(selector), attrs).locate_all
   end
 
   def element(opts = {})
@@ -33,5 +36,16 @@ module LocatorSpecHelper
 
     el
   end
+
+  def ordered_hash(selector)
+    case selector
+    when Hash
+      selector
+    when Array
+      ActiveSupport::OrderedHash[*selector]
+    else
+      raise ArgumentError, "couldn't create hash for #{selector.inspect}"
+    end
+  end
 end
 

data/spec/spec_helper.rb

@@ -25,5 +25,8 @@ if defined?(WatirSpec)
       args.any? { |arg| arg == :webdriver || arg == [:webdriver, browser] }
     }
   end
+
+  # WatirSpec.unguarded = true
 end
 
+

data/spec/watirspec/areas_spec.rb

@@ -7,6 +7,14 @@ describe "Areas" do
     browser.goto(WatirSpec.files + "/images.html")
   end
 
+  bug "http://github.com/jarib/celerity/issues#issue/25", :celerity do
+    describe "with selectors" do
+      it "returns the matching elements" do
+        browser.areas(:alt => "Tables").to_a.should == [browser.area(:alt => "Tables")]
+      end
+    end
+  end
+  
   describe "#length" do
     it "returns the number of areas" do
       browser.areas.length.should == 3

data/spec/watirspec/browser_spec.rb

@@ -81,13 +81,13 @@ describe "Browser" do
     end
   end
 
-  bug "http://github.com/jarib/watirspec/issues/issue/8" [:webdriver, :ie], [:webdriver, :chrome] do
+  bug "http://github.com/jarib/watirspec/issues/issue/8", [:webdriver, :ie], [:webdriver, :chrome] do
     describe ".start" do
       it "goes to the given URL and return an instance of itself" do
         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
+        browser.close
       end
     end
   end
@@ -204,7 +204,7 @@ describe "Browser" do
       browser.goto(WatirSpec.files + "/forms_with_input_elements.html")
     end
 
-    not_compliant_on [:webdriver, :ie] do
+    not_compliant_on [:webdriver, :ie], :celerity do
       it "returns an Array of matching elements" do
         objects = browser.elements_by_xpath("//*[@type='text']")
         objects.should be_kind_of(Array)
@@ -213,7 +213,7 @@ describe "Browser" do
       end
     end
 
-    deviates_on [:webdriver, :ie] do
+    deviates_on [:webdriver, :ie], :celerity do
       it "returns an Array of matching elements" do
         objects = browser.elements_by_xpath("//*[@type='text']")
         objects.should be_kind_of(Array)

data/spec/watirspec/button_spec.rb

@@ -105,10 +105,9 @@ describe "Button" do
   end
 
   describe "#src" do
-    bug "http://github.com/jarib/watir-webdriver/issues/issue/27", [: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
+    it "returns the src attribute for the button image" do
+      # varies between browsers
+      browser.button(:name, "new_user_image").src.should =~ %r"images/button.jpg$"
     end
 
     it "raises UnknownObjectException if the button does not exist" do

data/spec/watirspec/buttons_spec.rb

@@ -7,6 +7,14 @@ describe "Buttons" do
     browser.goto(WatirSpec.files + "/forms_with_input_elements.html")
   end
 
+  bug "http://github.com/jarib/celerity/issues#issue/25", :celerity do
+    describe "with selectors" do
+      it "returns the matching elements" do
+        browser.buttons(:name => "new_user_button").to_a.should == [browser.button(:name => "new_user_button")]
+      end
+    end
+  end
+  
   describe "#length" do
     it "returns the number of buttons" do
       browser.buttons.length.should == 8

data/spec/watirspec/checkboxes_spec.rb

@@ -7,6 +7,14 @@ describe "CheckBoxes" do
     browser.goto(WatirSpec.files + "/forms_with_input_elements.html")
   end
 
+  bug "http://github.com/jarib/celerity/issues#issue/25", :celerity do
+    describe "with selectors" do
+      it "returns the matching elements" do
+        browser.checkboxes(:value => "books").to_a.should == [browser.checkbox(:value => "books")]
+      end
+    end
+  end
+  
   describe "#length" do
     it "returns the number of checkboxes" do
       browser.checkboxes.length.should == 7

data/spec/watirspec/dds_spec.rb

@@ -7,6 +7,14 @@ describe "Dds" do
     browser.goto(WatirSpec.files + "/definition_lists.html")
   end
 
+  bug "http://github.com/jarib/celerity/issues#issue/25", :celerity do
+    describe "with selectors" do
+      it "returns the matching elements" do
+        browser.dds(:text => "11 years").to_a.should == [browser.dd(:text => "11 years")]
+      end
+    end
+  end
+  
   describe "#length" do
     it "returns the number of dds" do
       browser.dds.length.should == 11

data/spec/watirspec/dels_spec.rb

@@ -7,6 +7,14 @@ describe "Dels" do
     browser.goto(WatirSpec.files + "/non_control_elements.html")
   end
 
+  bug "http://github.com/jarib/celerity/issues#issue/25", :celerity do
+    describe "with selectors" do
+      it "returns the matching elements" do
+        browser.dels(:class => "lead").to_a.should == [browser.del(:class => "lead")]
+      end
+    end
+  end
+  
   describe "#length" do
     it "returns the number of dels" do
       browser.dels.length.should == 5

data/spec/watirspec/divs_spec.rb

@@ -7,6 +7,14 @@ describe "Divs" do
     browser.goto(WatirSpec.files + "/non_control_elements.html")
   end
 
+  bug "http://github.com/jarib/celerity/issues#issue/25", :celerity do
+    describe "with selectors" do
+      it "returns the matching elements" do
+        browser.divs(:id => "header").to_a.should == [browser.div(:id => "header")]
+      end
+    end
+  end
+  
   describe "#length" do
     it "returns the number of divs" do
       browser.divs.length.should == 12

data/spec/watirspec/dls_spec.rb

@@ -7,6 +7,14 @@ describe "Dls" do
     browser.goto(WatirSpec.files + "/definition_lists.html")
   end
 
+  bug "http://github.com/jarib/celerity/issues#issue/25", :celerity do
+    describe "with selectors" do
+      it "returns the matching elements" do
+        browser.dls(:title => "experience").to_a.should == [browser.dl(:title => "experience")]
+      end
+    end
+  end
+  
   describe "#length" do
     it "returns the number of dls" do
       browser.dls.length.should == 3