watirsplash 2.1.1 → 2.2.0

data/History.rdoc

@@ -1,3 +1,10 @@
+=== Version 2.2.0 / 2011-09-10
+
+ * watir-webdriver/firefox is now the default framework under Linux and OS X
+ * Page objects will reuse WatirSplash::Browser.current if it exists
+ * added Page#redirect_to for redirecting to another Page object
+ * require spec_helper relatively from working directory
+
 === Version 2.1.1 / 2011-08-18
 
  * bumped Watir dependency to 2.0.1

data/README.rdoc

@@ -62,7 +62,7 @@ testing right away!
           def search_button
             modify button(:name => "go"),
               # clicking the search button results a page transition to "results" page
-              :click => lambda {Results.new @browser}
+              :click => lambda {redirect_to Results}
           end
         end
       end
@@ -119,15 +119,15 @@ testing right away!
 == SUPPORTED PLATFORMS & BROWSERS
 
 WatirSplash supports different frameworks/browsers on different operating systems:
-* Linux & OS X - firewatir, watir-webdriver/chrome and watir-webdriver/firefox
-* Windows - firewatir, watir, watir-webdriver/chrome, watir-webdriver/ie, watir-webdriver/firefox
+* Linux & OS X - watir-webdriver/firefox, watir-webdriver/chrome and firewatir
+* Windows - watir, watir-webdriver/firefox, watir-webdriver/chrome, watir-webdriver/ie and firewatir
 
 Each framework drives a specific browser:
-* FireWatir - Firefox
 * Watir - IE
 * Watir-WebDriver - Chrome, IE and Firefox
+* FireWatir - Firefox
 
-It is possible to specify what framework to use in config.rb file:
+It is possible to specify what framework to use in spec_helper.rb file:
     WatirSplash::Util.framework = "watir-webdriver/firefox"
 
 It is also possible to specify used framework by using environment variable WATIRSPLASH_FRAMEWORK.

data/lib/watirsplash/generators/templates/new_project/.rspec

@@ -1,5 +1,5 @@
 --drb
---require spec/spec_helper
+--require ./spec/spec_helper
 --color
 --format documentation
 --require watirsplash/html_formatter

data/lib/watirsplash/page/base.rb

@@ -9,17 +9,24 @@ module WatirSplash
         def url url
           @@url = url
         end
+
       end
 
       def initialize(browser=nil)
         if browser
           @browser = WatirSplash::Browser.current = browser 
         else
-          @browser = WatirSplash::Browser.new
+          @browser = (WatirSplash::Browser.current &&
+                      WatirSplash::Browser.current.exists?) ||
+                      WatirSplash::Browser.new
           @browser.goto @@url
         end
       end
 
+      def redirect_to page, browser=nil
+        page.new browser || WatirSplash::Browser.current
+      end      
+
       def modify element, methodz
         methodz.each_pair do |meth, return_value|
           element.instance_eval do 

data/lib/watirsplash/util.rb

@@ -44,9 +44,9 @@ module WatirSplash
       def default_framework
         case RUBY_PLATFORM
         when /mswin|msys|mingw32/
-          :watir
+          "watir"
         when /darwin|linux/
-          :firewatir
+          "watir-webdriver/firefox"
         else
           raise "Unsupported platform: #{RUBY_PLATFORM}"
         end

data/lib/watirsplash/version.rb

@@ -1,10 +1,10 @@
 module WatirSplash
   module Version
-    WATIRSPLASH = "2.1.1"
+    WATIRSPLASH = "2.2.0"
 
     # possible runtime dependencies
     WATIR = "2.0.1"
     WIN32SCREENSHOT = "~>1.0.5"
-    WATIR_WEBDRIVER = "~>0.3.1"
+    WATIR_WEBDRIVER = "~>0.3.3"
   end
 end

data/spec/page_spec.rb

@@ -4,10 +4,15 @@ class DummyPage < WatirSplash::Page::Base
   def something
     modify Hash.new,
       :store => lambda {|a,b| a + b},
-      :new_method => lambda {[]}
+      :new_method => lambda {[]},
+      :another_page => lambda {redirect_to AnotherDummyPage},
+      :another_page_with_new_browser => lambda {|browser| redirect_to AnotherDummyPage, browser}
   end
 end
 
+class AnotherDummyPage < WatirSplash::Page::Base
+end
+
 describe WatirSplash::Page::Base do
   before :all do
     # close the browser opened in environment.rb    
@@ -19,7 +24,7 @@ describe WatirSplash::Page::Base do
       page = DummyPage.new
       browser = page.instance_variable_get(:@browser)
       browser.should respond_to(:title)
-      browser.url.should =~ /bing\.com/
+      browser.url.should =~ %r{bing.com}
     end
 
     it "allows to reuse existing browser" do
@@ -29,7 +34,7 @@ describe WatirSplash::Page::Base do
       page = DummyPage.new(browser)
       page_browser = page.instance_variable_get(:@browser)
       page_browser.should == browser
-      page_browser.url.should =~ /google\.com/
+      page_browser.url.should =~ %r{google.com}
     end
   end
 
@@ -63,6 +68,31 @@ describe WatirSplash::Page::Base do
     end
   end
 
+  context "#redirect_to" do
+    it "redirects to the new page reusing the current browser" do
+      page = DummyPage.new
+      another_page = page.something.another_page
+      another_page.should be_kind_of(AnotherDummyPage)
+      another_page.url.should =~ %r{bing.com}
+    end
+
+    it "redirects to the new page using the provided browser" do
+      page = DummyPage.new
+      old_browser = WatirSplash::Browser.current
+
+      browser = WatirSplash::Browser.new
+      browser.goto "http://google.com/ncr"
+      new_page = page.something.another_page_with_new_browser browser
+      new_page_browser = new_page.instance_variable_get(:@browser)
+      new_page_browser.should == browser
+      new_page_browser.url.should =~ %r{google.com}
+
+      page_browser = page.instance_variable_get(:@browser)
+      page_browser.should == old_browser
+      page_browser.url.should =~ %r{bing.com}
+    end
+  end
+
   context "#method_missing" do
     it "gets SpecHelper module included into class" do
       DummyPage.included_modules.should include(WatirSplash::SpecHelper)
@@ -71,7 +101,7 @@ describe WatirSplash::Page::Base do
     it "redirects all missing methods to browser object" do
       page = DummyPage.new
       page.should_not respond_to(:text_field)
-      page.text_field(:id => /somethin/).should be_kind_of(Watir::TextField)
+      page.text_field(:id => /something/).should be_kind_of(Watir::TextField)
     end
   end
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: watirsplash
 version: !ruby/object:Gem::Version 
-  hash: 9
+  hash: 7
   prerelease: 
   segments: 
   - 2
-  - 1
-  - 1
-  version: 2.1.1
+  - 2
+  - 0
+  version: 2.2.0
 platform: ruby
 authors: 
 - Jarmo Pertman
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-08-18 00:00:00 Z
+date: 2011-09-10 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.1.1
+summary: watirsplash 2.2.0
 test_files: 
 - spec/browser_spec.rb
 - spec/page_spec.rb