watir-webdriver 0.3.1 → 0.3.2

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

@@ -18,7 +18,14 @@ module Watir
         raise UnknownFrameException, "wrapping a WebDriver element as a Frame is not currently supported"
       end
 
-      @element = nil # we need to re-locate every time
+      if @element && !Watir.always_locate?
+        begin
+          @element.tag_name # rpc
+          return @element
+        rescue Selenium::WebDriver::Error::ObsoleteElementError
+          @element = nil # re-locate
+        end
+      end
 
       super
     end
@@ -48,14 +55,18 @@ module Watir
     private
 
     def locate_iframe
-      # hack - Frame doesn't have IFrame's attributes either
-      IFrame.new(@parent, @selector.merge(:tag_name => "iframe")).locate
+      locator = locator_class.new(@parent.wd, @selector.merge(:tag_name => "iframe"), attribute_list)
+      locator.locate
     end
 
     def locate_frame
-      locator = locator_class.new(@parent.wd, @selector.merge(:tag_name => "frame"), self.class.attribute_list)
+      locator = locator_class.new(@parent.wd, @selector.merge(:tag_name => "frame"), attribute_list)
       locator.locate
     end
+
+    def attribute_list
+      self.class.attribute_list | IFrame.attribute_list
+    end
   end # Frame
 
   module Container

data/lib/watir-webdriver/version.rb

@@ -1,3 +1,3 @@
 module Watir
-  VERSION = "0.3.1"
+  VERSION = "0.3.2"
 end

metadata

@@ -1,105 +1,100 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: watir-webdriver
-version: !ruby/object:Gem::Version 
+version: !ruby/object:Gem::Version
+  version: 0.3.2
   prerelease: 
-  version: 0.3.1
 platform: ruby
-authors: 
+authors:
 - Jari Bakken
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-08-13 00:00:00 +02:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2011-08-18 00:00:00.000000000Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: selenium-webdriver
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &2156945600 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 0.2.2
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: rspec
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: *2156945600
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: &2156944980 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
+      - !ruby/object:Gem::Version
         version: 2.3.0
   type: :development
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: yard
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: *2156944980
+- !ruby/object:Gem::Dependency
+  name: yard
+  requirement: &2156944340 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        version: "0.6"
+      - !ruby/object:Gem::Version
+        version: '0.6'
   type: :development
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: webidl
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: *2156944340
+- !ruby/object:Gem::Dependency
+  name: webidl
+  requirement: &2156943720 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 0.1.1
   type: :development
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  name: sinatra
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  version_requirements: *2156943720
+- !ruby/object:Gem::Dependency
+  name: sinatra
+  requirement: &2156943120 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        version: "1.0"
+      - !ruby/object:Gem::Version
+        version: '1.0'
   type: :development
-  version_requirements: *id005
-- !ruby/object:Gem::Dependency 
-  name: nokogiri
   prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  version_requirements: *2156943120
+- !ruby/object:Gem::Dependency
+  name: nokogiri
+  requirement: &2156942580 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id006
-- !ruby/object:Gem::Dependency 
-  name: activesupport
   prerelease: false
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  version_requirements: *2156942580
+- !ruby/object:Gem::Dependency
+  name: activesupport
+  requirement: &2156941880 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
+      - !ruby/object:Gem::Version
         version: 2.3.5
   type: :development
-  version_requirements: *id007
+  prerelease: false
+  version_requirements: *2156941880
 description: WebDriver-backed Watir
-email: 
+email:
 - jari.bakken@gmail.com
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - .document
 - .gitignore
 - .gitmodules
@@ -177,35 +172,31 @@ files:
 - spec/wait_spec.rb
 - support/html5.html
 - watir-webdriver.gemspec
-has_rdoc: true
 homepage: http://github.com/jarib/watir-webdriver
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: watir-webdriver
-rubygems_version: 1.5.3
+rubygems_version: 1.8.8
 signing_key: 
 specification_version: 3
 summary: Watir on WebDriver
-test_files: 
+test_files:
 - spec/alert_spec.rb
 - spec/browser_spec.rb
 - spec/container_spec.rb