watir-webdriver 0.1.7 → 0.1.8

data/Gemfile

@@ -1,4 +1,6 @@
 source "http://rubygems.org"
 
+gem "simplecov", ">= 0.3.5", :platform => :ruby_19
+
 # Specify your gem's dependencies in watir-webdriver.gemspec
 gemspec

data/Rakefile

@@ -8,13 +8,6 @@ RSpec::Core::RakeTask.new(:spec) do |spec|
 end
 
 namespace :spec do
-  RSpec::Core::RakeTask.new(:rcov) do |spec|
-    spec.ruby_opts = "-I lib:spec"
-    spec.pattern   = 'spec/**/*_spec.rb'
-    spec.rcov      = true
-    spec.rcov_opts = %w[--exclude spec,ruby-debug,/Library/Ruby,.gem --include lib/watir-webdriver]
-  end
-
   RSpec::Core::RakeTask.new(:html) do |spec|
     spec.ruby_opts  = "-I lib:spec"
     spec.pattern    = 'spec/**/*_spec.rb'

data/lib/watir-webdriver.rb

@@ -3,7 +3,6 @@ require "selenium-webdriver"
 require "json"
 
 require "watir-webdriver/version"
-require "watir-webdriver/core_ext/string"
 require "watir-webdriver/exception"
 require "watir-webdriver/xpath_support"
 require "watir-webdriver/window_switching"

data/lib/watir-webdriver/browser.rb

@@ -112,11 +112,7 @@ module Watir
       args.map! { |e| e.kind_of?(Watir::Element) ? e.element : e }
       returned = @driver.execute_script(script, *args)
 
-      if returned.kind_of? WebDriver::Element
-        Watir.element_class_for(returned.tag_name).new(self, :element => returned)
-      else
-        returned
-      end
+      wrap_elements_in(returned)
     end
 
     def add_checker(checker = nil, &block)
@@ -160,5 +156,26 @@ module Watir
       self
     end
 
+    private
+
+    def wrap_elements_in(obj)
+      case obj
+      when WebDriver::Element
+        wrap_element(obj)
+      when Array
+        obj.map { |e| wrap_elements_in(e) }
+      when Hash
+        obj.each { |k,v| obj[k] = wrap_elements_in(v) }
+
+        obj
+      else
+        obj
+      end
+    end
+
+    def wrap_element(element)
+      Watir.element_class_for(element.tag_name).new(self, :element => element)
+    end
+
   end # Browser
 end # Watir

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

@@ -14,15 +14,6 @@ module Watir
 
     VALID_TYPES = %w[button reset submit image]
 
-    def self.from(parent, element)
-      if element.tag_name == "button" ||
-         element.tag_name == "input" && VALID_TYPES.include?(element.attribute(:type))
-        Button.new(parent, :element => element)
-      else
-        raise TypeError, "expected button or input[@type=#{VALID_TYPES.join("|")}] for #{element.inspect}"
-      end
-    end
-
     #
     # Returns the text of the button.
     #

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

@@ -3,14 +3,6 @@
 module Watir
   class CheckBox < Input
 
-    def self.from(parent, element)
-      if element.attribute(:type) != "checkbox"
-        raise TypeError, "expected type=checkbox for #{element.inspect}"
-      end
-
-      super
-    end
-
     #
     # Set this checkbox to the given value
     #

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

@@ -1,14 +1,6 @@
 # encoding: utf-8
 module Watir
   class FileField < Input
-    def self.from(parent, element)
-      if element.attribute(:type) != "file"
-        raise TypeError, "expected type=file for #{element.inspect}"
-      end
-
-      super
-    end
-
     #
     # Set the file field to the given path
     #

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

@@ -2,30 +2,24 @@
 module Watir
   class Frame < HTMLElement
 
-    VALID_LOCATORS = [:id, :name, :index]
-
-    def initialize(*args)
-      super
-      @frame_id = nil
-    end
-
     def locate
       @parent.assert_exists
 
-      if @iframe
-        switch_to_iframe(@iframe)
-        driver
-      elsif @frame_id.nil?
-        locate_iframe || locate_frame
-      else
-        switch!
-        driver
-      end
+      element = locate_iframe || locate_frame
+      element or raise UnknownFrameException, "unable to locate frame/iframe using #{selector_string}"
+
+      FramedDriver.new(element, driver)
     end
 
     def assert_exists
-      # we always run locate(), to make sure the frame is switched
-      @element = locate
+      if element = @selector[:element]
+        @parent.assert_exists
+        @element = FramedDriver.new(element, driver)
+      else
+        @element = nil
+      end
+
+      super
     end
 
     def execute_script(*args)
@@ -46,65 +40,63 @@ module Watir
 
     def locate_iframe
       # hack - frame doesn't have IFrame's attributes either
-      @iframe = IFrame.new(@parent, @selector.merge(:tag_name => "iframe")).locate
-
-      if @iframe
-        switch_to_iframe @iframe
-        driver
-      end
+      IFrame.new(@parent, @selector.merge(:tag_name => "iframe")).locate
     end
 
     def locate_frame
-      loc = VALID_LOCATORS.find { |loc| @selector.has_key? loc }
-
-      unless loc
-        raise MissingWayOfFindingObjectException, "can only locate frames by #{VALID_LOCATORS.inspect}"
-      end
-
-      @frame_id = @selector[loc]
-
-      unless [String, Integer].any? { |e| @frame_id.kind_of?(e) }
-        raise TypeError, "can't locate frame using #{@frame_id.inspect}:#{@frame_id.class}"
-      end
-
-      switch!
+      locator = locator_class.new(@parent.wd, @selector.merge(:tag_name => "frame"), self.class.attribute_list)
+      locator.locate
+    end
+  end # Frame
 
-      driver
+  module Container
+    def frame(*args)
+      Frame.new(self, extract_selector(args))
     end
 
-    def switch!
-      driver.switch_to.frame @frame_id
-    rescue Selenium::WebDriver::Error::NoSuchFrameError => e
-      raise UnknownFrameException, e.message
+    def frames(*args)
+      FrameCollection.new(self, extract_selector(args).merge(:tag_name => /^(iframe|frame)$/)) # hack
     end
+  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
+  # @api private
+  #
+  # another hack..
+  #
 
-      # TODO: get rid of this when we can switch to elements
-      # http://groups.google.com/group/selenium-developers/browse_thread/thread/428bd68e9e8bfecd/19a02ecd20835249
+  class FramedDriver
+    def initialize(element, driver)
+      @element = element
+      @driver = driver
+    end
+    
+    def ==(other)
+      @element == other.element
+    end
+    alias_method :eql?, :==
+    
+    protected
+    
+    def element
+      @element
+    end
+    
+    private
 
-      if @parent.kind_of? Frame
-        parent_id = @parent.instance_variable_get("@frame_id")
-        loc = [parent_id, element.attribute(loc)].join(".")
+    def method_missing(meth, *args, &blk)
+      if @driver.respond_to?(meth)
+        switch!
+        @driver.send(meth, *args, &blk)
       else
-        loc = element.attribute(loc)
+        @element.send(meth, *args, &blk)
       end
-
-      driver.switch_to.frame loc
     end
-  end # Frame
 
-  module Container
-    def frame(*args)
-      Frame.new(self, extract_selector(args))
+    def switch!
+      @driver.switch_to.frame @element
+    rescue Selenium::WebDriver::Error::NoSuchFrameError => e
+      raise UnknownFrameException, e.message
     end
 
-    def frames(*args)
-      FrameCollection.new(self, extract_selector(args))
-    end
-  end
+  end # FramedDriver
 end # Watir

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

@@ -412,7 +412,7 @@ module Watir
    end
  end
  class Track < HTMLElement
-   attributes(:string => [:kind, :src, :charset, :srclang, :label, :track])
+   attributes(:string => [:kind, :src, :srclang, :label, :track], :bool => [:default])
  end
  class TrackCollection < ElementCollection
    def element_class
@@ -753,6 +753,7 @@ module Watir
 
 
 
+
  module Container
    #
    # @return [Anchor]

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

@@ -4,20 +4,6 @@ module Watir
 
     alias_method :readonly?, :read_only?
 
-    #
-    # @private
-    #
-    # subclasses can use this to validate the incoming element
-    #
-
-    def self.from(parent, element)
-      unless element.tag_name == "input"
-        raise TypeError, "can't create #{self} from #{element.inspect}"
-      end
-
-      new(parent, :element => element)
-    end
-
     def enabled?
       !disabled?
     end

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

@@ -1,13 +1,6 @@
 # encoding: utf-8
 module Watir
   class Radio < Input
-    def self.from(parent, element)
-      if element.attribute(:type) != "radio"
-        raise TypeError, "expected type=radio for #{element.inspect}"
-      end
-
-      super
-    end
     #
     # Select this radio button.
     #

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

@@ -5,16 +5,6 @@ module Watir
     attributes Watir::TextArea.typed_attributes
     remove_method :type # we want Input#type here, which was overriden by TextArea's attributes
 
-    def self.from(parent, element)
-      type = element.attribute(:type)
-
-      if TextFieldLocator::NON_TEXT_TYPES.include?(type)
-        raise TypeError, "expected type != #{type} for #{element.inspect}"
-      end
-
-      super
-    end
-
     #
     # Clear the element, the type in the given value.
     #

data/lib/watir-webdriver/version.rb

@@ -1,3 +1,3 @@
 module Watir
-  VERSION = "0.1.7"
+  VERSION = "0.1.8"
 end

data/spec/browser_spec.rb

@@ -21,10 +21,29 @@ describe Watir::Browser do
   end
 
   describe "#execute_script" do
-    it "returns DOM elements as Watir objects" do
-      browser.goto(WatirSpec.files + "/definition_lists.html")
-      returned = browser.execute_script("return document.getElementById('experience-list')")
-      returned.should be_kind_of(Watir::DList)
+    before { browser.goto(WatirSpec.files + "/definition_lists.html") }
+
+    it "wraps elements as Watir objects" do
+      returned = browser.execute_script("return document.body")
+      returned.should be_kind_of(Watir::Body)
+    end
+
+    it "wraps elements in an array" do
+      list = browser.execute_script("return [document.body];")
+      list.size.should == 1
+      list.first.should be_kind_of(Watir::Body)
+    end
+
+    it "wraps elements in a Hash" do
+      hash = browser.execute_script("return {element: document.body};")
+      hash['element'].should be_kind_of(Watir::Body)
+    end
+
+    it "wraps elements in a deep object" do
+      hash = browser.execute_script("return {elements: [document.body], body: {element: document.body }}")
+
+      hash['elements'].first.should be_kind_of(Watir::Body)
+      hash['body']['element'].should be_kind_of(Watir::Body)
     end
   end
 

data/spec/html/wait.html

@@ -20,7 +20,7 @@
 
   <body>
     <div id="foo" style="display:block;">foo</div>
-    <div id="bar" style="display:none;">bar</div>
+    <div id="bar" style="display:none;" onclick='this.innerHTML = "changed"'>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>

data/spec/spec_helper.rb

@@ -2,6 +2,13 @@
 $LOAD_PATH.unshift(File.dirname(__FILE__))
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 
+if ENV['coverage']
+  raise "simplecov only works on Ruby 1.9" unless RUBY_VERSION =~ /^1\.9/
+
+  require 'simplecov'
+  SimpleCov.start { add_filter "spec/" }
+end
+
 require 'watir-webdriver'
 require 'locator_spec_helper'
 require 'rubygems'

data/spec/wait_spec.rb

@@ -6,7 +6,7 @@ describe Watir::Wait 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 }
@@ -18,7 +18,7 @@ describe Watir::Wait 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 }
@@ -37,40 +37,54 @@ describe Watir::Element 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
+    it "yields when the element becomes present" do
       called = false
-      browser.div(:id, 'bar').when_present(1) do
-        called = true
-      end
-      called.should == true
+
+      browser.a(:id, 'show_bar').click
+      browser.div(:id, 'bar').when_present(1) { called = true }
+
+      called.should be_true
     end
-    
-    it "times out" do 
-      lambda do
+
+    it "invokes subsequent method calls when the element becomes present" do
+      browser.a(:id, 'show_bar').click
+
+      bar = browser.div(:id, 'bar')
+      bar.when_present(1).click
+      bar.text.should == "changed"
+    end
+
+    it "times out when given a block" do
+      lambda {
         browser.div(:id, 'bar').when_present(1) {}
-      end.should raise_error(Watir::Wait::TimeoutError)
+      }.should raise_error(Watir::Wait::TimeoutError)
+    end
+
+    it "times out when not given a block" do
+      lambda {
+        browser.div(:id, 'bar').when_present(1).click
+      }.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
+    it "it waits until the element appears" do
       browser.a(:id, 'show_bar').click
       browser.div(:id, 'bar').wait_until_present(1)
     end
-    
-    it "times out" do 
+
+    it "times out if the element doesn't appear" do
       lambda do
         browser.div(:id, 'bar').wait_until_present(1)
       end.should raise_error(Watir::Wait::TimeoutError)
@@ -87,12 +101,12 @@ describe Watir::Element do
       browser.a(:id, 'remove_foo').click
       browser.div(:id, 'foo').wait_while_present(1)
     end
-    
-    it "times out" do 
+
+    it "times out" do
       lambda do
         browser.div(:id, 'foo').wait_while_present(1)
       end.should raise_error(Watir::Wait::TimeoutError)
     end
   end
-  
+
 end