RubyGems - watir-webdriver - Versions diffs - 0.0.7 → 0.0.8 - Mend

watir-webdriver 0.0.7 → 0.0.8

Files changed (111) hide show

data/Gemfile +2 -0
data/Gemfile.lock +48 -0
data/Rakefile +23 -8
data/VERSION +1 -1
data/lib/watir-webdriver.rb +7 -5
data/lib/watir-webdriver/browser.rb +9 -2
data/lib/watir-webdriver/browserbot.js +5 -2
data/lib/watir-webdriver/container.rb +6 -9
data/lib/watir-webdriver/{collections/element_collection.rb → element_collection.rb} +5 -0
data/lib/watir-webdriver/elements/button.rb +5 -4
data/lib/watir-webdriver/{element.rb → elements/element.rb} +29 -5
data/lib/watir-webdriver/elements/file_field.rb +21 -4
data/lib/watir-webdriver/elements/frame.rb +1 -1
data/lib/watir-webdriver/elements/generated.rb +750 -750
data/lib/watir-webdriver/elements/image.rb +6 -0
data/lib/watir-webdriver/elements/link.rb +0 -4
data/lib/watir-webdriver/elements/select.rb +22 -24
data/lib/watir-webdriver/elements/table_row.rb +11 -1
data/lib/watir-webdriver/elements/text_field.rb +5 -15
data/lib/watir-webdriver/extensions/wait.rb +107 -0
data/lib/watir-webdriver/html/generator.rb +1 -1
data/lib/watir-webdriver/html/util.rb +1 -10
data/lib/watir-webdriver/html/visitor.rb +2 -14
data/lib/watir-webdriver/locators/button_locator.rb +22 -3
data/lib/watir-webdriver/locators/element_locator.rb +54 -28
data/lib/watir-webdriver/locators/table_row_locator.rb +3 -1
data/lib/watir-webdriver/locators/text_field_locator.rb +7 -3
data/lib/watir-webdriver/window_switching.rb +78 -0
data/spec/browser_spec.rb +43 -0
data/spec/container_spec.rb +43 -0
data/spec/element_locator_spec.rb +305 -0
data/spec/element_spec.rb +34 -5
data/spec/html/closeable.html +13 -0
data/spec/html/data_attributes.html +9 -0
data/spec/html/wait.html +27 -0
data/spec/html/window_switching.html +12 -0
data/spec/input_spec.rb +14 -2
data/spec/locator_spec_helper.rb +37 -0
data/spec/spec_helper.rb +3 -0
data/spec/wait_spec.rb +98 -0
data/spec/watirspec/area_spec.rb +4 -4
data/spec/watirspec/browser_spec.rb +37 -35
data/spec/watirspec/button_spec.rb +22 -17
data/spec/watirspec/buttons_spec.rb +1 -1
data/spec/watirspec/checkbox_spec.rb +4 -0
data/spec/watirspec/checkboxes_spec.rb +1 -1
data/spec/watirspec/collections_spec.rb +4 -2
data/spec/watirspec/dd_spec.rb +4 -0
data/spec/watirspec/dds_spec.rb +1 -1
data/spec/watirspec/del_spec.rb +4 -0
data/spec/watirspec/dels_spec.rb +1 -1
data/spec/watirspec/div_spec.rb +38 -12
data/spec/watirspec/divs_spec.rb +1 -1
data/spec/watirspec/dl_spec.rb +20 -6
data/spec/watirspec/dls_spec.rb +1 -1
data/spec/watirspec/dt_spec.rb +4 -0
data/spec/watirspec/dts_spec.rb +1 -1
data/spec/watirspec/em_spec.rb +4 -0
data/spec/watirspec/ems_spec.rb +1 -1
data/spec/watirspec/filefield_spec.rb +37 -2
data/spec/watirspec/filefields_spec.rb +1 -1
data/spec/watirspec/font_spec.rb +4 -0
data/spec/watirspec/form_spec.rb +4 -0
data/spec/watirspec/forms_spec.rb +6 -4
data/spec/watirspec/frame_spec.rb +6 -0
data/spec/watirspec/hidden_spec.rb +5 -4
data/spec/watirspec/hiddens_spec.rb +1 -1
data/spec/watirspec/hn_spec.rb +4 -0
data/spec/watirspec/image_spec.rb +4 -0
data/spec/watirspec/images_spec.rb +1 -1
data/spec/watirspec/ins_spec.rb +4 -0
data/spec/watirspec/inses_spec.rb +1 -1
data/spec/watirspec/label_spec.rb +4 -0
data/spec/watirspec/labels_spec.rb +2 -2
data/spec/watirspec/li_spec.rb +4 -0
data/spec/watirspec/link_spec.rb +15 -10
data/spec/watirspec/links_spec.rb +6 -0
data/spec/watirspec/lis_spec.rb +1 -1
data/spec/watirspec/map_spec.rb +4 -0
data/spec/watirspec/maps_spec.rb +1 -1
data/spec/watirspec/meta_spec.rb +4 -0
data/spec/watirspec/metas_spec.rb +1 -1
data/spec/watirspec/ol_spec.rb +23 -9
data/spec/watirspec/option_spec.rb +19 -7
data/spec/watirspec/p_spec.rb +4 -0
data/spec/watirspec/pre_spec.rb +4 -0
data/spec/watirspec/pres_spec.rb +1 -1
data/spec/watirspec/ps_spec.rb +1 -1
data/spec/watirspec/radio_spec.rb +22 -13
data/spec/watirspec/radios_spec.rb +6 -0
data/spec/watirspec/select_list_spec.rb +29 -17
data/spec/watirspec/select_lists_spec.rb +6 -0
data/spec/watirspec/span_spec.rb +10 -2
data/spec/watirspec/spans_spec.rb +1 -1
data/spec/watirspec/strong_spec.rb +14 -4
data/spec/watirspec/table_body_spec.rb +4 -0
data/spec/watirspec/table_cell_spec.rb +9 -3
data/spec/watirspec/table_cells_spec.rb +0 -1
data/spec/watirspec/table_footer_spec.rb +4 -0
data/spec/watirspec/table_header_spec.rb +4 -0
data/spec/watirspec/table_row_spec.rb +15 -7
data/spec/watirspec/table_rows_spec.rb +2 -2
data/spec/watirspec/table_spec.rb +13 -7
data/spec/watirspec/tables_spec.rb +1 -1
data/spec/watirspec/text_field_spec.rb +21 -12
data/spec/watirspec/text_fields_spec.rb +6 -0
data/spec/watirspec/ul_spec.rb +4 -0
data/spec/window_switching_spec.rb +116 -0
data/watir-webdriver.gemspec +38 -16
metadata +51 -27
data/lib/watir-webdriver/collections/table_row_collection.rb +0 -11

data/spec/element_spec.rb CHANGED Viewed

@@ -1,17 +1,46 @@
-require File.expand_path 'watirspec/spec_helper', File.dirname(__FILE__)
+require File.expand_path('watirspec/spec_helper', File.dirname(__FILE__))
 describe Watir::Element do
-  before :each do
-    browser.goto("file://" + File.expand_path("html/keylogger.html", File.dirname(__FILE__)))
-  end
   describe "#send_keys" do
     it "sends keystrokes to the element" do
+      browser.goto("file://" + File.expand_path("html/keylogger.html", File.dirname(__FILE__)))
       browser.div(:id, 'receiver').send_keys("hello world")
       browser.div(:id, 'output').ps.size.should == 11
     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/closeable.html ADDED Viewed

@@ -0,0 +1,13 @@
+<!DOCTYPE HTML>
+<html>
+  <head>
+    <title>closeable window</title>
+  </head>
+  <body>
+    <p>
+      Click <a id="close" href="#" onclick="window.close()">here</a> to close this window.
+    </p>
+  </body>
+</html>

data/spec/html/data_attributes.html ADDED Viewed

@@ -0,0 +1,9 @@
+<!DOCTYPE html>
+<html>
+  <head>
+    <title>data-* attributes</title>
+  </head>
+  <body>
+    <p data-type=ruby-library>watir-webdriver</p>
+  </body>
+</html>

data/spec/html/wait.html ADDED Viewed

@@ -0,0 +1,27 @@
+<!DOCTYPE HTML>
+<html>
+  <head>
+    <title>wait test</title>
+    <script type="text/javascript" charset="utf-8">
+        function setTimeoutDisplay(id, display, timeout) {
+	    setTimeout(function() {
+	       document.getElementById(id).style.display = display;
+	    }, timeout);
+        }
+        function setTimeoutRemove(id, timeout) {
+	    setTimeout(function() {
+	       var e = document.getElementById(id);
+	       e.parentNode.removeChild(e);
+	    }, timeout);
+        }
+    </script>
+  </head>
+  <body>
+    <div id="foo" style="display:block;">foo</div>
+    <div id="bar" style="display:none;">bar</div>
+    <a id="show_bar" href="#" onclick="setTimeoutDisplay('bar', 'block', 500);">show bar</a>
+    <a id="hide_foo" href="#" onclick="setTimeoutDisplay('foo', 'none', 500);">hide foo</a>
+    <a id="remove_foo" href="#" onclick="setTimeoutRemove('foo', 500);">remove foo</a>
+  </body>
+</html>

data/spec/html/window_switching.html ADDED Viewed

@@ -0,0 +1,12 @@
+<!DOCTYPE HTML>
+<html>
+  <head>
+    <title>window switching</title>
+  </head>
+  <body>
+    <p>
+      Click <a id="open" href="#" onclick='window.open("closeable.html", "closeable-window")'>here</a> to open a new window.
+    </p>
+  </body>
+</html>

data/spec/input_spec.rb CHANGED Viewed

@@ -1,4 +1,4 @@
-require File.expand_path 'watirspec/spec_helper', File.dirname(__FILE__)
+require File.expand_path('watirspec/spec_helper', File.dirname(__FILE__))
 describe Watir::Input do
@@ -27,7 +27,7 @@ describe Watir::Input do
     it "raises an error if the element is not a radio button" do
       lambda {
-        browser.input(:xpath => "//input[@type='text']").to_checkbox
+        browser.input(:xpath => "//input[@type='text']").to_radio
       }.should raise_error(TypeError)
     end
   end
@@ -62,4 +62,16 @@ describe Watir::Input do
     end
   end
+  describe "#to_file_field" do
+    it "returns a TextField instance" do
+      e = browser.input(:xpath => "//input[@type='file']").to_file_field
+      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 ADDED Viewed

@@ -0,0 +1,37 @@
+module LocatorSpecHelper
+  def driver
+    @driver ||= mock(Selenium::WebDriver::Driver)
+  end
+  def locator(selector, attrs = Watir::HTMLElement.attributes)
+    Watir::ElementLocator.new(driver, selector, attrs)
+  end
+  def expect_one(*args)
+    driver.should_receive(:find_element).with(*args)
+  end
+  def expect_all(*args)
+    driver.should_receive(:find_elements).with(*args)
+  end
+  def locate_one(*args)
+    locator(*args).locate
+  end
+  def locate_all(*args)
+    locator(*args).locate_all
+  end
+  def element(opts = {})
+    attrs = opts.delete(:attributes)
+    el = mock(Watir::Element, opts)
+    attrs.each do |key, value|
+      el.stub!(:attribute).with(key).and_return(value)
+    end if attrs
+    el
+  end
+end

data/spec/spec_helper.rb CHANGED Viewed

@@ -4,12 +4,14 @@ $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 require 'rubygems'
 require 'watir-webdriver'
+require 'locator_spec_helper'
 require 'spec'
 require 'spec/autorun'
 include Watir
 include Watir::Exception
+WEBDRIVER_SELECTORS = [:class, :class_name, :css, :id, :name, :tag_name, :xpath]
 if defined?(WatirSpec)
   browser = (ENV['WATIR_WEBDRIVER_BROWSER'] || :firefox).to_sym
@@ -24,3 +26,4 @@ if defined?(WatirSpec)
     }
   end
 end

data/spec/wait_spec.rb ADDED Viewed

@@ -0,0 +1,98 @@
+require File.expand_path("watirspec/spec_helper", File.dirname(__FILE__))
+require "watir-webdriver/extensions/wait"
+describe Watir::Wait do
+  describe "#until" do
+    it "waits until the block returns true" do
+      Wait::until(1) { true }.should be_true
+    end
+    it "times out" do
+      lambda do
+        Wait::until(1) { false }
+      end.should raise_error(Watir::Wait::TimeoutError)
+    end
+  end
+  describe "#while" do
+    it "waits while the block returns true" do
+      Wait::while(1) { false }.should == nil
+    end
+    it "times out" do
+      lambda do
+        Wait::while(1) { true }
+      end.should raise_error(Watir::Wait::TimeoutError)
+    end
+  end
+end
+describe Watir::Element do
+  before do
+    browser.goto("file://" + File.expand_path("html/wait.html", File.dirname(__FILE__)))
+  end
+  describe "#present?" do
+    it "returns true if the element exists and is visible" do
+      browser.div(:id, 'foo').should be_present
+    end
+    it "returns false if the element exists but is not visible" do
+      browser.div(:id, 'bar').should_not be_present
+    end
+    it "returns false if the element does not exist" do
+      browser.div(:id, 'should-not-exist').should_not be_present
+    end
+  end
+  describe "#when_present" do
+    it "invokes subsequent methods after waiting for the element's presence" do
+      browser.a(:id, 'show_bar').click
+      called = false
+      browser.div(:id, 'bar').when_present(1) do
+        called = true
+      end
+      called.should == true
+    end
+    it "times out" do
+      lambda do
+        browser.div(:id, 'bar').when_present(1) {}
+      end.should raise_error(Watir::Wait::TimeoutError)
+    end
+  end
+  describe "#wait_until_present" do
+    it "invokes subsequent methods after waiting until the element's appereance" do
+      browser.a(:id, 'show_bar').click
+      browser.div(:id, 'bar').wait_until_present(1)
+    end
+    it "times out" do
+      lambda do
+        browser.div(:id, 'bar').wait_until_present(1)
+      end.should raise_error(Watir::Wait::TimeoutError)
+    end
+  end
+  describe "#wait_while_present" do
+    it "invokes subsequent methods after waiting until the element's disappearance" do
+      browser.a(:id, 'hide_foo').click
+      browser.div(:id, 'foo').wait_while_present(1)
+    end
+    it "invokes subsequent methods after waiting until the element's removal" do
+      browser.a(:id, 'remove_foo').click
+      browser.div(:id, 'foo').wait_while_present(1)
+    end
+    it "times out" do
+      lambda do
+        browser.div(:id, 'foo').wait_while_present(1)
+      end.should raise_error(Watir::Wait::TimeoutError)
+    end
+  end
+end

data/spec/watirspec/area_spec.rb CHANGED Viewed

@@ -15,8 +15,6 @@ describe "Area" do
       browser.area(:title, "Tables").should exist
       browser.area(:title, /Tables/).should exist
-      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
@@ -24,14 +22,16 @@ describe "Area" do
       browser.area(:xpath, "//area[@id='NCE']").should exist
     end
+    it "returns the first area if given no args" do
+      browser.area.should exist
+    end
     it "returns false if the area doesn't exist" do
       browser.area(:id, "no_such_id").should_not exist
       browser.area(:id, /no_such_id/).should_not exist
       browser.area(:title, "no_such_title").should_not exist
       browser.area(:title, /no_such_title/).should_not exist
-      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

data/spec/watirspec/browser_spec.rb CHANGED Viewed

@@ -9,10 +9,12 @@ describe "Browser" do
       browser.should exist
     end
-    it "returns false after Browser#close" do
-      b = WatirSpec.new_browser
-      b.close
-      b.should_not exist
+    bug "http://github.com/jarib/watir-webdriver/issues/issue/29", [:webdriver, :ie] do
+      it "returns false after Browser#close" do
+        b = WatirSpec.new_browser
+        b.close
+        b.should_not exist
+      end
     end
   end
@@ -79,7 +81,7 @@ describe "Browser" do
     end
   end
-  not_compliant_on [:webdriver, :ie] do # hang?
+  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")
@@ -158,9 +160,9 @@ describe "Browser" do
                "#{WatirSpec.host}/forms_with_input_elements.html",
                "#{WatirSpec.host}/definition_lists.html"
       ].map do |page|
-          browser.goto page
-          browser.url
-        end
+        browser.goto page
+        browser.url
+      end
       3.times { browser.back }
       browser.url.should == urls.first
@@ -170,33 +172,33 @@ describe "Browser" do
   end
   describe "#element_by_xpath" do
-     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
+    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")

data/spec/watirspec/button_spec.rb CHANGED Viewed

@@ -33,6 +33,11 @@ describe "Button" do
       browser.button(:caption, /Button 2/).should exist
     end
+    it "returns the first button if given no args" do
+      browser.button.should exist
+    end
     it "returns false if the button doesn't exist" do
       browser.button(:id, "no_such_id").should_not exist
       browser.button(:id, /no_such_id/).should_not exist
@@ -50,11 +55,9 @@ 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
+    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
     it "raises TypeError when 'what' argument is invalid" do
@@ -64,11 +67,6 @@ describe "Button" do
     it "raises MissingWayOfFindingObjectException when 'how' argument is invalid" do
       lambda { browser.button(:no_such_how, 'some_value').exists? }.should raise_error(MissingWayOfFindingObjectException)
     end
-    # it "locates the correct button when there are duplicate ids and user disambiguates by parent" do
-    #   browser.goto(WatirSpec.files + "/buttons_with_duplicate_ids.html")
-    #   browser.form(:name, "bar-form").button(:id, 'next').parent.name.should == "bar-form"
-    # end
   end
   # Attribute methods
@@ -107,18 +105,12 @@ describe "Button" do
   end
   describe "#src" do
-    not_compliant_on [:webdriver, :ie], [:webdriver, :firefox] 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
     end
-    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
     it "raises UnknownObjectException if the button does not exist" do
       lambda { browser.button(:name, "no_such_name").src }.should raise_error(UnknownObjectException)
     end
@@ -180,6 +172,19 @@ describe "Button" do
     end
   end
+  describe "#text" do
+    it "returns the text of the button" do
+      browser.button(:index, 0).text.should == 'Submit'
+      browser.button(:index, 1).text.should == 'Reset'
+      browser.button(:index, 2).text.should == 'Button'
+      browser.button(:index, 3).text.should == "Button 2"
+    end
+    it "raises UnknownObjectException if the element does not exist" do
+      lambda { browser.button(:id, "no_such_id").text }.should raise_error(UnknownObjectException)
+    end
+  end
   describe "#respond_to?" do
     it "returns true for all attribute methods" do
       browser.button(:index, 0).should respond_to(:class_name)