watir-webdriver 0.2.9 → 0.3.0

data/lib/watir-webdriver/atoms.rb

@@ -9,6 +9,7 @@ module Watir
 
     load :fireEvent
     load :getOuterHtml
+    load :getParentElement
 
     private
 

data/lib/watir-webdriver/atoms/getParentElement.js

@@ -0,0 +1,17 @@
+// Copyright 2011 Software Freedom Conservatory
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+function(){return function(){var d=this;function e(a,b){function c(){}c.prototype=b.prototype;a.g=b.prototype;a.prototype=new c};function g(a){for(var b=1;b<arguments.length;b++)var c=String(arguments[b]).replace(/\$/g,"$$$$"),a=a.replace(/\%s/,c);return a}function h(a,b){if(a<b)return-1;else if(a>b)return 1;return 0};var i,l,m,n;function o(){return d.navigator?d.navigator.userAgent:null}n=m=l=i=!1;var p;if(p=o()){var q=d.navigator;i=p.indexOf("Opera")==0;l=!i&&p.indexOf("MSIE")!=-1;m=!i&&p.indexOf("WebKit")!=-1;n=!i&&!m&&q.product=="Gecko"}var r=l,s=n,v=m,w;
+a:{var x="",y;if(i&&d.opera)var z=d.opera.version,x=typeof z=="function"?z():z;else if(s?y=/rv\:([^\);]+)(\)|;)/:r?y=/MSIE\s+([^\);]+)(\)|;)/:v&&(y=/WebKit\/(\S+)/),y)var A=y.exec(o()),x=A?A[1]:"";if(r){var B,C=d.document;B=C?C.documentMode:void 0;if(B>parseFloat(x)){w=String(B);break a}}w=x}var D={};
+function E(a){var b;if(!(b=D[a])){b=0;for(var c=String(w).replace(/^[\s\xa0]+|[\s\xa0]+$/g,"").split("."),f=String(a).replace(/^[\s\xa0]+|[\s\xa0]+$/g,"").split("."),t=Math.max(c.length,f.length),u=0;b==0&&u<t;u++){var L=c[u]||"",M=f[u]||"",N=RegExp("(\\d*)(\\D*)","g"),O=RegExp("(\\d*)(\\D*)","g");do{var j=N.exec(L)||["","",""],k=O.exec(M)||["","",""];if(j[0].length==0&&k[0].length==0)break;b=h(j[1].length==0?0:parseInt(j[1],10),k[1].length==0?0:parseInt(k[1],10))||h(j[2].length==0,k[2].length==0)||
+h(j[2],k[2])}while(b==0)}b=D[a]=b>=0}return b};function F(a){this.stack=Error().stack||"";if(a)this.message=String(a)}e(F,Error);e(function(a,b){b.unshift(a);F.call(this,g.apply(null,b));b.shift();this.f=a},F);!r||E("9");!s&&!r||r&&E("9")||s&&E("1.9.1");r&&E("9");function G(a,b,c,f,t){this.b=!!b;if(a&&(this.a=a))this.c=typeof f=="number"?f:this.a.nodeType!=1?0:this.b?-1:1;this.d=t!=void 0?t:this.c||0;this.b&&(this.d*=-1);this.e=!c}e(G,function(){});G.prototype.a=null;G.prototype.c=0;e(function(a,b,c,f){G.call(this,a,b,c,null,f)},G);function H(a){for(a=a.parentNode;a&&a.nodeType!=1&&a.nodeType!=9&&a.nodeType!=11;)a=a.parentNode;return a&&a.nodeType==1?a:null}var I="_".split("."),J=d;!(I[0]in J)&&J.execScript&&J.execScript("var "+I[0]);for(var K;I.length&&(K=I.shift());)!I.length&&H!==void 0?J[K]=H:J=J[K]?J[K]:J[K]={};; return this._.apply(null,arguments);}.apply({navigator:typeof window!='undefined'?window.navigator:null}, arguments);}

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

@@ -138,22 +138,14 @@ module Watir
     def fire_event(event_name)
       assert_exists
       event_name = event_name.to_s.sub(/^on/, '').downcase
-      execute_atom(:fireEvent, @element, event_name)
+
+      execute_atom :fireEvent, @element, event_name
     end
 
     def parent
       assert_exists
 
-      # TODO: atom?
-      script = <<-JS
-        var element = arguments[0].parentNode;
-        if(element.nodeType != Node.ELEMENT_NODE)
-          return null;
-
-        return element;
-      JS
-
-      e = driver.execute_script(script, @element)
+      e = execute_atom :getParentElement, @element
 
       if e.kind_of?(WebDriver::Element)
         Watir.element_class_for(e.tag_name.downcase).new(@parent, :element => e)

data/lib/watir-webdriver/version.rb

@@ -1,3 +1,3 @@
 module Watir
-  VERSION = "0.2.9"
+  VERSION = "0.3.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: watir-webdriver
 version: !ruby/object:Gem::Version
-  version: 0.2.9
+  version: 0.3.0
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2011-08-02 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: selenium-webdriver
-  requirement: &2168792380 !ruby/object:Gem::Requirement
+  requirement: &2164747440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: 0.2.2
   type: :runtime
   prerelease: false
-  version_requirements: *2168792380
+  version_requirements: *2164747440
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &2168791720 !ruby/object:Gem::Requirement
+  requirement: &2164746940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: 2.3.0
   type: :development
   prerelease: false
-  version_requirements: *2168791720
+  version_requirements: *2164746940
 - !ruby/object:Gem::Dependency
   name: yard
-  requirement: &2168791140 !ruby/object:Gem::Requirement
+  requirement: &2164746460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: '0.6'
   type: :development
   prerelease: false
-  version_requirements: *2168791140
+  version_requirements: *2164746460
 - !ruby/object:Gem::Dependency
   name: webidl
-  requirement: &2168790620 !ruby/object:Gem::Requirement
+  requirement: &2164746000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: 0.1.1
   type: :development
   prerelease: false
-  version_requirements: *2168790620
+  version_requirements: *2164746000
 - !ruby/object:Gem::Dependency
   name: sinatra
-  requirement: &2168790060 !ruby/object:Gem::Requirement
+  requirement: &2164745540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,10 +65,10 @@ dependencies:
         version: '1.0'
   type: :development
   prerelease: false
-  version_requirements: *2168790060
+  version_requirements: *2164745540
 - !ruby/object:Gem::Dependency
   name: nokogiri
-  requirement: &2168789560 !ruby/object:Gem::Requirement
+  requirement: &2164745160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2168789560
+  version_requirements: *2164745160
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &2168788900 !ruby/object:Gem::Requirement
+  requirement: &2164744620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -87,7 +87,7 @@ dependencies:
         version: 2.3.5
   type: :development
   prerelease: false
-  version_requirements: *2168788900
+  version_requirements: *2164744620
 description: WebDriver-backed Watir
 email:
 - jari.bakken@gmail.com
@@ -107,6 +107,7 @@ files:
 - lib/watir-webdriver/atoms/README
 - lib/watir-webdriver/atoms/fireEvent.js
 - lib/watir-webdriver/atoms/getOuterHtml.js
+- lib/watir-webdriver/atoms/getParentElement.js
 - lib/watir-webdriver/atoms/selectText.js
 - lib/watir-webdriver/attribute_helper.rb
 - lib/watir-webdriver/browser.rb