watir-webdriver 0.0.6 → 0.0.7

data/spec/watirspec/lib/watirspec.rb

@@ -35,21 +35,26 @@ module WatirSpec
     end
 
     def implementation
-      @implementation ||= case Browser.name
-                          when "Watir::IE"
-                            :watir
-                          when "Watir::Firefox", "FireWatir::Firefox"
-                            :firewatir
-                          when "Celerity::Browser"
-                            :celerity
-                          else
-                            :unknown
-                          end
+      @implementation ||= (
+        imp = WatirSpec::Implementation.new
+        yield imp if block_given?
+
+        imp
+      )
+    end
+
+    def implementation=(imp)
+      unless imp.kind_of? WatirSpec::Implementation
+        raise TypeError, "expected WatirSpec::Implementation, got #{imp.class}"
+      end
+
+      @implementation = imp
     end
 
     def new_browser
-      args = WatirSpec.browser_args
-      args ? Browser.new(*args) : Browser.new
+      klass = WatirSpec.implementation.browser_class
+      args = WatirSpec.implementation.browser_args
+      args ? klass.new(*args) : klass.new
     end
 
     def ruby

data/spec/watirspec/link_spec.rb

@@ -1,5 +1,5 @@
 # encoding: utf-8
-require File.dirname(__FILE__) + '/spec_helper'
+require File.expand_path('spec_helper', File.dirname(__FILE__))
 
 describe "Link" do
 
@@ -22,11 +22,8 @@ describe "Link" do
       browser.link(:xpath, "//a[@id='link_2']").should exist
     end
 
-    not_compliant_on :webdriver do
-      # not a technical issue - just not sure if it's really the behaviour we want
-      it "strips spaces from URL attributes when locating elements" do
-        browser.link(:url, /strip_space$/).should exist
-      end
+    it "strips spaces from URL attributes when locating elements" do
+      browser.link(:url, /strip_space$/).should exist
     end
 
     it "returns false if the link doesn't exist" do
@@ -80,11 +77,9 @@ describe "Link" do
     end
   end
 
-  bug "WTR-366", :watir do
-    describe "#url" do
-      it "returns the href attribute" do
-        browser.link(:index, 1).url.should =~ /non_control_elements/
-      end
+  describe "#url" do
+    it "returns the href attribute" do
+      browser.link(:index, 1).url.should =~ /non_control_elements/
     end
   end
 

data/spec/watirspec/links_spec.rb

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

data/spec/watirspec/lis_spec.rb

@@ -1,5 +1,5 @@
 # encoding: utf-8
-require File.dirname(__FILE__) + '/spec_helper'
+require File.expand_path('spec_helper', File.dirname(__FILE__))
 
 describe "Lis" do
 
@@ -21,10 +21,16 @@ describe "Lis" do
 
   describe "#each" do
     it "iterates through lis correctly" do
+      count = 0
+
       browser.lis.each_with_index do |l, index|
         l.id.should == browser.li(:index, index).id
         l.value.should == browser.li(:index, index).value
+
+		count += 1
       end
+
+      count.should > 0
     end
   end
 

data/spec/watirspec/map_spec.rb

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

data/spec/watirspec/maps_spec.rb

@@ -1,5 +1,5 @@
 # encoding: utf-8
-require File.dirname(__FILE__) + '/spec_helper'
+require File.expand_path('spec_helper', File.dirname(__FILE__))
 
 describe "Maps" do
 
@@ -21,11 +21,17 @@ describe "Maps" do
 
   describe "#each" do
     it "iterates through maps correctly" do
+      count = 0
+
       browser.maps.each_with_index do |m, index|
         m.name.should == browser.map(:index, index).name
         m.id.should == browser.map(:index, index).id
         m.value.should == browser.map(:index, index).value
+
+		count += 1
       end
+
+      count.should > 0
     end
   end
 

data/spec/watirspec/meta_spec.rb

@@ -1,22 +1,20 @@
 # encoding: utf-8
-require File.dirname(__FILE__) + '/spec_helper'
+require File.expand_path('spec_helper', File.dirname(__FILE__))
 
-bug "WTR-334", :watir do
-  describe "Meta" do
-    before :each do
-      browser.goto(WatirSpec.files + "/forms_with_input_elements.html")
-    end
+describe "Meta" do
+  before :each do
+    browser.goto(WatirSpec.files + "/forms_with_input_elements.html")
+  end
 
-    describe "#exist?" do
-      it "returns true if the meta tag exists" do
-        browser.meta(:http_equiv, "Content-Type").should exist
-      end
+  describe "#exist?" do
+    it "returns true if the meta tag exists" do
+      browser.meta(:http_equiv, "Content-Type").should exist
     end
+  end
 
-    describe "content" do
-      it "returns the content attribute of the tag" do
-        browser.meta(:http_equiv, "Content-Type").content.should == "text/html; charset=utf-8"
-      end
+  describe "content" do
+    it "returns the content attribute of the tag" do
+      browser.meta(:http_equiv, "Content-Type").content.should == "text/html; charset=utf-8"
     end
   end
-end
+end

data/spec/watirspec/metas_spec.rb

@@ -1,5 +1,5 @@
 # encoding: utf-8
-require File.dirname(__FILE__) + '/spec_helper'
+require File.expand_path('spec_helper', File.dirname(__FILE__))
 
 describe "Metas" do
 
@@ -21,9 +21,14 @@ describe "Metas" do
 
   describe "#each" do
     it "iterates through meta elements correctly" do
+      count = 0
+
       browser.metas.each_with_index do |m, index|
         m.content.should == browser.meta(:index, index).content
+		count += 1
       end
+
+      count.should > 0
     end
   end
 

data/spec/watirspec/ol_spec.rb

@@ -1,78 +1,76 @@
 # encoding: utf-8
-require File.dirname(__FILE__) + '/spec_helper'
+require File.expand_path('spec_helper', File.dirname(__FILE__))
 
-bug "WTR-333", :watir do
-  describe "Ol" do
+describe "Ol" do
 
-    before :each do
-      browser.goto(WatirSpec.files + "/non_control_elements.html")
-    end
-
-    # Exists method
-    describe "#exist?" do
-      it "returns true if the 'ol' exists" do
-        browser.ol(:id, "favorite_compounds").should exist
-        browser.ol(:id, /favorite_compounds/).should exist
-        browser.ol(:index, 0).should exist
-        browser.ol(:xpath, "//ol[@id='favorite_compounds']").should exist
-      end
+  before :each do
+    browser.goto(WatirSpec.files + "/non_control_elements.html")
+  end
 
-      it "returns false if the 'ol' doesn't exist" do
-        browser.ol(:id, "no_such_id").should_not exist
-        browser.ol(:id, /no_such_id/).should_not exist
-        browser.ol(:text, "no_such_text").should_not exist
-        browser.ol(:text, /no_such_text/).should_not exist
-        browser.ol(:class, "no_such_class").should_not exist
-        browser.ol(:class, /no_such_class/).should_not exist
-        browser.ol(:index, 1337).should_not exist
-        browser.ol(:xpath, "//ol[@id='no_such_id']").should_not exist
-      end
+  # Exists method
+  describe "#exist?" do
+    it "returns true if the 'ol' exists" do
+      browser.ol(:id, "favorite_compounds").should exist
+      browser.ol(:id, /favorite_compounds/).should exist
+      browser.ol(:index, 0).should exist
+      browser.ol(:xpath, "//ol[@id='favorite_compounds']").should exist
+    end
 
-      it "raises TypeError when 'what' argument is invalid" do
-        lambda { browser.ol(:id, 3.14).exists? }.should raise_error(TypeError)
-      end
+    it "returns false if the 'ol' doesn't exist" do
+      browser.ol(:id, "no_such_id").should_not exist
+      browser.ol(:id, /no_such_id/).should_not exist
+      browser.ol(:text, "no_such_text").should_not exist
+      browser.ol(:text, /no_such_text/).should_not exist
+      browser.ol(:class, "no_such_class").should_not exist
+      browser.ol(:class, /no_such_class/).should_not exist
+      browser.ol(:index, 1337).should_not exist
+      browser.ol(:xpath, "//ol[@id='no_such_id']").should_not exist
+    end
 
-      it "raises MissingWayOfFindingObjectException when 'how' argument is invalid" do
-        lambda { browser.ol(:no_such_how, 'some_value').exists? }.should raise_error(MissingWayOfFindingObjectException)
-      end
+    it "raises TypeError when 'what' argument is invalid" do
+      lambda { browser.ol(:id, 3.14).exists? }.should raise_error(TypeError)
     end
 
-    # Attribute methods
-    describe "#class_name" do
-      it "returns the class attribute" do
-        browser.ol(:id, 'favorite_compounds').class_name.should == 'chemistry'
-      end
+    it "raises MissingWayOfFindingObjectException when 'how' argument is invalid" do
+      lambda { browser.ol(:no_such_how, 'some_value').exists? }.should raise_error(MissingWayOfFindingObjectException)
+    end
+  end
 
-      it "returns an empty string if the element exists and the attribute doesn't" do
-        browser.ol(:index, 1).class_name.should == ''
-      end
+  # Attribute methods
+  describe "#class_name" do
+    it "returns the class attribute" do
+      browser.ol(:id, 'favorite_compounds').class_name.should == 'chemistry'
+    end
 
-      it "raises UnknownObjectException if the ol doesn't exist" do
-        lambda { browser.ol(:id, 'no_such_id').class_name }.should raise_error(UnknownObjectException)
-      end
+    it "returns an empty string if the element exists and the attribute doesn't" do
+      browser.ol(:index, 1).class_name.should == ''
     end
 
-    describe "#id" do
-      it "returns the id attribute" do
-        browser.ol(:class, 'chemistry').id.should == "favorite_compounds"
-      end
+    it "raises UnknownObjectException if the ol doesn't exist" do
+      lambda { browser.ol(:id, 'no_such_id').class_name }.should raise_error(UnknownObjectException)
+    end
+  end
 
-      it "returns an empty string if the element exists and the attribute doesn't" do
-        browser.ol(:index, 1).id.should == ''
-      end
+  describe "#id" do
+    it "returns the id attribute" do
+      browser.ol(:class, 'chemistry').id.should == "favorite_compounds"
+    end
 
-      it "raises UnknownObjectException if the ol doesn't exist" do
-        lambda { browser.ol(:id, "no_such_id").id }.should raise_error(UnknownObjectException)
-        lambda { browser.ol(:index, 1337).id }.should raise_error(UnknownObjectException)
-      end
+    it "returns an empty string if the element exists and the attribute doesn't" do
+      browser.ol(:index, 1).id.should == ''
     end
 
-    describe "#respond_to?" do
-      it "returns true for all attribute methods" do
-        browser.ol(:index, 0).should respond_to(:class_name)
-        browser.ol(:index, 0).should respond_to(:id)
-      end
+    it "raises UnknownObjectException if the ol doesn't exist" do
+      lambda { browser.ol(:id, "no_such_id").id }.should raise_error(UnknownObjectException)
+      lambda { browser.ol(:index, 1337).id }.should raise_error(UnknownObjectException)
     end
+  end
 
+  describe "#respond_to?" do
+    it "returns true for all attribute methods" do
+      browser.ol(:index, 0).should respond_to(:class_name)
+      browser.ol(:index, 0).should respond_to(:id)
+    end
   end
-end
+
+end

data/spec/watirspec/ols_spec.rb

@@ -1,5 +1,5 @@
 # encoding: utf-8
-require File.dirname(__FILE__) + '/spec_helper'
+require File.expand_path('spec_helper', File.dirname(__FILE__))
 
 describe "Ols" do
 
@@ -21,10 +21,16 @@ describe "Ols" do
 
   describe "#each" do
     it "iterates through ols correctly" do
-      browser.ols.each_with_index do |ol, index|
-        ol.id.should == browser.ol(:index, index).id
-        ol.value.should == browser.ol(:index, index).value
+      count = 0
+
+      browser.ols.each_with_index do |ul, index|
+        ul.id.should == browser.ol(:index, index).id
+        ul.value.should == browser.ol(:index, index).value
+
+        count += 1
       end
+
+      count.should > 0
     end
   end
 

data/spec/watirspec/option_spec.rb

@@ -1,5 +1,5 @@
 # encoding: utf-8
-require File.dirname(__FILE__) + '/spec_helper'
+require File.expand_path('spec_helper', File.dirname(__FILE__))
 
 describe "Option" do
 
@@ -8,28 +8,21 @@ describe "Option" do
   end
 
   describe "#exists?" do
-    bug "WTR-367", :watir do
-      it "returns true if the element exists (page context)" do
-        bug "WTR-330", :watir do
-          browser.option(:id, "nor").should exist
-          browser.option(:id, /nor/).should exist
-        end
-        browser.option(:value, "2").should exist
-        browser.option(:value, /2/).should exist
-        browser.option(:text, "Norway").should exist
-        browser.option(:text, /Norway/).should exist
-        browser.option(:class, "scandinavia").should exist
-        browser.option(:index, 1).should exist
-        browser.option(:xpath, "//option[@id='nor']").should exist
-      end
+    it "returns true if the element exists (page context)" do
+      browser.option(:id, "nor").should exist
+      browser.option(:id, /nor/).should exist
+      browser.option(:value, "2").should exist
+      browser.option(:value, /2/).should exist
+      browser.option(:text, "Norway").should exist
+      browser.option(:text, /Norway/).should exist
+      browser.option(:class, "scandinavia").should exist
+      browser.option(:index, 1).should exist
+      browser.option(:xpath, "//option[@id='nor']").should exist
     end
 
     it "returns true if the element exists (select_list context)" do
-      bug "WTR-330", :watir do
-        browser.select_list(:name, "new_user_country").option(:id, "nor").should exist
-        browser.select_list(:name, "new_user_country").option(:id, /nor/).should exist
-      end
-
+      browser.select_list(:name, "new_user_country").option(:id, "nor").should exist
+      browser.select_list(:name, "new_user_country").option(:id, /nor/).should exist
       browser.select_list(:name, "new_user_country").option(:value, "2").should exist
       browser.select_list(:name, "new_user_country").option(:value, /2/).should exist
       browser.select_list(:name, "new_user_country").option(:text, "Norway").should exist
@@ -41,28 +34,21 @@ describe "Option" do
       browser.select_list(:name, "new_user_country").option(:label, "Germany").should exist
     end
 
-    bug "WTR-367", :watir do
-      it "returns false if the element does not exist (page context)" do
-        bug "WTR-330", :watir do
-          browser.option(:id, "no_such_id").should_not exist
-          browser.option(:id, /no_such_id/).should_not exist
-        end
-        browser.option(:value, "no_such_value").should_not exist
-        browser.option(:value, /no_such_value/).should_not exist
-        browser.option(:text, "no_such_text").should_not exist
-        browser.option(:text, /no_such_text/).should_not exist
-        browser.option(:class, "no_such_class").should_not exist
-        browser.option(:index, 1337).should_not exist
-        browser.option(:xpath, "//option[@id='no_such_id']").should_not exist
-      end
+    it "returns false if the element does not exist (page context)" do
+      browser.option(:id, "no_such_id").should_not exist
+      browser.option(:id, /no_such_id/).should_not exist
+      browser.option(:value, "no_such_value").should_not exist
+      browser.option(:value, /no_such_value/).should_not exist
+      browser.option(:text, "no_such_text").should_not exist
+      browser.option(:text, /no_such_text/).should_not exist
+      browser.option(:class, "no_such_class").should_not exist
+      browser.option(:index, 1337).should_not exist
+      browser.option(:xpath, "//option[@id='no_such_id']").should_not exist
     end
 
     it "returns false if the element does not exist (select_list context)" do
-      bug "WTR-330", :watir do
-        browser.select_list(:name, "new_user_country").option(:id, "no_such_id").should_not exist
-        browser.select_list(:name, "new_user_country").option(:id, /no_such_id/).should_not exist
-      end
-
+      browser.select_list(:name, "new_user_country").option(:id, "no_such_id").should_not exist
+      browser.select_list(:name, "new_user_country").option(:id, /no_such_id/).should_not exist
       browser.select_list(:name, "new_user_country").option(:value, "no_such_value").should_not exist
       browser.select_list(:name, "new_user_country").option(:value, /no_such_value/).should_not exist
       browser.select_list(:name, "new_user_country").option(:text, "no_such_text").should_not exist
@@ -73,27 +59,20 @@ describe "Option" do
     end
 
     it "raises TypeError when 'what' argument is invalid" do
-      bug "WTR-367", :watir do
-        lambda { browser.option(:id, 3.14).exists? }.should raise_error(TypeError)
-      end
-
+      lambda { browser.option(:id, 3.14).exists? }.should raise_error(TypeError)
       lambda { browser.select_list(:name, "new_user_country").option(:id, 3.14).exists? }.should raise_error(TypeError)
     end
 
     it "raises MissingWayOfFindingObjectException when 'how' argument is invalid" do
-      bug "WTR-367", :watir do
-        lambda { browser.option(:no_such_how, 'some_value').exists? }.should raise_error(MissingWayOfFindingObjectException)
-      end
+      lambda { browser.option(:no_such_how, 'some_value').exists? }.should raise_error(MissingWayOfFindingObjectException)
       lambda { browser.select_list(:name, "new_user_country").option(:no_such_how, 'some_value').exists? }.should raise_error(MissingWayOfFindingObjectException)
     end
   end
 
   describe "#select" do
-    bug "WTR-367", :watir do
-      it "selects the chosen option (page context)" do
-        browser.option(:text, "Denmark").select
-        browser.select_list(:name, "new_user_country").selected_options.should == ["Denmark"]
-      end
+    it "selects the chosen option (page context)" do
+      browser.option(:text, "Denmark").select
+      browser.select_list(:name, "new_user_country").selected_options.should == ["Denmark"]
     end
 
     it "selects the chosen option (select_list context)" do
@@ -101,22 +80,18 @@ describe "Option" do
       browser.select_list(:name, "new_user_country").selected_options.should == ["Denmark"]
     end
 
-    bug "WTR-367, WTR-329", :watir do
-      it "selects the option when found by text (page context)" do
-        browser.option(:text, 'Sweden').select
-        browser.option(:text, 'Sweden').should be_selected
-      end
+    it "selects the option when found by text (page context)" do
+      browser.option(:text, 'Sweden').select
+      browser.option(:text, 'Sweden').should be_selected
+    end
 
-      it "selects the option when found by text (select_list context)" do
-        browser.select_list(:name, 'new_user_country').option(:text, 'Sweden').select
-        browser.select_list(:name, 'new_user_country').option(:text, 'Sweden').should be_selected
-      end
+    it "selects the option when found by text (select_list context)" do
+      browser.select_list(:name, 'new_user_country').option(:text, 'Sweden').select
+      browser.select_list(:name, 'new_user_country').option(:text, 'Sweden').should be_selected
     end
 
     it "fires the onclick event (page context)" do
-      bug "WTR-367, WTR-335", :watir do
-        browser.option(:text, "Username 3").select
-      end
+      browser.option(:text, "Username 3").select
       browser.text_field(:id, 'delete_user_comment').value.should == 'Don\'t do it!'
     end
 
@@ -125,11 +100,9 @@ describe "Option" do
       browser.text_field(:id, 'delete_user_comment').value.should == 'Don\'t do it!'
     end
 
-    bug "WTR-367", :watir do
-      it "raises UnknownObjectException if the option does not exist (page context)" do
-        lambda { browser.option(:text, "no_such_text").select }.should raise_error(UnknownObjectException)
-        lambda { browser.option(:text, /missing/).select }.should raise_error(UnknownObjectException)
-      end
+    it "raises UnknownObjectException if the option does not exist (page context)" do
+      lambda { browser.option(:text, "no_such_text").select }.should raise_error(UnknownObjectException)
+      lambda { browser.option(:text, /missing/).select }.should raise_error(UnknownObjectException)
     end
 
     it "raises UnknownObjectException if the option does not exist (select_list context)" do
@@ -137,10 +110,8 @@ describe "Option" do
       lambda { browser.select_list(:name, "new_user_country").option(:text, /missing/).select }.should raise_error(UnknownObjectException)
     end
 
-    bug "WTR-367", :watir do
-      it "raises MissingWayOfFindingObjectException when given a bad 'how' (page context)" do
-        lambda { browser.option(:missing, "Denmark").select }.should raise_error(MissingWayOfFindingObjectException)
-      end
+    it "raises MissingWayOfFindingObjectException when given a bad 'how' (page context)" do
+      lambda { browser.option(:missing, "Denmark").select }.should raise_error(MissingWayOfFindingObjectException)
     end
 
     it "raises MissingWayOfFindingObjectException when given a bad 'how' (select_list context)" do
@@ -148,17 +119,13 @@ describe "Option" do
     end
   end
 
-  bug "WTR-331", :watir do
-    describe "#class_name" do
-      bug "WTR-367", :watir do
-        it "is able to get attributes (page context)" do
-          browser.option(:text, 'Sweden').class_name.should == "scandinavia"
-        end
-      end
-
-      it "is able to get attributes (select_list context)" do
-        browser.select_list(:name, "new_user_country").option(:text , 'Sweden').class_name.should == "scandinavia"
-      end
+  describe "#class_name" do
+    it "is able to get attributes (page context)" do
+      browser.option(:text, 'Sweden').class_name.should == "scandinavia"
+    end
+
+    it "is able to get attributes (select_list context)" do
+      browser.select_list(:name, "new_user_country").option(:text , 'Sweden').class_name.should == "scandinavia"
     end
   end