watir-webdriver 0.0.2 → 0.0.3

data/Rakefile

@@ -11,7 +11,7 @@ begin
     gem.homepage    = "http://github.com/jarib/watir-webdriver"
     gem.authors     = ["Jari Bakken"]
 
-    gem.add_dependency "selenium-webdriver", '>= 0.0.23'
+    gem.add_dependency "selenium-webdriver", '>= 0.0.26'
 
     gem.add_development_dependency "rspec"
     gem.add_development_dependency "webidl"

data/VERSION

@@ -1 +1 @@
-0.0.2
+0.0.3

data/lib/watir-webdriver/base_element.rb

@@ -324,9 +324,9 @@ module Watir
       @selector.inspect
     end
 
-    def attribute?(a)
+    def attribute?(attribute)
       assert_exists
-      rescue_no_match(false) { !!@element.attribute(a)  }
+      driver.execute_script "return !!arguments[0].getAttributeNode(arguments[1]);", @element, attribute.downcase
     end
 
     def assert_enabled

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

@@ -30,6 +30,11 @@ module Watir
       end
     end
 
+    def options
+      assert_exists
+      super
+    end
+
     #
     # Returns true if the select list has one or more options where text or label matches the given value.
     #

data/lib/watir-webdriver/locators/element_locator.rb

@@ -4,8 +4,18 @@ module Watir
     include Watir::Exception
     include Selenium
 
-    WD_FINDERS =  [ :class, :class_name, :id, :link_text, :link,
-                    :partial_link_text, :name, :tag_name, :xpath ]
+    WD_FINDERS =  [ 
+      :class, 
+      :class_name, 
+      :css,
+      :id, 
+      :link,
+      :link_text, 
+      :name, 
+      :partial_link_text, 
+      :tag_name, 
+      :xpath
+    ]
 
     def initialize(wd, selector, valid_attributes)
       @wd               = wd
@@ -138,7 +148,7 @@ module Watir
       when :tag_name
         element.tag_name
       else
-        element.attribute(how) rescue "" # TODO: rescue specific exception
+        element.attribute(how)
       end
     end
 

data/lib/watir-webdriver/locators/text_field_locator.rb

@@ -20,11 +20,11 @@ module Watir
       @building = :input
       input_attr_exp = attribute_expression(selectors)
 
-      xpath = ".//textarea"
-      xpath << "[#{textarea_attr_exp}]" unless textarea_attr_exp.empty?
-      xpath << " | .//input[(not(@type) or (#{NEGATIVE_TYPE_EXPR}))"
+      xpath = ".//input[(not(@type) or (#{NEGATIVE_TYPE_EXPR}))"
       xpath << " and #{input_attr_exp}" unless input_attr_exp.empty?
-      xpath << "]"
+      xpath << "] "
+      xpath << "| .//textarea"
+      xpath << "[#{textarea_attr_exp}]" unless textarea_attr_exp.empty?
 
       p :build_xpath => xpath if $DEBUG
 

data/spec/watirspec/form_spec.rb

@@ -54,9 +54,11 @@ describe "Form" do
   end
 
   describe "#submit" do
-    it "submits the form" do
-      browser.form(:id, "delete_user").submit
-      browser.text.should include("Semantic table")
+    not_compliant_on :celerity do
+      it "submits the form" do
+        browser.form(:id, "delete_user").submit
+        browser.text.should include("Semantic table")
+      end
     end
   end
 

data/spec/watirspec/image_spec.rb

@@ -171,37 +171,40 @@ describe "Image" do
   end
 
   # Other
-  describe "#loaded?" do
-    it "returns true if the image has been loaded" do
-      browser.image(:title, 'Circle').should be_loaded
-      browser.image(:alt, 'circle').should be_loaded
-      browser.image(:alt, /circle/).should be_loaded
-    end
 
-    it "returns false if the image has not been loaded" do
-      browser.image(:id, 'no_such_file').should_not be_loaded
-    end
+  not_compliant_on(:webdriver) {
+    describe "#loaded?" do
+      it "returns true if the image has been loaded" do
+        browser.image(:title, 'Circle').should be_loaded
+        browser.image(:alt, 'circle').should be_loaded
+        browser.image(:alt, /circle/).should be_loaded
+      end
 
-    it "raises UnknownObjectException if the image doesn't exist" do
-      lambda { browser.image(:id, 'no_such_image').loaded? }.should raise_error(UnknownObjectException)
-      lambda { browser.image(:src, 'no_such_image').loaded? }.should raise_error(UnknownObjectException)
-      lambda { browser.image(:alt, 'no_such_image').loaded? }.should raise_error(UnknownObjectException)
-      lambda { browser.image(:index, 1337).loaded? }.should raise_error(UnknownObjectException)
+      it "returns false if the image has not been loaded" do
+        browser.image(:id, 'no_such_file').should_not be_loaded
+      end
+
+      it "raises UnknownObjectException if the image doesn't exist" do
+        lambda { browser.image(:id, 'no_such_image').loaded? }.should raise_error(UnknownObjectException)
+        lambda { browser.image(:src, 'no_such_image').loaded? }.should raise_error(UnknownObjectException)
+        lambda { browser.image(:alt, 'no_such_image').loaded? }.should raise_error(UnknownObjectException)
+        lambda { browser.image(:index, 1337).loaded? }.should raise_error(UnknownObjectException)
+      end
     end
-  end
 
-  describe "#save" do
     bug "WTR-336", :watir do
-      it "saves the image to a file" do
-        file = "#{File.expand_path Dir.pwd}/sample.img.dat"
-        begin
-          browser.image(:index, 1).save(file)
-          File.exist?(file).should be_true
-        ensure
-          File.delete(file) if File.exist?(file)
+      describe "#save" do
+        it "saves the image to a file" do
+          file = "#{File.expand_path Dir.pwd}/sample.img.dat"
+          begin
+            browser.image(:index, 1).save(file)
+            File.exist?(file).should be_true
+          ensure
+            File.delete(file) if File.exist?(file)
+          end
         end
       end
     end
-  end
+  }
 
 end

data/spec/watirspec/lib/server.rb

@@ -1,4 +1,5 @@
 # encoding: utf-8
+
 module WatirSpec
   class Server < Sinatra::Base
     class << self
@@ -76,6 +77,24 @@ module WatirSpec
       self.class.name
     end
 
+    class BigContent
+      def each(&blk)
+        yield "<html><head><title>Big Content</title></head><body>"
+
+        string = "hello"*205
+
+        300.times do
+          yield string
+        end
+
+        yield "</body></html>"
+      end
+    end
+
+    get '/big' do
+      BigContent.new
+    end
+
     post '/post_to_me' do
       "You posted the following content:\n#{ env['rack.input'].read }"
     end
@@ -92,16 +111,16 @@ module WatirSpec
 
     get '/charset_mismatch' do
       content_type 'text/html; charset=UTF-8'
-      <<-HTML
-      <html>
-        <head>
-          <meta http-equiv="Content-type" content="text/html; charset=iso-8859-1" />
-        </head>
-        <body>
-          <h1>ø</h1>
-        </body>
-      </html>
-      HTML
+      %{
+        <html>
+          <head>
+            <meta http-equiv="Content-type" content="text/html; charset=iso-8859-1" />
+          </head>
+          <body>
+            <h1>ø</h1>
+          </body>
+        </html>
+      }
     end
 
     get '/octet_stream' do
@@ -132,5 +151,9 @@ module WatirSpec
       "ok"
     end
 
+    get '/encodable_<stuff>' do
+      'page with characters in URI that need encoding'
+    end
+
   end # Server
 end # WatirSpec

data/spec/watirspec/lib/spec_helper.rb

@@ -20,8 +20,8 @@ module WatirSpec
 
     def execute
       load_requires
-      configure
       start_server
+      configure
       add_guard_hook
     end
 

data/spec/watirspec/option_spec.rb

@@ -91,12 +91,14 @@ describe "Option" do
   describe "#select" do
     bug "WTR-367", :watir do
       it "selects the chosen option (page context)" do
+        browser.select_list(:name, "new_user_country").clear
         browser.option(:text, "Denmark").select
         browser.select_list(:name, "new_user_country").selected_options.should == ["Denmark"]
       end
     end
 
     it "selects the chosen option (select_list context)" do
+      browser.select_list(:name, "new_user_country").clear
       browser.select_list(:name, "new_user_country").option(:text, "Denmark").select
       browser.select_list(:name, "new_user_country").selected_options.should == ["Denmark"]
     end

data/spec/watirspec/select_list_spec.rb

@@ -14,11 +14,12 @@ describe "SelectList" do
       browser.select_list(:id, /new_user_country/).should exist
       browser.select_list(:name, 'new_user_country').should exist
       browser.select_list(:name, /new_user_country/).should exist
-      # TODO: check behaviour in Watir
-      # browser.select_list(:value, 'Norway').should exist
-      # browser.select_list(:value, /Norway/).should exist
-      browser.select_list(:text, 'Norway').should exist
-      browser.select_list(:text, /Norway/).should exist
+
+      not_compliant_on :webdriver do
+        browser.select_list(:text, 'Norway').should exist
+        browser.select_list(:text, /Norway/).should exist
+      end
+
       browser.select_list(:class, 'country').should exist
       browser.select_list(:class, /country/).should exist
       browser.select_list(:index, 0).should exist
@@ -155,11 +156,28 @@ describe "SelectList" do
       lambda { browser.select_list(:name, 'no_such_name').options }.should raise_error(UnknownObjectException)
     end
 
-    bug "WTR-339", :watir do
+    #
+    # The correct behaviour here needs to be discussed.
+    #
+
+    deviates_on :celerity do
       it "returns all the options as an Array" do
         browser.select_list(:name, "new_user_country").options.should == ["Denmark" ,"Norway" , "Sweden" , "United Kingdom", "USA", "Germany"]
       end
     end
+
+    deviates_on :webdriver do
+      it "returns all the options as a collection of Options" do
+        options = browser.select_list(:name, "new_user_country").options
+        options.map { |opt| opt.text }.should == ["Denmark" ,"Norway" , "Sweden" , "United Kingdom", "USA", "Germany"]
+      end
+    end
+
+    deviates_on :watir do # see also WTR-339
+      it "returns all the options as an Array" do
+        browser.select_list(:name, "new_user_country").options.should == ["Denmark" ,"Norway" , "Sweden" , "United Kingdom", "USA"]
+      end
+    end
   end
 
   describe "#selected_options" do

data/watir-webdriver.gemspec

@@ -0,0 +1,186 @@
+# Generated by jeweler
+# DO NOT EDIT THIS FILE DIRECTLY
+# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
+# -*- encoding: utf-8 -*-
+
+Gem::Specification.new do |s|
+  s.name = %q{watir-webdriver}
+  s.version = "0.0.3"
+
+  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  s.authors = ["Jari Bakken"]
+  s.date = %q{2010-07-21}
+  s.description = %q{WebDriver-backed Watir}
+  s.email = %q{jari.bakken@gmail.com}
+  s.extra_rdoc_files = [
+    "LICENSE",
+     "README.rdoc",
+     "TODO"
+  ]
+  s.files = [
+    ".document",
+     ".gitignore",
+     ".gitmodules",
+     "LICENSE",
+     "README.rdoc",
+     "Rakefile",
+     "TODO",
+     "VERSION",
+     "lib/watir-webdriver.rb",
+     "lib/watir-webdriver/base_element.rb",
+     "lib/watir-webdriver/browser.rb",
+     "lib/watir-webdriver/browserbot.js",
+     "lib/watir-webdriver/collections/buttons_collection.rb",
+     "lib/watir-webdriver/collections/element_collection.rb",
+     "lib/watir-webdriver/collections/table_rows_collection.rb",
+     "lib/watir-webdriver/collections/text_fields_collection.rb",
+     "lib/watir-webdriver/container.rb",
+     "lib/watir-webdriver/core_ext/string.rb",
+     "lib/watir-webdriver/elements/button.rb",
+     "lib/watir-webdriver/elements/checkbox.rb",
+     "lib/watir-webdriver/elements/file_field.rb",
+     "lib/watir-webdriver/elements/font.rb",
+     "lib/watir-webdriver/elements/form.rb",
+     "lib/watir-webdriver/elements/frame.rb",
+     "lib/watir-webdriver/elements/generated.rb",
+     "lib/watir-webdriver/elements/headings.rb",
+     "lib/watir-webdriver/elements/hidden.rb",
+     "lib/watir-webdriver/elements/image.rb",
+     "lib/watir-webdriver/elements/input.rb",
+     "lib/watir-webdriver/elements/link.rb",
+     "lib/watir-webdriver/elements/option.rb",
+     "lib/watir-webdriver/elements/radio.rb",
+     "lib/watir-webdriver/elements/select_list.rb",
+     "lib/watir-webdriver/elements/table.rb",
+     "lib/watir-webdriver/elements/table_row.rb",
+     "lib/watir-webdriver/elements/text_field.rb",
+     "lib/watir-webdriver/exception.rb",
+     "lib/watir-webdriver/extensions/nokogiri.rb",
+     "lib/watir-webdriver/locators/button_locator.rb",
+     "lib/watir-webdriver/locators/element_locator.rb",
+     "lib/watir-webdriver/locators/table_row_locator.rb",
+     "lib/watir-webdriver/locators/text_field_locator.rb",
+     "lib/watir-webdriver/xpath_support.rb",
+     "spec/base_element_spec.rb",
+     "spec/html/keylogger.html",
+     "spec/spec_helper.rb",
+     "support/html5/html5.idl",
+     "support/html5/old/html5.idl",
+     "support/html5/old/html5_extras.idl",
+     "support/html5/watir_visitor.rb",
+     "support/yard_handlers.rb",
+     "watir-webdriver.gemspec"
+  ]
+  s.homepage = %q{http://github.com/jarib/watir-webdriver}
+  s.rdoc_options = ["--charset=UTF-8"]
+  s.require_paths = ["lib"]
+  s.rubygems_version = %q{1.3.7}
+  s.summary = %q{Watir on WebDriver}
+  s.test_files = [
+    "spec/base_element_spec.rb",
+     "spec/spec_helper.rb",
+     "spec/watirspec/area_spec.rb",
+     "spec/watirspec/areas_spec.rb",
+     "spec/watirspec/browser_spec.rb",
+     "spec/watirspec/button_spec.rb",
+     "spec/watirspec/buttons_spec.rb",
+     "spec/watirspec/checkbox_spec.rb",
+     "spec/watirspec/checkboxes_spec.rb",
+     "spec/watirspec/dd_spec.rb",
+     "spec/watirspec/dds_spec.rb",
+     "spec/watirspec/div_spec.rb",
+     "spec/watirspec/divs_spec.rb",
+     "spec/watirspec/dl_spec.rb",
+     "spec/watirspec/dls_spec.rb",
+     "spec/watirspec/dt_spec.rb",
+     "spec/watirspec/dts_spec.rb",
+     "spec/watirspec/element_spec.rb",
+     "spec/watirspec/em_spec.rb",
+     "spec/watirspec/ems_spec.rb",
+     "spec/watirspec/filefield_spec.rb",
+     "spec/watirspec/filefields_spec.rb",
+     "spec/watirspec/font_spec.rb",
+     "spec/watirspec/form_spec.rb",
+     "spec/watirspec/forms_spec.rb",
+     "spec/watirspec/frame_spec.rb",
+     "spec/watirspec/frames_spec.rb",
+     "spec/watirspec/hidden_spec.rb",
+     "spec/watirspec/hiddens_spec.rb",
+     "spec/watirspec/hn_spec.rb",
+     "spec/watirspec/hns_spec.rb",
+     "spec/watirspec/image_spec.rb",
+     "spec/watirspec/images_spec.rb",
+     "spec/watirspec/label_spec.rb",
+     "spec/watirspec/labels_spec.rb",
+     "spec/watirspec/li_spec.rb",
+     "spec/watirspec/lib/guards.rb",
+     "spec/watirspec/lib/server.rb",
+     "spec/watirspec/lib/spec_helper.rb",
+     "spec/watirspec/lib/watirspec.rb",
+     "spec/watirspec/link_spec.rb",
+     "spec/watirspec/links_spec.rb",
+     "spec/watirspec/lis_spec.rb",
+     "spec/watirspec/map_spec.rb",
+     "spec/watirspec/maps_spec.rb",
+     "spec/watirspec/meta_spec.rb",
+     "spec/watirspec/metas_spec.rb",
+     "spec/watirspec/ol_spec.rb",
+     "spec/watirspec/ols_spec.rb",
+     "spec/watirspec/option_spec.rb",
+     "spec/watirspec/p_spec.rb",
+     "spec/watirspec/pre_spec.rb",
+     "spec/watirspec/pres_spec.rb",
+     "spec/watirspec/ps_spec.rb",
+     "spec/watirspec/radio_spec.rb",
+     "spec/watirspec/radios_spec.rb",
+     "spec/watirspec/select_list_spec.rb",
+     "spec/watirspec/select_lists_spec.rb",
+     "spec/watirspec/span_spec.rb",
+     "spec/watirspec/spans_spec.rb",
+     "spec/watirspec/spec_helper.rb",
+     "spec/watirspec/strong_spec.rb",
+     "spec/watirspec/strongs_spec.rb",
+     "spec/watirspec/table_bodies_spec.rb",
+     "spec/watirspec/table_body_spec.rb",
+     "spec/watirspec/table_cell_spec.rb",
+     "spec/watirspec/table_cells_spec.rb",
+     "spec/watirspec/table_footer_spec.rb",
+     "spec/watirspec/table_footers_spec.rb",
+     "spec/watirspec/table_header_spec.rb",
+     "spec/watirspec/table_headers_spec.rb",
+     "spec/watirspec/table_row_spec.rb",
+     "spec/watirspec/table_rows_spec.rb",
+     "spec/watirspec/table_spec.rb",
+     "spec/watirspec/tables_spec.rb",
+     "spec/watirspec/text_field_spec.rb",
+     "spec/watirspec/text_fields_spec.rb",
+     "spec/watirspec/ul_spec.rb",
+     "spec/watirspec/uls_spec.rb"
+  ]
+
+  if s.respond_to? :specification_version then
+    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
+    s.specification_version = 3
+
+    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
+      s.add_runtime_dependency(%q<selenium-webdriver>, [">= 0.0.26"])
+      s.add_development_dependency(%q<rspec>, [">= 0"])
+      s.add_development_dependency(%q<webidl>, [">= 0"])
+      s.add_development_dependency(%q<sinatra>, [">= 1.0"])
+      s.add_development_dependency(%q<activesupport>, [">= 2.3.5"])
+    else
+      s.add_dependency(%q<selenium-webdriver>, [">= 0.0.26"])
+      s.add_dependency(%q<rspec>, [">= 0"])
+      s.add_dependency(%q<webidl>, [">= 0"])
+      s.add_dependency(%q<sinatra>, [">= 1.0"])
+      s.add_dependency(%q<activesupport>, [">= 2.3.5"])
+    end
+  else
+    s.add_dependency(%q<selenium-webdriver>, [">= 0.0.26"])
+    s.add_dependency(%q<rspec>, [">= 0"])
+    s.add_dependency(%q<webidl>, [">= 0"])
+    s.add_dependency(%q<sinatra>, [">= 1.0"])
+    s.add_dependency(%q<activesupport>, [">= 2.3.5"])
+  end
+end
+

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: watir-webdriver
 version: !ruby/object:Gem::Version 
-  hash: 27
+  hash: 25
   prerelease: false
   segments: 
   - 0
   - 0
-  - 2
-  version: 0.0.2
+  - 3
+  version: 0.0.3
 platform: ruby
 authors: 
 - Jari Bakken
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-06-30 00:00:00 +02:00
+date: 2010-07-21 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -26,12 +26,12 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 49
+        hash: 43
         segments: 
         - 0
         - 0
-        - 23
-        version: 0.0.23
+        - 26
+        version: 0.0.26
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
@@ -155,6 +155,7 @@ files:
 - support/html5/old/html5_extras.idl
 - support/html5/watir_visitor.rb
 - support/yard_handlers.rb
+- watir-webdriver.gemspec
 - spec/watirspec/area_spec.rb
 - spec/watirspec/areas_spec.rb
 - spec/watirspec/browser_spec.rb