watir 6.7.3 → 6.8.0

data/lib/watir/js_execution.rb

@@ -0,0 +1,141 @@
+module Watir
+  module JSExecution
+
+    #
+    # Delegates script execution to Browser or IFrame.
+    #
+    def execute_script(script, *args)
+      @query_scope.execute_script(script, *args)
+    end
+
+    #
+    # Simulates JavaScript events on element.
+    # Note that you may omit "on" from event name.
+    #
+    # @example
+    #   browser.button(name: "new_user_button").fire_event :click
+    #   browser.button(name: "new_user_button").fire_event "mousemove"
+    #   browser.button(name: "new_user_button").fire_event "onmouseover"
+    #
+    # @param [String, Symbol] event_name
+    #
+
+    def fire_event(event_name)
+      event_name = event_name.to_s.sub(/^on/, '').downcase
+
+      element_call { execute_js :fireEvent, @element, event_name }
+    end
+
+    #
+    # Flashes (change background color to a new color and back a few times) element.
+    #
+    # @example
+    #   browser.li(id: 'non_link_1').flash
+    #   browser.li(id: 'non_link_1').flash(color: "green", flashes: 3, delay: 0.05)
+    #   browser.li(id: 'non_link_1').flash(color: "yellow")
+    #   browser.li(id: 'non_link_1').flash(flashes: 4)
+    #   browser.li(id: 'non_link_1').flash(delay: 0.1)
+    #
+    # @param [String] color what color to flash with
+    # @param [Integer] flashes number of times element should be flashed
+    # @param [Integer, Float] delay how long to wait between flashes
+    #
+    # @return [Watir::Element]
+    #
+
+    def flash(color: 'red', flashes: 10, delay: 0)
+      background_color = style("backgroundColor")
+      element_color = element_call { execute_js(:backgroundColor, @element) }.strip
+
+      flashes.times do |n|
+        nextcolor = n.even? ? color : background_color
+        element_call { execute_js(:backgroundColor, @element, nextcolor) }
+        sleep(delay)
+      end
+
+      element_call { execute_js(:backgroundColor, @element, element_color) }
+
+      self
+    end
+
+    #
+    # Focuses element.
+    # Note that Firefox queues focus events until the window actually has focus.
+    #
+    # @see http://code.google.com/p/selenium/issues/detail?id=157
+    #
+
+    def focus
+      element_call { execute_js(:focus, @element) }
+    end
+
+    #
+    # Returns inner HTML code of element.
+    #
+    # @example
+    #   browser.div(id: 'shown').inner_html
+    #   #=> "<div id=\"hidden\" style=\"display: none;\">Not shown</div><div>Not hidden</div>"
+    #
+    # @return [String]
+    #
+
+    def inner_html
+      element_call { execute_js(:getInnerHtml, @element) }.strip
+    end
+
+    #
+    # Returns inner Text code of element.
+    #
+    # @example
+    #   browser.div(id: 'shown').inner_text
+    #   #=> "Not hidden"
+    #
+    # @return [String]
+    #
+
+    def inner_text
+      element_call { execute_js(:getInnerText, @element) }.strip
+    end
+
+    #
+    # Returns outer (inner + element itself) HTML code of element.
+    #
+    # @example
+    #   browser.div(id: 'shown').outer_html
+    #   #=> "<div id=\"shown\"><div id=\"hidden\" style=\"display: none;\">Not shown</div><div>Not hidden</div></div>"
+    #
+    # @return [String]
+    #
+
+    def outer_html
+      element_call { execute_js(:getOuterHtml, @element) }.strip
+    end
+    alias_method :html, :outer_html
+
+    #
+    # Returns text content of element.
+    #
+    # @example
+    #   browser.div(id: 'shown').text_content
+    #   #=> "Not shownNot hidden"
+    #
+    # @return [String]
+    #
+
+    def text_content
+      element_call { execute_js(:getTextContent, @element) }.strip
+    end
+
+    #
+    # Selects text on page (as if dragging clicked mouse across provided text).
+    #
+    # @example
+    #   browser.li(id: 'non_link_1').select_text('Non-link')
+    #
+
+    def select_text(str)
+      element_call { execute_js :selectText, @element, str }
+    end
+
+  end # JSExecution
+end # Watir

data/lib/watir/js_snippets.rb

@@ -0,0 +1,16 @@
+module Watir
+  module JSSnippets
+
+    private
+
+    def execute_js(function_name, *arguments)
+      file = File.expand_path("../js_snippets/#{function_name}.js", __FILE__)
+      raise Watir::Error, "Can not excute script as #{function_name}.js does not exist" unless File.exist?(file)
+
+      js = File.read(file)
+      script = "return (#{js}).apply(null, arguments)"
+      @query_scope.execute_script(script, *arguments)
+    end
+
+  end # JSSnippets
+end # Watir

data/lib/watir/js_snippets/backgroundColor.js

@@ -0,0 +1,7 @@
+function(){
+    if(arguments[1]) {
+        arguments[0].style.backgroundColor = arguments[1];
+    } else {
+        return arguments[0].style.backgroundColor;
+    }
+}

data/lib/watir/{atoms → js_snippets}/fireEvent.js

@@ -11,6 +11,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+// This code was built by the Selenium code base
+// See https://github.com/SeleniumHQ/selenium/tree/master/javascript/watir-atoms
 
 function(){return function(){var l=this;
 function m(a){var c=typeof a;if(c=="object")if(a){if(a instanceof Array)return"array";else if(a instanceof Object)return c;var b=Object.prototype.toString.call(a);if(b=="[object Window]")return"object";if(b=="[object Array]"||typeof a.length=="number"&&typeof a.splice!="undefined"&&typeof a.propertyIsEnumerable!="undefined"&&!a.propertyIsEnumerable("splice"))return"array";if(b=="[object Function]"||typeof a.call!="undefined"&&typeof a.propertyIsEnumerable!="undefined"&&!a.propertyIsEnumerable("call"))return"function"}else return"null";else if(c==

data/lib/watir/js_snippets/focus.js

@@ -0,0 +1,3 @@
+function(){
+    return arguments[0].focus();
+}

data/lib/watir/{atoms → js_snippets}/getInnerHtml.js

@@ -11,6 +11,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+// This code is a modification getOuterHtml.js which was built by the Selenium code base
 
 function(){return function(){var d=this;function e(a,b){function c(){}c.prototype=b.prototype;a.b=b.prototype;a.prototype=new c};function f(a){this.stack=Error().stack||"";if(a)this.message=String(a)}e(f,Error);function i(a){for(var b=1;b<arguments.length;b++){var c=String(arguments[b]).replace(/\$/g,"$$$$");a=a.replace(/\%s/,c)}return a}
 function j(a,b){var c=0,A=String(a).replace(/^[\s\xa0]+|[\s\xa0]+$/g,"").split("."),B=String(b).replace(/^[\s\xa0]+|[\s\xa0]+$/g,"").split("."),H=Math.max(A.length,B.length);for(var l=0;c==0&&l<H;l++){var I=A[l]||"",J=B[l]||"",K=RegExp("(\\d*)(\\D*)","g"),L=RegExp("(\\d*)(\\D*)","g");do{var g=K.exec(I)||["","",""],h=L.exec(J)||["","",""];if(g[0].length==0&&h[0].length==0)break;c=k(g[1].length==0?0:parseInt(g[1],10),h[1].length==0?0:parseInt(h[1],10))||k(g[2].length==0,h[2].length==0)||k(g[2],h[2])}while(c==

data/lib/watir/js_snippets/getInnerText.js

@@ -0,0 +1,19 @@
+// 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.
+
+// This code is a modification getOuterHtml.js which was built by the Selenium code base
+
+function(){return function(){var d=this;function e(a,b){function c(){}c.prototype=b.prototype;a.b=b.prototype;a.prototype=new c};function f(a){this.stack=Error().stack||"";if(a)this.message=String(a)}e(f,Error);function i(a){for(var b=1;b<arguments.length;b++){var c=String(arguments[b]).replace(/\$/g,"$$$$");a=a.replace(/\%s/,c)}return a}
+function j(a,b){var c=0,A=String(a).replace(/^[\s\xa0]+|[\s\xa0]+$/g,"").split("."),B=String(b).replace(/^[\s\xa0]+|[\s\xa0]+$/g,"").split("."),H=Math.max(A.length,B.length);for(var l=0;c==0&&l<H;l++){var I=A[l]||"",J=B[l]||"",K=RegExp("(\\d*)(\\D*)","g"),L=RegExp("(\\d*)(\\D*)","g");do{var g=K.exec(I)||["","",""],h=L.exec(J)||["","",""];if(g[0].length==0&&h[0].length==0)break;c=k(g[1].length==0?0:parseInt(g[1],10),h[1].length==0?0:parseInt(h[1],10))||k(g[2].length==0,h[2].length==0)||k(g[2],h[2])}while(c==
+0)}return c}function k(a,b){if(a<b)return-1;else if(a>b)return 1;return 0};e(function(a,b){b.unshift(a);f.call(this,i.apply(null,b));b.shift();this.a=a},f);var m,n,o,p;function q(){return d.navigator?d.navigator.userAgent:null}p=o=n=m=false;var r;if(r=q()){var s=d.navigator;m=r.indexOf("Opera")==0;n=!m&&r.indexOf("MSIE")!=-1;o=!m&&r.indexOf("WebKit")!=-1;p=!m&&!o&&s.product=="Gecko"}var t=n,u=p,v=o,w;
+a:{var x="",y;if(m&&d.opera){var z=d.opera.version;x=typeof z=="function"?z():z}else{if(u)y=/rv\:([^\);]+)(\)|;)/;else if(t)y=/MSIE\s+([^\);]+)(\)|;)/;else if(v)y=/WebKit\/(\S+)/;if(y){var C=y.exec(q());x=C?C[1]:""}}if(t){var D,E=d.document;D=E?E.documentMode:undefined;if(D>parseFloat(x)){w=String(D);break a}}w=x}var F={};!t||F["9"]||(F["9"]=j(w,"9")>=0);t&&(F["9"]||(F["9"]=j(w,"9")>=0));function G(a){if("innerText"in a)return a.innerText;else{var b=(a.nodeType==9?a:a.ownerDocument||a.document).createElement("div");b.appendChild(a.cloneNode(true));return b.innerText}}var M="_".split("."),N=d;!(M[0]in N)&&N.execScript&&N.execScript("var "+M[0]);for(var O;M.length&&(O=M.shift());)if(!M.length&&G!==undefined)N[O]=G;else N=N[O]?N[O]:N[O]={};; return this._.apply(null,arguments);}.apply({navigator:typeof window!='undefined'?window.navigator:null}, arguments);}

data/lib/watir/{atoms → js_snippets}/getOuterHtml.js

@@ -11,6 +11,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+// This code was built by the Selenium code base
+// See https://github.com/SeleniumHQ/selenium/tree/master/javascript/watir-atoms
 
 function(){return function(){var d=this;function e(a,b){function c(){}c.prototype=b.prototype;a.b=b.prototype;a.prototype=new c};function f(a){this.stack=Error().stack||"";if(a)this.message=String(a)}e(f,Error);function i(a){for(var b=1;b<arguments.length;b++){var c=String(arguments[b]).replace(/\$/g,"$$$$");a=a.replace(/\%s/,c)}return a}
 function j(a,b){var c=0,A=String(a).replace(/^[\s\xa0]+|[\s\xa0]+$/g,"").split("."),B=String(b).replace(/^[\s\xa0]+|[\s\xa0]+$/g,"").split("."),H=Math.max(A.length,B.length);for(var l=0;c==0&&l<H;l++){var I=A[l]||"",J=B[l]||"",K=RegExp("(\\d*)(\\D*)","g"),L=RegExp("(\\d*)(\\D*)","g");do{var g=K.exec(I)||["","",""],h=L.exec(J)||["","",""];if(g[0].length==0&&h[0].length==0)break;c=k(g[1].length==0?0:parseInt(g[1],10),h[1].length==0?0:parseInt(h[1],10))||k(g[2].length==0,h[2].length==0)||k(g[2],h[2])}while(c==

data/lib/watir/js_snippets/getTextContent.js

@@ -0,0 +1,19 @@
+// 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.
+
+// This code is a modification getOuterHtml.js which was built by the Selenium code base
+
+function(){return function(){var d=this;function e(a,b){function c(){}c.prototype=b.prototype;a.b=b.prototype;a.prototype=new c};function f(a){this.stack=Error().stack||"";if(a)this.message=String(a)}e(f,Error);function i(a){for(var b=1;b<arguments.length;b++){var c=String(arguments[b]).replace(/\$/g,"$$$$");a=a.replace(/\%s/,c)}return a}
+function j(a,b){var c=0,A=String(a).replace(/^[\s\xa0]+|[\s\xa0]+$/g,"").split("."),B=String(b).replace(/^[\s\xa0]+|[\s\xa0]+$/g,"").split("."),H=Math.max(A.length,B.length);for(var l=0;c==0&&l<H;l++){var I=A[l]||"",J=B[l]||"",K=RegExp("(\\d*)(\\D*)","g"),L=RegExp("(\\d*)(\\D*)","g");do{var g=K.exec(I)||["","",""],h=L.exec(J)||["","",""];if(g[0].length==0&&h[0].length==0)break;c=k(g[1].length==0?0:parseInt(g[1],10),h[1].length==0?0:parseInt(h[1],10))||k(g[2].length==0,h[2].length==0)||k(g[2],h[2])}while(c==
+0)}return c}function k(a,b){if(a<b)return-1;else if(a>b)return 1;return 0};e(function(a,b){b.unshift(a);f.call(this,i.apply(null,b));b.shift();this.a=a},f);var m,n,o,p;function q(){return d.navigator?d.navigator.userAgent:null}p=o=n=m=false;var r;if(r=q()){var s=d.navigator;m=r.indexOf("Opera")==0;n=!m&&r.indexOf("MSIE")!=-1;o=!m&&r.indexOf("WebKit")!=-1;p=!m&&!o&&s.product=="Gecko"}var t=n,u=p,v=o,w;
+a:{var x="",y;if(m&&d.opera){var z=d.opera.version;x=typeof z=="function"?z():z}else{if(u)y=/rv\:([^\);]+)(\)|;)/;else if(t)y=/MSIE\s+([^\);]+)(\)|;)/;else if(v)y=/WebKit\/(\S+)/;if(y){var C=y.exec(q());x=C?C[1]:""}}if(t){var D,E=d.document;D=E?E.documentMode:undefined;if(D>parseFloat(x)){w=String(D);break a}}w=x}var F={};!t||F["9"]||(F["9"]=j(w,"9")>=0);t&&(F["9"]||(F["9"]=j(w,"9")>=0));function G(a){if("textcontent"in a)return a.textContent;else{var b=(a.nodeType==9?a:a.ownerDocument||a.document).createElement("div");b.appendChild(a.cloneNode(true));return b.textContent}}var M="_".split("."),N=d;!(M[0]in N)&&N.execScript&&N.execScript("var "+M[0]);for(var O;M.length&&(O=M.shift());)if(!M.length&&G!==undefined)N[O]=G;else N=N[O]?N[O]:N[O]={};; return this._.apply(null,arguments);}.apply({navigator:typeof window!='undefined'?window.navigator:null}, arguments);}

data/lib/watir/js_snippets/isImageLoaded.js

@@ -0,0 +1,3 @@
+function(){
+    return typeof arguments[0].naturalWidth != "undefined" && arguments[0].naturalWidth > 0
+}

data/lib/watir/js_snippets/selectOptionsLabel.js

@@ -0,0 +1,10 @@
+function(){
+    for(var i=0; i<arguments[0].options.length; i++) {
+        if ( arguments[0].options[i].label.match(arguments[1]) ) {
+            arguments[0].options[i].selected = true;
+            if ( arguments[2] == 'single' ) {
+                break;
+            }
+        }
+    }
+}

data/lib/watir/js_snippets/selectOptionsText.js

@@ -0,0 +1,10 @@
+function(){
+    for(var i=0; i<arguments[0].options.length; i++) {
+        if ( arguments[0].options[i].text.match(arguments[1]) ) {
+            arguments[0].options[i].selected = true;
+            if ( arguments[2] == 'single' ) {
+                break;
+            }
+        }
+    }
+}

data/lib/watir/js_snippets/selectOptionsValue.js

@@ -0,0 +1,10 @@
+function(){
+    for(var i=0; i<arguments[0].options.length; i++) {
+        if ( arguments[0].options[i].value.match(arguments[1]) ) {
+            arguments[0].options[i].selected = true;
+            if ( arguments[2] == 'single' ) {
+                break;
+            }
+        }
+    }
+}

data/lib/watir/{atoms → js_snippets}/selectText.js

@@ -11,6 +11,9 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+// This code was built by the Selenium code base
+// See https://github.com/SeleniumHQ/selenium/tree/master/javascript/watir-atoms
+
 function(){return function(){function f(a){throw a;}var h=void 0,l=null;function m(a){return function(){return this[a]}}function o(a){return function(){return a}}var p,r=this;
 function s(a){var b=typeof a;if(b=="object")if(a){if(a instanceof Array)return"array";else if(a instanceof Object)return b;var c=Object.prototype.toString.call(a);if(c=="[object Window]")return"object";if(c=="[object Array]"||typeof a.length=="number"&&typeof a.splice!="undefined"&&typeof a.propertyIsEnumerable!="undefined"&&!a.propertyIsEnumerable("splice"))return"array";if(c=="[object Function]"||typeof a.call!="undefined"&&typeof a.propertyIsEnumerable!="undefined"&&!a.propertyIsEnumerable("call"))return"function"}else return"null";
 else if(b=="function"&&typeof a.call=="undefined")return"object";return b}function t(a){var b=s(a);return b=="array"||b=="object"&&typeof a.length=="number"}function u(a){return typeof a=="string"}function aa(a){a=s(a);return a=="object"||a=="array"||a=="function"}var ba="closure_uid_"+Math.floor(Math.random()*2147483648).toString(36),ca=0,da=Date.now||function(){return+new Date};function v(a,b){function c(){}c.prototype=b.prototype;a.Q=b.prototype;a.prototype=new c};function ea(a){this.stack=Error().stack||"";if(a)this.message=String(a)}v(ea,Error);ea.prototype.name="CustomError";function fa(a){for(var b=1;b<arguments.length;b++)var c=String(arguments[b]).replace(/\$/g,"$$$$"),a=a.replace(/\%s/,c);return a}function w(a){if(!ga.test(a))return a;a.indexOf("&")!=-1&&(a=a.replace(ha,"&amp;"));a.indexOf("<")!=-1&&(a=a.replace(ia,"&lt;"));a.indexOf(">")!=-1&&(a=a.replace(ja,"&gt;"));a.indexOf('"')!=-1&&(a=a.replace(ka,"&quot;"));return a}var ha=/&/g,ia=/</g,ja=/>/g,ka=/\"/g,ga=/[&<>\"]/;function la(a,b){if(a<b)return-1;else if(a>b)return 1;return 0}

data/lib/watir/js_snippets/selectedOptions.js

@@ -0,0 +1,11 @@
+function(){
+    var result = [];
+    var options = arguments[0].options;
+    for (var i = 0; i < options.length; i++) {
+        var option = options[i];
+        if (option.selected) {
+            result.push(option)
+        }
+    }
+    return result;
+}

data/lib/watir/js_snippets/setValue.js

@@ -0,0 +1,3 @@
+function(){
+    arguments[0].value=arguments[1]
+}

data/lib/watir/locators/element/locator.rb

@@ -69,7 +69,7 @@ module Watir
           tag_name = selector.delete(:tag_name)
           return unless selector.empty? # multiple attributes
 
-          element = @query_scope.wd.find_element(:id, id)
+          element = locate_element(:id, id)
           return if tag_name && !element_validator.validate(element, {tag_name: tag_name})
 
           element
@@ -98,11 +98,11 @@ module Watir
             # could build xpath/css for selector
             if idx || !visible.nil?
               idx ||= 0
-              elements = @query_scope.wd.find_elements(how, what)
+              elements = locate_elements(how, what)
               elements = elements.select { |el| visible == el.displayed? } unless visible.nil?
               elements[idx] unless elements.nil?
             else
-              @query_scope.wd.find_element(how, what)
+              locate_element(how, what)
             end
           else
             # can't use xpath, probably a regexp in there
@@ -119,6 +119,7 @@ module Watir
 
         def find_all_by_one
           how, what = @selector.to_a.first
+          return [what] if how == :element
           selector_builder.check_type how, what
 
           if WD_FINDERS.include?(how)
@@ -138,7 +139,7 @@ module Watir
 
           how, what = selector_builder.build(selector)
           found = if how
-                    @query_scope.wd.find_elements(how, what)
+                    locate_elements(how, what)
                   else
                     wd_find_by_regexp_selector(selector, :select)
                   end
@@ -148,7 +149,7 @@ module Watir
 
         def wd_find_all_by(how, what)
           if what.is_a? String
-            @query_scope.wd.find_elements(how, what)
+            locate_elements(how, what)
           else
             all_elements.select { |element| fetch_value(element, how) =~ what }
           end
@@ -168,19 +169,19 @@ module Watir
         end
 
         def all_elements
-          @query_scope.wd.find_elements(xpath: ".//*")
+          locate_elements(:xpath, ".//*")
         end
 
         def wd_find_first_by(how, what)
           if what.is_a? String
-            @query_scope.wd.find_element(how, what)
+            locate_element(how, what)
           else
             all_elements.find { |element| fetch_value(element, how) =~ what }
           end
         end
 
         def wd_find_by_regexp_selector(selector, method = :find)
-          query_scope = @query_scope.wd
+          query_scope = ensure_scope_context
           rx_selector = delete_regexps_from(selector)
 
           if rx_selector.key?(:label) && selector_builder.should_use_label_element?
@@ -207,7 +208,7 @@ module Watir
             end
           end
 
-          elements = query_scope.find_elements(how, what)
+          elements = locate_elements(how, what, query_scope)
           elements.__send__(method) { |el| matches_selector?(el, rx_selector) }
         end
 
@@ -225,7 +226,7 @@ module Watir
 
         def label_from_text(label_exp)
           # TODO: this won't work correctly if @wd is a sub-element
-          @query_scope.wd.find_elements(:tag_name, 'label').find do |el|
+          locate_elements(:tag_name, 'label').find do |el|
             matches_selector?(el, text: label_exp)
           end
         end
@@ -251,6 +252,19 @@ module Watir
             "contains(#{lhs}, #{XpathSupport.escape(literals)})"
           end
         end
+
+        def ensure_scope_context
+          @query_scope.wd
+        end
+
+        def locate_element(how, what)
+          @query_scope.wd.find_element(how, what)
+        end
+
+        def locate_elements(how, what, scope = @query_scope.wd)
+          scope.find_elements(how, what)
+        end
+
       end
     end
   end

data/lib/watir/radio_set.rb

@@ -0,0 +1,231 @@
+module Watir
+  class RadioSet
+    extend Forwardable
+    include Watir::Exception
+    include Enumerable
+
+    delegate [:exists?, :present?, :visible?, :browser] => :source
+
+    attr_reader :source, :frame
+
+    def initialize(query_scope, selector)
+      unless selector.kind_of? Hash
+        raise ArgumentError, "invalid argument: #{selector.inspect}"
+      end
+
+      @source = Radio.new(query_scope, selector)
+      @frame = @source.parent(tag_name: :form)
+    end
+
+    #
+    # Yields each Radio associated with this set.
+    #
+    # @example
+    #   radio_set = browser.radio_set
+    #   radio_set.each do |radio|
+    #     puts radio.text
+    #   end
+    #
+    # @yieldparam [Watir::RadioSet] element iterate through the radio buttons.
+    #
+
+    def each(&block)
+      radios.each(&block)
+    end
+
+    #
+    # Get the n'th radio button in this set
+    #
+    # @return Watir::Radio
+    #
+
+    def [](idx)
+      radios[idx]
+    end
+
+    #
+    # @return Watir::Radio
+    #
+
+    def radio(opt = {})
+      n = name
+      if !n.empty? && (!opt[:name] || opt[:name] == n)
+        frame.radio(opt.merge name: n)
+      elsif n.empty?
+        return source
+      else
+        raise Watir::Exception::UnknownObjectException, "#{opt[:name]} does not match name of RadioSet: #{n}"
+      end
+
+    end
+
+    #
+    # @return Watir::RadioCollection
+    #
+
+    def radios(opt = {})
+      n = name
+      if !n.empty? && (!opt[:name] || opt[:name] == n)
+        element_call(:wait_for_present) { frame.radios(opt.merge name: n) }
+      elsif n.empty?
+        Watir::RadioCollection.new(frame, element: source.wd)
+      else
+        raise Watir::Exception::UnknownObjectException, "#{opt[:name]} does not match name of RadioSet: #{n}"
+      end
+    end
+
+    #
+    # Returns true if any radio buttons in the set are enabled.
+    #
+    # @return [Boolean]
+    #
+
+    def enabled?
+      any?(&:enabled?)
+    end
+
+    #
+    # Returns true if all radio buttons in the set are disabled.
+    #
+    # @return [Boolean]
+    #
+
+    def disabled?
+      !enabled?
+    end
+
+    #
+    # Returns the name attribute for the set.
+    #
+    # @return [String]
+    #
+
+    def name
+      @name ||= source.name
+    end
+
+    #
+    # If RadioSet exists, this always returns 'radio'.
+    #
+    # @return [String]
+    #
+
+    def type
+      source.send :assert_exists
+      'radio'
+    end
+
+    #
+    # Returns true if the radio set has one or more radio buttons where label matches the given value.
+    #
+    # @param [String, Regexp] str_or_rx
+    # @return [Boolean]
+    #
+
+    def include?(str_or_rx)
+      radio(label: str_or_rx).exist?
+    end
+
+    #
+    # Select the radio button whose value or label matches the given string.
+    #
+    # @param [String, Regexp] str_or_rx
+    # @raise [Watir::Exception::UnknownObjectException] if the Radio does not exist.
+    # @return [String] The value or text of the radio selected.
+    #
+
+    def select(str_or_rx)
+      found_by_value = radio(value: str_or_rx)
+      found_by_text = radio(label: str_or_rx)
+
+      if found_by_value.exist?
+        found_by_value.click unless found_by_value.selected?
+        return found_by_value.value
+      elsif found_by_text.exist?
+        found_by_text.click unless found_by_text.selected?
+        return found_by_text.text
+      else
+        raise UnknownObjectException, "Unable to locate radio matching #{str_or_rx.inspect}"
+      end
+    end
+
+    #
+    # Returns true if any of the radio button label matches the given value.
+    #
+    # @param [String, Regexp] str_or_rx
+    # @raise [Watir::Exception::UnknownObjectException] if the options do not exist
+    # @return [Boolean]
+    #
+
+    def selected?(str_or_rx)
+      found = frame.radio(label: str_or_rx)
+
+      return found.selected? if found.exist?
+      raise UnknownObjectException, "Unable to locate radio matching #{str_or_rx.inspect}"
+    end
+
+    #
+    # Returns the value of the selected radio button in the set.
+    # Returns nil if no radio is selected.
+    #
+    # @return [String, nil]
+    #
+
+    def value
+      sel = selected
+      sel && sel.value
+    end
+
+    #
+    # Returns the text of the selected radio button in the set.
+    # Returns nil if no option is selected.
+    #
+    # @return [String, nil]
+    #
+
+    def text
+      sel = selected
+      sel && sel.text
+    end
+
+    #
+    # Returns the selected Radio element.
+    # Returns nil if no radio button is selected.
+    #
+    # @return [Watir::Radio, nil]
+    #
+
+    def selected
+      find(&:selected?)
+    end
+
+    #
+    # Returns true if two elements are equal.
+    #
+    # @example
+    #   browser.radio_set(id: 'new_user_newsletter_yes') == browser.radio_set(id: 'new_user_newsletter_no')
+    #   #=> true
+    #
+
+    def ==(other)
+      return false unless other.kind_of?(self.class)
+      radios == other.radios
+    end
+    alias_method :eql?, :==
+
+    private
+
+    def element_call(*args, &blk)
+      source.send :element_call, *args, &blk
+    end
+  end # RadioSet
+
+  module Container
+    def radio_set(*args)
+      RadioSet.new(self, extract_selector(args).merge(tag_name: "input", type: "radio"))
+    end
+
+    Watir.tag_to_class[:radio_set] = RadioSet
+  end # Container
+
+end # Watir