selenium-webdriver-viewers 0.0.1 → 0.0.2

data/VERSION

@@ -1 +1 @@
-0.0.1
+0.0.2

data/lib/browser-instance.rb

@@ -1,5 +1,4 @@
 require 'selenium-webdriver'
-require 'selenium/webdriver/navigation'
 
 module BrowserInstance
 

data/lib/element_value_reader.rb

@@ -40,8 +40,7 @@ module WebViewer
 
     def element_as_viewer(*arguments)
       viewer = @output_type.new
-      base_element_proc = lambda { @element_reader.get(*arguments) }
-      viewer.instance_variable_set(:@base_element_proc, base_element_proc)
+      viewer.base_element = lambda { @element_reader.get(*arguments) }
       viewer
     end
 

data/lib/viewer.rb

@@ -15,7 +15,8 @@ module WebViewer
                                 :enabled?, :find_element, :find_elements, :first, :hover, :location, :ref, :select, :selected?, 
                                 :send_key, :send_keys, :size, :style, :submit, :tag_name, :text, :toggle, :value, 
                                 :element_present?, :wait_for_element_present
-            
+
+  attr_writer :base_element          
 
   def self.included(target)
     super
@@ -23,8 +24,8 @@ module WebViewer
   end
   
   def base_element
-    return @base_element_proc.call if @base_element_proc
-    browser.find_element(:tag_name, 'html')
+    return @base_element.call if @base_element.respond_to?(:call)
+    return @base_element || browser.find_element(:tag_name, 'html')
   end
 
   def showing?

data/selenium-webdriver-viewers.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{selenium-webdriver-viewers}
-  s.version = "0.0.1"
+  s.version = "0.0.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Michael Collas"]
-  s.date = %q{2010-12-16}
+  s.date = %q{2010-12-20}
   s.description = %q{      This gem makes it easy to create page and web viewer objects for use by tests that use selenium-webdriver. By
       using page and viewer objects, you can decouple your tests from the html details so that they can focus
       instead on describing the behaviour of your application. 

data/spec/element_value_reader_spec.rb

@@ -46,27 +46,27 @@ describe WebViewer::ElementValueReader do
 
     end
 
-    describe ('and the type is :auto', :output_type => :auto) { it_should_behave_like UnimplementedOutputType }
-    describe ('and the type is :link', :output_type => :link) { it_should_behave_like UnimplementedOutputType }
-    describe ('and the type is :select_by_text', :output_type => :select_by_text) { it_should_behave_like UnimplementedOutputType }
-    describe ('and the type is :select_by_value', :output_type => :select_by_value) { it_should_behave_like UnimplementedOutputType }
+    describe('and the type is :auto', :output_type => :auto) { it_should_behave_like UnimplementedOutputType }
+    describe('and the type is :link', :output_type => :link) { it_should_behave_like UnimplementedOutputType }
+    describe('and the type is :select_by_text', :output_type => :select_by_text) { it_should_behave_like UnimplementedOutputType }
+    describe('and the type is :select_by_value', :output_type => :select_by_value) { it_should_behave_like UnimplementedOutputType }
 
     describe 'and the output type is a class' do
 
-      class FakeViewer
-        attr :base_element_proc
-      end
-
       before do
-        @value_reader = WebViewer::ElementValueReader.new(@element_reader, FakeViewer)
+        output_viewer_class = Class.new(Object)
+        @output_viewer = stub('a different viewer', :base_element= => nil)
+        output_viewer_class.stub(:new).and_return(@output_viewer)
+        @value_reader = WebViewer::ElementValueReader.new(@element_reader, output_viewer_class)
       end
 
       it 'should return an instance of the specified class' do
-        @value_reader.get.should be_instance_of(FakeViewer)
+        @value_reader.get.should == @output_viewer
       end
 
-      it 'should put a base_element_proc instance value into the returned object' do
-        @value_reader.get.base_element_proc.should_not be_nil
+      it 'should put a base_element proc into the returned object' do
+        @output_viewer.should_receive(:base_element=).with(a_kind_of(Proc))
+        @value_reader.get
       end
 
     end
@@ -134,24 +134,28 @@ describe WebViewer::ElementValueReader do
 
     end
 
-    describe ('and the type is :auto', :output_type => :auto) { it_should_behave_like UnimplementedOutputType }
-    describe ('and the type is :link', :output_type => :link) { it_should_behave_like UnimplementedOutputType }
-    describe ('and the type is :select_by_text', :output_type => :select_by_text) { it_should_behave_like UnimplementedOutputType }
-    describe ('and the type is :select_by_value', :output_type => :select_by_value) { it_should_behave_like UnimplementedOutputType }
+    describe('and the type is :auto', :output_type => :auto) { it_should_behave_like UnimplementedOutputType }
+    describe('and the type is :link', :output_type => :link) { it_should_behave_like UnimplementedOutputType }
+    describe('and the type is :select_by_text', :output_type => :select_by_text) { it_should_behave_like UnimplementedOutputType }
+    describe('and the type is :select_by_value', :output_type => :select_by_value) { it_should_behave_like UnimplementedOutputType }
 
     describe 'and the output type is a class' do
 
       before do
-        @value_reader = WebViewer::ElementValueReader.new(@element_reader, FakeViewer)
+        output_viewer_class = Class.new(Object)
+        @output_viewer = stub('a different viewer', :base_element= => nil)
+        output_viewer_class.stub(:new).and_return(@output_viewer)
+        @value_reader = WebViewer::ElementValueReader.new(@element_reader, output_viewer_class)
       end
 
       it 'should return an instance of the specified class' do
-        @value_reader[1, 2].should be_instance_of(FakeViewer)
+        @value_reader[1, 2].should == @output_viewer
       end
 
-      it 'should put a base_element_proc instance value that gets the element from the reader into the returned object' do
+      it 'should put a base_element proc that gets the element from the reader into the returned object' do
+        @output_viewer.stub(:base_element=) { |assigned_base_element_proc| assigned_base_element_proc.call }
         @element_reader.should_receive(:get).with(1, 2)
-        @value_reader[1, 2].base_element_proc.call
+        @value_reader[1, 2]
       end
 
     end

data/spec/viewer_spec.rb

@@ -4,6 +4,20 @@ describe WebViewer, 'included in a class' do
 
   before do
     @viewer_class = Class.new(Object).extend(WebViewer)
+    @viewer = @viewer_class.new
+    @fake_browser = stub
+    @viewer.stub(:browser).and_return(@fake_browser)
+  end
+
+  describe '#base_element' do
+
+    it 'should return the base element if one has been assigned' do
+      pending
+      fake_element = stub('fake element')
+      @viewer.base_element = fake_element
+      @viewer.base_element.should == fake_element
+    end
+
   end
 
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: selenium-webdriver-viewers
 version: !ruby/object:Gem::Version 
-  hash: 29
+  hash: 27
   prerelease: false
   segments: 
   - 0
   - 0
-  - 1
-  version: 0.0.1
+  - 2
+  version: 0.0.2
 platform: ruby
 authors: 
 - Michael Collas
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-12-16 00:00:00 +11:00
+date: 2010-12-20 00:00:00 +11:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency