watir-webdriver 0.0.4 → 0.0.5

data/README.rdoc

@@ -7,6 +7,17 @@ See http://rubyforge.org/pipermail/wtr-development/2009-October/001313.html.
 
 http://jarib.github.com/watir-webdriver/doc/
 
+= Example
+
+  require 'watir-webdriver'
+
+  browser = Watir::Browser.new :firefox
+  browser.goto "http://google.com"
+  browser.text_field(:name => 'q').set("WebDriver rocks!")
+  browser.button(:name => 'btnG').click
+  puts browser.url
+  browser.close
+
 = Description
 
 The file in lib/watir/elements/generated.rb is autogenerated from the HTML5 spec. This is done by extracting the IDL parts from the spec and processing them with the WebIDL gem (link below).

data/VERSION

@@ -1 +1 @@
-0.0.4
+0.0.5

data/lib/watir-webdriver/elements/frame.rb

@@ -13,7 +13,8 @@ module Watir
       @parent.assert_exists
 
       if @iframe
-        return @iframe
+        switch_to_iframe(@iframe)
+        driver
       elsif @frame_id.nil?
         locate_iframe || locate_frame
       else
@@ -46,14 +47,19 @@ module Watir
 
     def locate_iframe
       # hack - frame doesn't have IFrame's attributes either
-      @iframe = @element = IFrame.new(@parent, @selector).locate
+      @iframe = IFrame.new(@parent, @selector).locate
+
+      if @iframe
+        switch_to_iframe @iframe
+        driver
+      end
     end
 
     def locate_frame
       loc = VALID_LOCATORS.find { |loc| @selector[loc] }
 
       unless loc
-        raise MissingWayOfFindingObjectException, "can only switch frames by #{VALID_LOCATORS.inspect}"
+        raise MissingWayOfFindingObjectException, "can only locate frames by #{VALID_LOCATORS.inspect}"
       end
 
       @frame_id = @selector[loc]
@@ -70,7 +76,26 @@ module Watir
     def switch!
       driver.switch_to.frame @frame_id
     rescue Selenium::WebDriver::Error::NoSuchFrameError => e
-      raise Exception::UnknownFrameException, e.message
+      raise UnknownFrameException, e.message
+    end
+
+    def switch_to_iframe(element)
+      loc = [:id, :name].find { |e| not [nil, ""].include?(element.attribute(e)) }
+      if loc.nil?
+        raise MissingWayOfFindingObjectException, "can't switch to frame without :id or :name"
+      end
+
+      # TODO: get rid of this when we can switch to elements
+      # http://groups.google.com/group/selenium-developers/browse_thread/thread/428bd68e9e8bfecd/19a02ecd20835249
+
+      if @parent.kind_of? Frame
+        parent_id = @parent.instance_variable_get("@frame_id")
+        loc = [parent_id, element.attribute(loc)].join(".")
+      else
+        loc = element.attribute(loc)
+      end
+
+      driver.switch_to.frame loc
     end
 
   end # Frame

data/spec/watirspec/frame_spec.rb

@@ -62,6 +62,13 @@ describe "Frame" do
         end
       end
 
+      it "handles nested frames" do
+        browser.goto(WatirSpec.host + "/nested_frames.html")
+
+        browser.frame(:id, "two").frame(:id, "three").link(:id => "four").click
+        browser.title.should == "definition_lists"
+      end
+
       it "raises TypeError when 'what' argument is invalid" do
         lambda { browser.frame(:id, 3.14).exists? }.should raise_error(TypeError)
       end

data/watir-webdriver.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{watir-webdriver}
-  s.version = "0.0.4"
+  s.version = "0.0.5"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Jari Bakken"]
-  s.date = %q{2010-07-22}
+  s.date = %q{2010-07-26}
   s.description = %q{WebDriver-backed Watir}
   s.email = %q{jari.bakken@gmail.com}
   s.extra_rdoc_files = [

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: watir-webdriver
 version: !ruby/object:Gem::Version 
-  hash: 23
+  hash: 21
   prerelease: false
   segments: 
   - 0
   - 0
-  - 4
-  version: 0.0.4
+  - 5
+  version: 0.0.5
 platform: ruby
 authors: 
 - Jari Bakken
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-07-22 00:00:00 +02:00
+date: 2010-07-26 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency