watir-webdriver 0.1.1 → 0.1.2

data/Rakefile

@@ -11,9 +11,9 @@ begin
     gem.homepage    = "http://github.com/jarib/watir-webdriver"
     gem.authors     = ["Jari Bakken"]
 
-    gem.add_dependency "selenium-webdriver", '0.0.29'
+    gem.add_dependency "selenium-webdriver", '0.1.0'
 
-    gem.add_development_dependency "rspec"
+    gem.add_development_dependency "rspec", "~> 2.1.0"
     gem.add_development_dependency "yard", "~> 0.6"
     gem.add_development_dependency "webidl", ">= 0.0.6"
     gem.add_development_dependency "sinatra", "~> 1.0"
@@ -26,31 +26,30 @@ rescue LoadError
   puts "Jeweler (or a dependency) not available. Install it with: sudo gem install jeweler"
 end
 
-require 'spec/rake/spectask'
-Spec::Rake::SpecTask.new(:spec) do |spec|
-  spec.libs << 'lib' << 'spec'
-  spec.spec_files = FileList['spec/**/*_spec.rb']
+require 'rspec/core/rake_task'
+RSpec::Core::RakeTask.new(:spec) do |spec|
+  spec.ruby_opts = "-I lib:spec"
+  spec.pattern   = 'spec/**/*_spec.rb'
 end
 
 namespace :spec do
-  Spec::Rake::SpecTask.new(:rcov) do |spec|
-    spec.libs << 'lib' << 'spec'
-    spec.pattern = 'spec/**/*_spec.rb'
-    spec.rcov = true
+  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
 
   desc 'Run specs for CI'
-  Spec::Rake::SpecTask.new(:ci) do |spec|
-    spec.libs << 'lib' << 'spec'
-    spec.pattern = 'spec/**/*_spec.rb'
-    spec.spec_opts = ["--format", "html:results/#{RUBY_PLATFORM}/#{ENV['WATIR_WEBDRIVER_BROWSER'] || 'firefox'}/spec-results.html",
+  RSpec::Core::RakeTask.new(:ci) do |spec|
+    spec.ruby_opts  = "-I lib:spec"
+    spec.pattern    = 'spec/**/*_spec.rb'
+    spec.rspec_opts = ["--format", "html:results/#{RUBY_PLATFORM}/#{ENV['WATIR_WEBDRIVER_BROWSER'] || 'firefox'}/spec-results.html",
                       "--format", "progress",
                       "--backtrace"]
-    spec.rcov = true
-    spec.rcov_opts = %w[--exclude spec,ruby-debug,/Library/Ruby,.gem --include lib/watir-webdriver]
+    spec.rcov       = true
+    spec.rcov_opts  = %w[--exclude spec,ruby-debug,/Library/Ruby,.gem --include lib/watir-webdriver]
   end
-
 end
 
 task :spec => :check_dependencies

data/VERSION

@@ -1 +1 @@
-0.1.1
+0.1.2

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

@@ -38,11 +38,13 @@ module Watir
 
 
 
+
+
 
 
 
  class HTMLElement < Element
-   attributes(:string => [:innerhtml, :outerhtml, :id, :title, :lang, :dir, :class_name, :item_type, :item_id, :item_value, :access_key, :access_key_label, :content_editable, :command_type, :label, :icon], :token_list => [:class_list, :item_ref, :item_prop], :string_map => [:dataset], :bool => [:item_scope, :hidden, :draggable, :is_content_editable, :spellcheck, :disabled, :checked], :properties_collection => [:properties], :int => [:tab_index], :html_element => [:context_menu], :style => [:style], :function => [:onabort, :onblur, :oncanplay, :oncanplaythrough, :onchange, :onclick, :oncontextmenu, :oncuechange, :ondblclick, :ondrag, :ondragend, :ondragenter, :ondragleave, :ondragover, :ondragstart, :ondrop, :ondurationchange, :onemptied, :onended, :onerror, :onfocus, :onformchange, :onforminput, :oninput, :oninvalid, :onkeydown, :onkeypress, :onkeyup, :onload, :onloadeddata, :onloadedmetadata, :onloadstart, :onmousedown, :onmousemove, :onmouseout, :onmouseover, :onmouseup, :onmousewheel, :onpause, :onplay, :onplaying, :onprogress, :onratechange, :onreadystatechange, :onreset, :onscroll, :onseeked, :onseeking, :onselect, :onshow, :onstalled, :onsubmit, :onsuspend, :ontimeupdate, :onvolumechange, :onwaiting])
+   attributes(:string => [:innerhtml, :outerhtml, :id, :title, :lang, :dir, :class_name, :item_type, :item_id, :item_value, :access_key, :access_key_label, :content_editable, :command_type, :label, :icon], :token_list => [:class_list, :item_ref, :item_prop, :dropzone], :string_map => [:dataset], :bool => [:item_scope, :hidden, :draggable, :is_content_editable, :spellcheck, :disabled, :checked], :properties_collection => [:properties], :int => [:tab_index], :html_element => [:context_menu], :style => [:style], :function => [:onabort, :onblur, :oncanplay, :oncanplaythrough, :onchange, :onclick, :oncontextmenu, :oncuechange, :ondblclick, :ondrag, :ondragend, :ondragenter, :ondragleave, :ondragover, :ondragstart, :ondrop, :ondurationchange, :onemptied, :onended, :onerror, :onfocus, :onformchange, :onforminput, :oninput, :oninvalid, :onkeydown, :onkeypress, :onkeyup, :onload, :onloadeddata, :onloadedmetadata, :onloadstart, :onmousedown, :onmousemove, :onmouseout, :onmouseover, :onmouseup, :onmousewheel, :onpause, :onplay, :onplaying, :onprogress, :onratechange, :onreadystatechange, :onreset, :onscroll, :onseeked, :onseeking, :onselect, :onshow, :onstalled, :onsubmit, :onsuspend, :ontimeupdate, :onvolumechange, :onwaiting])
  end
  class HTMLElementCollection < ElementCollection
    def element_class
@@ -174,7 +176,7 @@ module Watir
    end
  end
  class TextArea < HTMLElement
-   attributes(:bool => [:autofocus, :disabled, :read_only, :required, :will_validate], :int => [:cols, :max_length, :rows, :text_length, :selection_start, :selection_end], :html_element => [:form], :string => [:name, :placeholder, :wrap, :type, :default_value, :value, :validity, :validation_message], :list => [:labels])
+   attributes(:bool => [:autofocus, :disabled, :read_only, :required, :will_validate], :int => [:cols, :max_length, :rows, :text_length, :selection_start, :selection_end], :string => [:dir_name, :name, :placeholder, :wrap, :type, :default_value, :value, :validity, :validation_message], :html_element => [:form], :list => [:labels])
  end
  class TextAreaCollection < ElementCollection
    def element_class
@@ -222,7 +224,7 @@ module Watir
    end
  end
  class Input < HTMLElement
-   attributes(:string => [:accept, :alt, :autocomplete, :form_action, :form_enctype, :form_method, :form_target, :height, :max, :min, :name, :pattern, :placeholder, :src, :step, :type, :default_value, :value, :width, :validity, :validation_message], :bool => [:autofocus, :default_checked, :checked, :disabled, :form_no_validate, :indeterminate, :multiple, :read_only, :required, :will_validate], :html_element => [:form, :list, :selected_option], :list => [:files, :labels], :int => [:max_length, :size, :selection_start, :selection_end], :date => [:value_as_date], :float => [:value_as_number])
+   attributes(:string => [:accept, :alt, :autocomplete, :dir_name, :form_action, :form_enctype, :form_method, :form_target, :height, :max, :min, :name, :pattern, :placeholder, :src, :step, :type, :default_value, :value, :width, :validity, :validation_message], :bool => [:autofocus, :default_checked, :checked, :disabled, :form_no_validate, :indeterminate, :multiple, :read_only, :required, :will_validate], :html_element => [:form, :list, :selected_option], :list => [:files, :labels], :int => [:max_length, :size, :selection_start, :selection_end], :date => [:value_as_date], :float => [:value_as_number])
  end
  class InputCollection < ElementCollection
    def element_class
@@ -402,7 +404,7 @@ module Watir
    end
  end
  class Video < Media
-   attributes(:int => [:width, :height, :video_width, :video_height], :string => [:poster])
+   attributes(:int => [:width, :height, :video_width, :video_height], :string => [:poster], :token_list => [:audio])
  end
  class VideoCollection < ElementCollection
    def element_class
@@ -909,6 +911,23 @@ module Watir
    # @return [HTMLElement]
    #
 
+   def bdi(*args)
+     HTMLElement.new(self, extract_selector(args).merge(:tag_name => "bdi"))
+   end
+
+   #
+   # @return [HTMLElementCollection]
+   #
+
+   def bdis(*args)
+     HTMLElementCollection.new(self, extract_selector(args).merge(:tag_name => "bdi"))
+   end
+
+   Watir.tag_to_class[:bdi] = HTMLElement
+   #
+   # @return [HTMLElement]
+   #
+
    def bdo(*args)
      HTMLElement.new(self, extract_selector(args).merge(:tag_name => "bdo"))
    end

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

@@ -27,6 +27,12 @@ module Watir
       end
     end
 
+    #
+    # Get all the options in the select list
+    #
+    # @return [Watir::OptionCollection]
+    #
+
     def options
       assert_exists
       super

data/lib/watir-webdriver/html/spec_extractor.rb

@@ -12,6 +12,9 @@ module Watir
         extract_idl_parts
         extract_interface_map
         build_result
+      rescue
+        p errors
+        raise
       end
 
       def errors

data/spec/browser_spec.rb

@@ -1,6 +1,5 @@
 require File.expand_path('watirspec/spec_helper', File.dirname(__FILE__))
 
-
 describe Watir::Browser do
 
   describe ".new" do

data/spec/container_spec.rb

@@ -1,6 +1,5 @@
 require File.expand_path('watirspec/spec_helper', File.dirname(__FILE__))
 
-
 describe Watir::Container do
   before { @container = Object.new.extend(Watir::Container) }
 

data/spec/element_spec.rb

@@ -1,6 +1,5 @@
 require File.expand_path('watirspec/spec_helper', File.dirname(__FILE__))
 
-
 describe Watir::Element do
 
   describe "#send_keys" do

data/spec/implementation.rb

@@ -0,0 +1,17 @@
+require File.expand_path("../spec_helper", __FILE__)
+
+WatirSpec.implementation do |imp|
+  name    = :webdriver
+  browser = (ENV['WATIR_WEBDRIVER_BROWSER'] || :firefox).to_sym
+
+  imp.name          = name
+  imp.browser_class = Watir::Browser
+  imp.browser_args  = [browser]
+
+  imp.guard_proc = lambda { |args|
+    args.any? { |arg| arg == name || arg == [name, browser] }
+  }
+end
+
+
+

data/spec/spec_helper.rb

@@ -2,31 +2,13 @@
 $LOAD_PATH.unshift(File.dirname(__FILE__))
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 
-require 'rubygems'
 require 'watir-webdriver'
 require 'locator_spec_helper'
-require 'spec'
-require 'spec/autorun'
+require 'rubygems'
+require 'rspec'
 
 include Watir
 include Watir::Exception
 
 WEBDRIVER_SELECTORS = [:class, :class_name, :css, :id, :name, :tag_name, :xpath]
 
-if defined?(WatirSpec)
-  browser = (ENV['WATIR_WEBDRIVER_BROWSER'] || :firefox).to_sym
-
-  WatirSpec.implementation do |imp|
-    imp.name          = :webdriver
-    imp.browser_class = Watir::Browser
-    imp.browser_args  = [browser]
-
-    imp.guard_proc = lambda { |args|
-      args.any? { |arg| arg == :webdriver || arg == [:webdriver, browser] }
-    }
-  end
-
-  # WatirSpec.unguarded = true
-end
-
-

data/spec/watirspec/area_spec.rb

@@ -1,5 +1,5 @@
 # encoding: utf-8
-require File.expand_path('spec_helper', File.dirname(__FILE__))
+require File.expand_path("../spec_helper", __FILE__)
 
 describe "Area" do
 

data/spec/watirspec/areas_spec.rb

@@ -1,5 +1,5 @@
 # encoding: utf-8
-require File.expand_path('spec_helper', File.dirname(__FILE__))
+require File.expand_path("../spec_helper", __FILE__)
 
 describe "Areas" do
 

data/spec/watirspec/browser_spec.rb

@@ -1,5 +1,5 @@
 # encoding: utf-8
-require File.expand_path('spec_helper', File.dirname(__FILE__))
+require File.expand_path("../spec_helper", __FILE__)
 
 describe "Browser" do
 

data/spec/watirspec/button_spec.rb

@@ -1,5 +1,5 @@
 # encoding: utf-8
-require File.expand_path('spec_helper', File.dirname(__FILE__))
+require File.expand_path("../spec_helper", __FILE__)
 
 describe "Button" do
 

data/spec/watirspec/buttons_spec.rb

@@ -1,5 +1,5 @@
 # encoding: utf-8
-require File.expand_path('spec_helper', File.dirname(__FILE__))
+require File.expand_path("../spec_helper", __FILE__)
 
 describe "Buttons" do
 

data/spec/watirspec/checkbox_spec.rb

@@ -1,5 +1,5 @@
 # encoding: utf-8
-require File.expand_path('spec_helper', File.dirname(__FILE__))
+require File.expand_path("../spec_helper", __FILE__)
 
 describe "CheckBox" do
 

data/spec/watirspec/checkboxes_spec.rb

@@ -1,5 +1,5 @@
 # encoding: utf-8
-require File.expand_path('spec_helper', File.dirname(__FILE__))
+require File.expand_path("../spec_helper", __FILE__)
 
 describe "CheckBoxes" do
 

data/spec/watirspec/collections_spec.rb

@@ -1,5 +1,5 @@
 # encoding: utf-8
-require File.expand_path('spec_helper', File.dirname(__FILE__))
+require File.expand_path("../spec_helper", __FILE__)
 
 describe "Collections" do
 

data/spec/watirspec/dd_spec.rb

@@ -1,5 +1,5 @@
 # encoding: utf-8
-require File.expand_path('spec_helper', File.dirname(__FILE__))
+require File.expand_path("../spec_helper", __FILE__)
 
 describe "Dd" do
 

data/spec/watirspec/dds_spec.rb

@@ -1,5 +1,5 @@
 # encoding: utf-8
-require File.expand_path('spec_helper', File.dirname(__FILE__))
+require File.expand_path("../spec_helper", __FILE__)
 
 describe "Dds" do
 

data/spec/watirspec/del_spec.rb

@@ -1,5 +1,5 @@
 # encoding: utf-8
-require File.expand_path('spec_helper', File.dirname(__FILE__))
+require File.expand_path("../spec_helper", __FILE__)
 
 describe "Del" do
 

data/spec/watirspec/dels_spec.rb

@@ -1,5 +1,5 @@
 # encoding: utf-8
-require File.expand_path('spec_helper', File.dirname(__FILE__))
+require File.expand_path("../spec_helper", __FILE__)
 
 describe "Dels" do
 

data/spec/watirspec/div_spec.rb

@@ -1,5 +1,5 @@
 # encoding: utf-8
-require File.expand_path('spec_helper', File.dirname(__FILE__))
+require File.expand_path("../spec_helper", __FILE__)
 
 describe "Div" do
 

data/spec/watirspec/divs_spec.rb

@@ -1,5 +1,5 @@
 # encoding: utf-8
-require File.expand_path('spec_helper', File.dirname(__FILE__))
+require File.expand_path("../spec_helper", __FILE__)
 
 describe "Divs" do
 

data/spec/watirspec/dl_spec.rb

@@ -1,5 +1,5 @@
 # encoding: utf-8
-require File.expand_path('spec_helper', File.dirname(__FILE__))
+require File.expand_path("../spec_helper", __FILE__)
 
 describe "Dl" do
 

data/spec/watirspec/dls_spec.rb

@@ -1,5 +1,5 @@
 # encoding: utf-8
-require File.expand_path('spec_helper', File.dirname(__FILE__))
+require File.expand_path("../spec_helper", __FILE__)
 
 describe "Dls" do
 

data/spec/watirspec/dt_spec.rb

@@ -1,5 +1,5 @@
 # encoding: utf-8
-require File.expand_path('spec_helper', File.dirname(__FILE__))
+require File.expand_path("../spec_helper", __FILE__)
 
 describe "Dt" do
 

data/spec/watirspec/dts_spec.rb

@@ -1,5 +1,5 @@
 # encoding: utf-8
-require File.expand_path('spec_helper', File.dirname(__FILE__))
+require File.expand_path("../spec_helper", __FILE__)
 
 describe "Dts" do
 

data/spec/watirspec/element_spec.rb

@@ -1,5 +1,5 @@
 # encoding: utf-8
-require File.expand_path('spec_helper', File.dirname(__FILE__))
+require File.expand_path("../spec_helper", __FILE__)
 
 describe "Element" do
 
@@ -18,7 +18,7 @@ describe "Element" do
     end
 
     it "raises ArgumentError if given the wrong number of arguments" do
-      container = mock("container", :null_object => true)
+      container = mock("container").as_null_object
       lambda { Element.new(container, 1,2,3,4) }.should raise_error(ArgumentError)
       lambda { Element.new(container, "foo") }.should raise_error(ArgumentError)
     end

data/spec/watirspec/em_spec.rb

@@ -1,5 +1,5 @@
 # encoding: utf-8
-require File.expand_path('spec_helper', File.dirname(__FILE__))
+require File.expand_path("../spec_helper", __FILE__)
 
 describe "Em" do
 

data/spec/watirspec/ems_spec.rb

@@ -1,5 +1,5 @@
 # encoding: utf-8
-require File.expand_path('spec_helper', File.dirname(__FILE__))
+require File.expand_path("../spec_helper", __FILE__)
 
 describe "Ems" do
 

data/spec/watirspec/filefield_spec.rb

@@ -1,5 +1,5 @@
 # encoding: utf-8
-require File.expand_path('spec_helper', File.dirname(__FILE__))
+require File.expand_path("../spec_helper", __FILE__)
 
 describe "FileField" do
 

data/spec/watirspec/filefields_spec.rb

@@ -1,5 +1,5 @@
 # encoding: utf-8
-require File.expand_path('spec_helper', File.dirname(__FILE__))
+require File.expand_path("../spec_helper", __FILE__)
 
 describe "FileFields" do
 

data/spec/watirspec/font_spec.rb

@@ -1,5 +1,5 @@
 # encoding: utf-8
-require File.expand_path('spec_helper', File.dirname(__FILE__))
+require File.expand_path("../spec_helper", __FILE__)
 
 describe "Font" do
 

data/spec/watirspec/form_spec.rb

@@ -1,5 +1,5 @@
 # encoding: utf-8
-require File.expand_path('spec_helper', File.dirname(__FILE__))
+require File.expand_path("../spec_helper", __FILE__)
 
 describe "Form" do