commonwatir 3.0.0.rc2 → 3.0.0.rc3

data/CHANGES

@@ -1,3 +1,22 @@
+== 3.0.0.rc3 - 2012/03/18
+
+* all html elements are now supported (even html5 ones)
+* CookieManager removed
+* cookies API support added (https://github.com/watir/watirspec/blob/master/cookies_spec.rb)
+* drag and drop API support added (https://github.com/watir/watirspec/blob/master/drag_and_drop_spec.rb)
+* Element#(before|after)? removed
+* Element#(before|after)_text removed
+* Browser#cell(s) and Browser#row(s) removed
+* Browser#Element camelCase methods removed, use under_score methods instead
+* Browser#element(s) supports only general attributes like :id, :title, :class_name, :text, :html and such
+* Browser#modal_dialog improved
+* Browser#send_keys and Element#send_keys have now same syntax as specified in WatirSpec
+* Element#style returns internal styles only for IE9, inline style will be returned for IE8
+* Table#each removed - use Table#(trs|rows).each instead
+* Table#row(s) and Table#cell(s) added which ignore inner tables - use #td/#tr for all.
+* raise an Exception if more locators are specified with :xpath/:css
+* searching by :xpath and :css code rewritten
+
 == 3.0.0.rc2 - 2012/02/04
 
 * Browser#textarea(s) method for searching <textarea> elements

data/VERSION

@@ -1 +1 @@
-3.0.0.rc2
+3.0.0.rc3

data/lib/watir/exceptions.rb

@@ -43,10 +43,8 @@ module Watir
     end
 
     # Return an error message for when unable to locate the element
-    def self.message_for_unable_to_locate(how, what)
-      result = "using #{how.inspect}"
-      result << ", #{what.inspect}" if what
-      "Unable to locate element, #{result}"
+    def self.message_for_unable_to_locate(specifiers)
+      "Unable to locate element, using #{specifiers.inspect}"
     end    
   end
-end
+end

data/lib/watir/waiter.rb

@@ -20,7 +20,7 @@ class TimeKeeper
     @sleep_time += Kernel.sleep seconds    
   end
   def now
-    Time.now
+    ::Time.now
   end
 end
 
@@ -95,4 +95,4 @@ class Waiter
   end
 end  
     
-end # module
+end # module

data/unittests/buttons_test.rb

@@ -13,7 +13,7 @@ class TC_Button < Test::Unit::TestCase
   def test_exceptions_on_methods
     assert_raises(UnknownObjectException) { browser.button(:name, "noName").id }  
     assert_raises(UnknownObjectException) { browser.button(:name, "noName").name }  
-    assert_raises(UnknownObjectException) { browser.button(:name, "noName").disabled }  
+    assert_raises(UnknownObjectException) { browser.button(:name, "noName").disabled? }  
     assert_raises(UnknownObjectException) { browser.button(:name, "noName").type }  
     assert_raises(UnknownObjectException) { browser.button(:name, "noName").value }  
   end
@@ -37,7 +37,7 @@ class TC_Button < Test::Unit::TestCase
     assert_equal("b2", browser.button(:index, 1).id) 
     assert_equal("button", browser.button(:index, 1).type) 
     assert_equal("Click Me", browser.button(:index, 1).value) 
-    assert_equal(false, browser.button(:index, 1).disabled) 
+    assert_equal(false, browser.button(:index, 1).disabled?) 
     assert_equal("italic_button", browser.button(:name, "b1").class_name) 
     assert_equal("", browser.button(:name , "b4").class_name) 
     
@@ -49,7 +49,7 @@ class TC_Button < Test::Unit::TestCase
     assert_equal("b5", browser.button(:index, 2).id) 
     assert_equal("button", browser.button(:index, 2).type) 
     assert_equal("Disabled Button", browser.button(:index, 2).value) 
-    assert_equal(true, browser.button(:index, 2).disabled) 
+    assert_equal(true, browser.button(:index, 2).disabled?) 
     
     assert_equal("", browser.button(:index, 2).title)
     assert_equal("this is button1", browser.button(:index, 1).title)
@@ -61,7 +61,7 @@ class TC_Button < Test::Unit::TestCase
     assert_equal("b2", browser.button(:index, 0).id) 
     assert_equal("button", browser.button(:index, 0).type) 
     assert_equal("Click Me", browser.button(:index, 0).value) 
-    assert_equal(false, browser.button(:index, 0).disabled) 
+    assert_equal(false, browser.button(:index, 0).disabled?) 
     assert_equal("italic_button", browser.button(:name, "b1").class_name) 
     assert_equal("", browser.button(:name , "b4").class_name) 
     
@@ -73,7 +73,7 @@ class TC_Button < Test::Unit::TestCase
     assert_equal("b5", browser.button(:index, 1).id) 
     assert_equal("button", browser.button(:index, 1).type) 
     assert_equal("Disabled Button", browser.button(:index, 1).value) 
-    assert_equal(true, browser.button(:index, 1).disabled) 
+    assert_equal(true, browser.button(:index, 1).disabled?) 
     
     assert_equal("", browser.button(:index, 1).title)
     assert_equal("this is button1", browser.button(:index, 0).title)
@@ -131,7 +131,7 @@ class TC_Button2 < Test::Unit::TestCase
     assert_equal("b6", browser.button(:id, "b7").name) 
     assert_equal("b7", browser.button(:name, "b6").id) 
     assert_equal("Click Me2", browser.button(:id, "b7").value) 
-    assert_equal(false, browser.button(:id, "b7").disabled) 
+    assert_equal(false, browser.button(:id, "b7").disabled?) 
     assert_equal("italic_button", browser.button(:name, "b6").class_name  ) 
     
     assert_equal("b8", browser.button(:id, "b9").name) 
@@ -191,7 +191,7 @@ class TC_Button2 < Test::Unit::TestCase
     assert_equal("b1", arr_buttons[1].name) 
     assert_equal("button", arr_buttons[1].type) 
     assert_equal("Click Me", arr_buttons[1].value) 
-    assert_equal(false, arr_buttons[1].disabled) 
+    assert_equal(false, arr_buttons[1].disabled?) 
     assert_equal("italic_button", arr_buttons[1].class_name) 
     assert_equal( "this is button1", arr_buttons[1].title)
     
@@ -199,7 +199,7 @@ class TC_Button2 < Test::Unit::TestCase
     assert_equal("b4", arr_buttons[2].name) 
     assert_equal("button", arr_buttons[2].type) 
     assert_equal("Disabled Button", arr_buttons[2].value) 
-    assert_equal(true, arr_buttons[2].disabled) 
+    assert_equal(true, arr_buttons[2].disabled?) 
     assert_equal( "", arr_buttons[2].title)
     assert_equal("", arr_buttons[2].class_name) 
     
@@ -221,7 +221,7 @@ class TC_Button2 < Test::Unit::TestCase
     assert_equal("b1", arr_buttons[0].name) 
     assert_equal("button", arr_buttons[0].type) 
     assert_equal("Click Me", arr_buttons[0].value) 
-    assert_equal(false, arr_buttons[0].disabled) 
+    assert_equal(false, arr_buttons[0].disabled?) 
     assert_equal("italic_button", arr_buttons[0].class_name) 
     assert_equal( "this is button1", arr_buttons[0].title)
     
@@ -229,7 +229,7 @@ class TC_Button2 < Test::Unit::TestCase
     assert_equal("b4", arr_buttons[1].name) 
     assert_equal("button", arr_buttons[1].type) 
     assert_equal("Disabled Button", arr_buttons[1].value) 
-    assert_equal(true, arr_buttons[1].disabled) 
+    assert_equal(true, arr_buttons[1].disabled?) 
     assert_equal( "", arr_buttons[1].title)
     assert_equal("", arr_buttons[1].class_name) 
     
@@ -266,7 +266,7 @@ class TC_Button2 < Test::Unit::TestCase
       browser.button(:value => 'Click Me', :index => 2).name
     end
     # can't assume hash ordering
-    assert_match(/Unable to locate element, using \{(:index=>2, :value=>"Click Me"|:value=>"Click Me", :index=>2)\}/, exception.message)
+    assert_match(/Unable to locate element, using \{.*(:index=>2, :value=>"Click Me"|:value=>"Click Me", :index=>2).*\}/, exception.message)
   end
 end
 

data/unittests/select_list_test.rb

@@ -11,7 +11,7 @@ class TC_SelectLists < Test::Unit::TestCase
   def test_select_by_numeric
     # make sure we still find the right option if passed a number
     browser.select_list(:id, 'year').select(2011)
-    assert_equal(['2011'], browser.select_list(:id, 'year').selected_options)
+    assert_equal(['2011'], browser.select_list(:id, 'year').selected_options.map(&:text))
   end
 
 end

metadata

@@ -1,47 +1,34 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: commonwatir
-version: !ruby/object:Gem::Version 
-  hash: 15424113
+version: !ruby/object:Gem::Version
+  version: 3.0.0.rc3
   prerelease: 6
-  segments: 
-  - 3
-  - 0
-  - 0
-  - rc
-  - 2
-  version: 3.0.0.rc2
 platform: ruby
-authors: 
+authors:
 - Bret Pettichord
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2012-02-04 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2012-03-18 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: user-choices
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &2381184 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id001
+  prerelease: false
+  version_requirements: *2381184
 description: Common library for Watir and FireWatir.
 email: bret@pettichord.com
 executables: []
-
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - README.rdoc
-files: 
+files:
 - lib/watir/assertions.rb
 - lib/watir/browser.rb
 - lib/watir/browsers.rb
@@ -88,7 +75,6 @@ files:
 - unittests/html/wait.html
 - unittests/html/watir_unit_tests.css
 - unittests/html/whitespace.html
-- unittests/inspect_test.rb
 - unittests/options.yml.example
 - unittests/select_list_test.rb
 - unittests/setup/browser.rb
@@ -106,41 +92,31 @@ files:
 - unittests/whitespace_test.rb
 homepage: http://www.watir.com
 licenses: []
-
 post_install_message: 
-rdoc_options: 
+rdoc_options:
 - --main
 - README.rdoc
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">"
-    - !ruby/object:Gem::Version 
-      hash: 25
-      segments: 
-      - 1
-      - 3
-      - 1
+  requirements:
+  - - ! '>'
+    - !ruby/object:Gem::Version
       version: 1.3.1
 requirements: []
-
 rubyforge_project: wtr
-rubygems_version: 1.8.4
+rubygems_version: 1.8.12
 signing_key: 
 specification_version: 3
 summary: Common library for Watir and FireWatir
-test_files: 
+test_files:
 - unittests/attach_to_existing_window_test.rb
 - unittests/browser_test.rb
 - unittests/buttons_test.rb
@@ -168,7 +144,6 @@ test_files:
 - unittests/html/wait.html
 - unittests/html/watir_unit_tests.css
 - unittests/html/whitespace.html
-- unittests/inspect_test.rb
 - unittests/options.yml.example
 - unittests/select_list_test.rb
 - unittests/setup/browser.rb

data/unittests/inspect_test.rb

@@ -1,29 +0,0 @@
-$LOAD_PATH.unshift File.join(File.dirname(__FILE__), '..') unless $SETUP_LOADED
-require 'unittests/setup'
-
-class TC_Inspect < Test::Unit::TestCase
-  location __FILE__
-
-  def setup
-    uses_page "emphasis.html"
-  end
-
-  def test_inspect_only_returns_url_and_title
-    assert_match(%r{#<#{browser.class}:0x[0-9a-f.]+ url="file://.+/emphasis\.html" title="emphasis">}, browser.inspect)
-  end
-
-  def test_element_inspect
-    assert_match(%r{^#<.+::Em:0x[0-9a-f.]+ located=false how=:id what=/em-one/>$}, browser.em(:id, /em-one/).inspect)
-
-    located = browser.em(:id, "em-one")
-    located.exists?
-
-    assert_match(%r{^#<.+::Em:0x[0-9a-f.]+ located=true how=:id what="em-one">$}, located.inspect)
-  end
-
-  def test_element_collections_inspect
-    assert_match(%r{#<.+::Ems:0x[0-9a-f.]+ length=3 container=.+>$}, browser.ems.inspect)
-  end
-
-end
-