watirsplash 2.3.0 → 2.3.1

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    watirsplash (2.2.0)
+    watirsplash (2.3.1)
       bundler (~> 1.0)
       rake (= 0.8.7)
       require_all
@@ -14,13 +14,13 @@ GEM
     builder (3.0.0)
     childprocess (0.2.2)
       ffi (~> 1.0.6)
-    commonwatir (2.0.1)
+    commonwatir (2.0.2)
       user-choices
     diff-lcs (1.1.2)
     ffi (1.0.9-x86-mingw32)
     firewatir (1.9.4)
       commonwatir (>= 1.9.2)
-    hoe (2.12.0)
+    hoe (2.12.3)
       rake (~> 0.8)
     json_pure (1.5.4)
       spruz (~> 0.2.8)
@@ -56,8 +56,8 @@ GEM
       builder (>= 2.1.2)
       s4t-utils (>= 1.0.3)
       xml-simple (>= 1.0.11)
-    watir (2.0.1)
-      commonwatir (= 2.0.1)
+    watir (2.0.2)
+      commonwatir (= 2.0.2)
       ffi (~> 1.0)
       nokogiri
       rautomation (~> 0.6.3)
@@ -86,7 +86,7 @@ DEPENDENCIES
   firewatir (>= 1.9.4)
   rspec (~> 2.6.0)
   spork (~> 0.9.0.rc9)
-  watir (= 2.0.1)
+  watir (= 2.0.2)
   watir-webdriver (~> 0.3.3)
   watirsplash!
   win32screenshot (~> 1.0.5)

data/lib/watirsplash/page/base.rb

@@ -14,11 +14,10 @@ module WatirSplash
 
       def initialize(browser=nil)
         if browser
-          @browser = WatirSplash::Browser.current = browser 
+          @browser = browser 
         else
-          @browser = (WatirSplash::Browser.current &&
-                      WatirSplash::Browser.current.exists?) ||
-                      WatirSplash::Browser.new
+          reuse_current = WatirSplash::Browser.current && WatirSplash::Browser.current.exists?
+          @browser = reuse_current ? WatirSplash::Browser.current : (WatirSplash::Browser.current = WatirSplash::Browser.new)
           @browser.goto @@url
         end
       end

data/lib/watirsplash/version.rb

@@ -1,9 +1,9 @@
 module WatirSplash
   module Version
-    WATIRSPLASH = "2.3.0"
+    WATIRSPLASH = "2.3.1"
 
     # possible runtime dependencies
-    WATIR = "2.0.1"
+    WATIR = "2.0.2"
     WIN32SCREENSHOT = "~>1.0.5"
     WATIR_WEBDRIVER = "~>0.3.3"
   end

data/spec/page_spec.rb

@@ -36,6 +36,28 @@ describe WatirSplash::Page::Base do
       page_browser.should == browser
       page_browser.url.should =~ %r{google.com}
     end
+
+    it "reuses the current browser" do
+      browser = WatirSplash::Browser.new
+      
+      page = DummyPage.new
+      page.instance_variable_get(:@browser).should == browser
+
+      WatirSplash::Browser.current.should == browser      
+    end
+
+    it "opens up a new browser if current browser has been closed" do
+      browser = WatirSplash::Browser.new
+      browser.close
+      browser.should_not exist
+
+      page = DummyPage.new
+      page_browser = page.instance_variable_get(:@browser)
+      page_browser.should exist
+      page_browser.should_not == browser
+
+      WatirSplash::Browser.current.should == page_browser
+    end
   end
 
   context "#modify" do

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: watirsplash
 version: !ruby/object:Gem::Version 
-  hash: 3
+  hash: 1
   prerelease: 
   segments: 
   - 2
   - 3
-  - 0
-  version: 2.3.0
+  - 1
+  version: 2.3.1
 platform: ruby
 authors: 
 - Jarmo Pertman
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-09-10 00:00:00 Z
+date: 2011-09-11 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rake
@@ -173,7 +173,7 @@ rubyforge_project:
 rubygems_version: 1.8.4
 signing_key: 
 specification_version: 3
-summary: watirsplash 2.3.0
+summary: watirsplash 2.3.1
 test_files: 
 - spec/browser_spec.rb
 - spec/page_spec.rb