webrat 0.6.0 → 0.7.0

data/History.txt

@@ -1,3 +1,20 @@
+== 0.7.0 / 2010-01-17
+
+* Major enhancements
+
+  * Upgrade bundled Selenium server JAR to 2.0a1 (Henry Poydar and Jake Scruggs)
+
+* Minor enhancements
+
+  * Save and open page directory specified via configuration, defaults to tmp dir otherwise current dir (Noah Davis)
+
+* Bug fixes
+
+  * Added missing dependency "rack-test" to gemspec (LH #339) (Noah Davis)
+  * Removed save_and_open_page's rewriting of static asset paths before saving (was not actually working) (Noah Davis)
+  * Make "should contain" ignore extra whitespace when doing string comparisons (Noah Davis)
+  * Make selenium matchers handle negative match more consistently with positive match (Luke Melia)
+   
 == 0.6.0 / 2009-11-28
 
 REMOVED: Support for Hpricot + REXML as an alternative to Nokogiri.

data/Thorfile

@@ -32,6 +32,7 @@ Most Ruby web frameworks and testing frameworks are supported.
 
       s.add_dependency "nokogiri", ">= 1.2.0"
       s.add_dependency "rack", ">= 1.0"
+      s.add_dependency "rack-test", ">= 0.5.3"
     end
   end
 

data/lib/webrat.rb

@@ -2,7 +2,7 @@ require "rack"
 require "nokogiri"
 
 module Webrat
-  VERSION = "0.6.0"
+  VERSION = "0.7.0"
 
   autoload :MechanizeAdapter, "webrat/adapters/mechanize"
   autoload :MerbAdapter, "webrat/adapters/merb"

data/lib/webrat/adapters/rails.rb

@@ -11,14 +11,6 @@ module Webrat
       @integration_session = session
     end
 
-    def doc_root
-      File.expand_path(File.join(RAILS_ROOT, 'public'))
-    end
-
-    def saved_page_dir
-      File.expand_path(File.join(RAILS_ROOT, "tmp"))
-    end
-
     def get(url, data, headers = nil)
       do_request(:get, url, data, headers)
     end

data/lib/webrat/core/configuration.rb

@@ -1,4 +1,5 @@
 require "webrat/core_extensions/deprecate"
+require "pathname"
 
 module Webrat
 
@@ -26,7 +27,10 @@ module Webrat
     # Save and open pages with error status codes (500-599) in a browser? Defualts to true.
     attr_writer :open_error_files
 
-    # Which rails environment should the selenium tests be run in? Defaults to selenium.
+    # Save and open page storage directory, defaults to "tmp" under current directory if exists, otherwise current directory
+    attr_accessor :saved_pages_dir
+
+    # Which rails environment should the selenium tests be run in? Defaults to test.
     attr_accessor :application_environment
     webrat_deprecate :selenium_environment, :application_environment
     webrat_deprecate :selenium_environment=, :application_environment=
@@ -68,6 +72,9 @@ module Webrat
       self.infinite_redirect_limit = 10
       self.selenium_browser_key = '*firefox'
       self.selenium_browser_startup_timeout = 5
+
+      tmp_dir = Pathname.new(Dir.pwd).join("tmp")
+      self.saved_pages_dir = tmp_dir.exist? ? tmp_dir : Dir.pwd
     end
 
     def open_error_files? #:nodoc:

data/lib/webrat/core/matchers/have_content.rb

@@ -12,7 +12,7 @@ module Webrat
 
         case @content
         when String
-          @element.include?(@content)
+          @element.gsub(/\s+/, ' ').include?(@content)
         when Regexp
           @element.match(@content)
         end

data/lib/webrat/core/save_and_open_page.rb

@@ -6,12 +6,12 @@ module Webrat
     # Example:
     #   save_and_open_page
     def save_and_open_page
-      return unless File.exist?(saved_page_dir)
+      return unless File.exist?(Webrat.configuration.saved_pages_dir)
 
-      filename = "#{saved_page_dir}/webrat-#{Time.now.to_i}.html"
+      filename = "#{Webrat.configuration.saved_pages_dir}/webrat-#{Time.now.to_i}.html"
 
       File.open(filename, "w") do |f|
-        f.write rewrite_css_and_image_references(response_body)
+        f.write response_body
       end
 
       open_in_browser(filename)
@@ -24,25 +24,5 @@ module Webrat
       warn "Sorry, you need to install launchy to open pages: `gem install launchy`"
     end
 
-    def rewrite_css_and_image_references(response_html) # :nodoc:
-      return response_html unless doc_root
-      response_html.gsub(/("|')\/(stylesheets|images)/, '\1' + doc_root + '/\2')
-    end
-
-    def saved_page_dir #:nodoc:
-      File.expand_path(".")
-    end
-
-    def doc_root #:nodoc:
-      nil
-    end
-
-  private
-
-    # accessor for testing
-    def ruby_platform
-      RUBY_PLATFORM
-    end
-
   end
 end

data/lib/webrat/core/session.rb

@@ -92,10 +92,6 @@ For example:
       page
     end
 
-    def doc_root #:nodoc:
-      nil
-    end
-
     def header(key, value)
       @custom_headers[key] = value
     end

data/lib/webrat/selenium/matchers/have_content.rb

@@ -7,29 +7,33 @@ module Webrat
         end
 
         def matches?(response)
-          if @content.is_a?(Regexp)
-            text_finder = "regexp:#{@content.source}"
-          else
-            text_finder = @content
+          response.session.wait_for do
+            response.selenium.is_text_present(text_finder)
           end
+        rescue Webrat::TimeoutError => e
+          @error_message = e.message
+          false
+        end
 
+        def does_not_match?(response)
           response.session.wait_for do
-            response.selenium.is_text_present(text_finder)
+            !response.selenium.is_text_present(text_finder)
           end
-          rescue Webrat::TimeoutError
-            false
+        rescue Webrat::TimeoutError => e
+          @error_message = e.message
+          false
         end
 
         # ==== Returns
         # String:: The failure message.
         def failure_message
-          "expected the following element's content to #{content_message}:\n#{@element}"
+          "expected the response to #{content_message}:\n#{@error_message}"
         end
 
         # ==== Returns
         # String:: The failure message to be displayed in negative matches.
         def negative_failure_message
-          "expected the following element's content to not #{content_message}:\n#{@element}"
+          "expected the response to not #{content_message}"
         end
 
         def content_message
@@ -40,6 +44,14 @@ module Webrat
             "match #{@content.inspect}"
           end
         end
+
+        def text_finder
+          if @content.is_a?(Regexp)
+            "regexp:#{@content.source}"
+          else
+            @content
+          end
+        end
       end
 
       # Matches the contents of an HTML document with
@@ -52,7 +64,7 @@ module Webrat
       # the supplied string or regexp
       def assert_contain(content)
         hc = HasContent.new(content)
-       assert hc.matches?(response), hc.failure_message
+        assert hc.matches?(response), hc.failure_message
       end
 
       # Asserts that the body of the response

data/lib/webrat/selenium/matchers/have_selector.rb

@@ -14,6 +14,14 @@ module Webrat
             false
         end
 
+        def does_not_match?(response)
+          response.session.wait_for do
+            !response.selenium.is_element_present("css=#{@expected}")
+          end
+          rescue Webrat::TimeoutError
+            false
+        end
+
         # ==== Returns
         # String:: The failure message.
         def failure_message

data/lib/webrat/selenium/matchers/have_xpath.rb

@@ -14,6 +14,14 @@ module Webrat
             false
         end
 
+        def does_not_match?(response)
+          response.session.wait_for do
+            !response.selenium.is_element_present("xpath=#{@expected}")
+          end
+          rescue Webrat::TimeoutError
+            false
+        end
+
         # ==== Returns
         # String:: The failure message.
         def failure_message

data/lib/webrat/selenium/selenium_rc_server.rb

@@ -61,7 +61,7 @@ module Webrat
           TCPSocket.wait_for_service_with_timeout \
             :host     => (Webrat.configuration.selenium_server_address || "0.0.0.0"),
             :port     => Webrat.configuration.selenium_server_port,
-            :timeout  => 15 # seconds
+            :timeout  => 45 # seconds
         end
       end
 

data/lib/webrat/selenium/selenium_session.rb

@@ -195,9 +195,9 @@ EOS
 
 
     def save_and_open_screengrab
-      return unless File.exist?(saved_page_dir)
+      return unless File.exist?(Webrat.configuration.saved_pages_dir)
 
-      filename = "#{saved_page_dir}/webrat-#{Time.now.to_i}.png"
+      filename = "#{Webrat.configuration.saved_pages_dir}/webrat-#{Time.now.to_i}.png"
 
       if $browser.chrome_backend?
         $browser.capture_entire_page_screenshot(filename, '')

data/spec/fakes/test_adapter.rb

@@ -10,10 +10,6 @@ module Webrat #:nodoc:
     def initialize(*args)
     end
 
-    def doc_root
-      File.expand_path(File.join(".", "public"))
-    end
-
     def response
       @response ||= Object.new
     end

data/spec/private/core/session_spec.rb

@@ -2,11 +2,6 @@ require File.expand_path(File.dirname(__FILE__) + "/../../spec_helper")
 
 describe Webrat::Session do
 
-  it "should not have a doc_root" do
-    session = Webrat::Session.new
-    session.doc_root.should be_nil
-  end
-
   it "should expose the current_dom" do
     session = Webrat::Session.new
 

data/spec/private/rails/rails_adapter_spec.rb

@@ -76,11 +76,4 @@ describe Webrat::RailsAdapter do
     end
   end
 
-  it "should provide a saved_page_dir" do
-    Webrat::RailsAdapter.new(mock("integration session")).should respond_to(:saved_page_dir)
-  end
-
-  it "should provide a doc_root" do
-    Webrat::RailsAdapter.new(mock("integration session")).should respond_to(:doc_root)
-  end
 end

data/spec/public/matchers/contain_spec.rb

@@ -3,21 +3,6 @@ require File.expand_path(File.dirname(__FILE__) + "/../../spec_helper")
 describe "contain" do
   include Webrat::Matchers
 
-  before(:each) do
-    @body = <<-HTML
-      <div id='main'>
-        <div class='inner'>hello, world!</div>
-        <h2>Welcome "Bryan"</h2>
-        <h3>Welcome 'Bryan'</h3>
-        <h4>Welcome 'Bryan"</h4>
-        <ul>
-          <li>First</li>
-          <li>Second</li>
-        </ul>
-      </div>
-    HTML
-  end
-
   before(:each) do
     @body = <<-EOF
       <div id='main'>
@@ -34,6 +19,14 @@ describe "contain" do
     it "should call element#matches? when the argument is a regular expression" do
       @body.should contain(/hello, world/)
     end
+
+    it "should treat newlines as spaces" do
+      "<div>it takes\ndifferent strokes</div>".should contain("it takes different strokes")
+    end
+
+    it "should multiple spaces as a single space" do
+      "<div>it takes  different strokes</div>".should contain("it takes different strokes")
+    end
   end
 
   describe "asserts for contains," do

data/spec/public/save_and_open_spec.rb

@@ -22,30 +22,13 @@ describe "save_and_open_page" do
     Launchy::Browser.stub!(:run)
 
     @file_handle = mock("file handle")
-    File.stub!(:open).with(filename, 'w').and_yield(@file_handle)
+    File.stub!(:open).and_yield(@file_handle)
     @file_handle.stub!(:write)
   end
 
-  it "should rewrite css rules" do
-    @file_handle.should_receive(:write) do |html|
-      html.should =~ %r|"#{webrat_session.doc_root}/stylesheets/foo.css"|s
-    end
-
-    save_and_open_page
-  end
-
-  it "should rewrite image paths with double quotes" do
-    @file_handle.should_receive(:write) do |html|
-      html.should =~ %r|"#{webrat_session.doc_root}/images/bar.png"|s
-    end
-
-    save_and_open_page
-  end
-
-  it "should rewrite image paths with single quotes" do
-    @file_handle.should_receive(:write) do |html|
-      html.should =~ %r|'#{webrat_session.doc_root}/images/foo.png'|s
-    end
+  it "should save pages to the directory configured" do
+    Webrat.configuration.stub!(:saved_pages_dir => "path/to/dir")
+    File.should_receive(:open).with("path/to/dir/webrat-1234.html", "w").and_yield(@file_handle)
 
     save_and_open_page
   end
@@ -63,8 +46,4 @@ describe "save_and_open_page" do
     end.should_not raise_error
   end
 
-  def filename
-    File.expand_path("./webrat-#{Time.now}.html")
-  end
-
 end

data/webrat.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{webrat}
-  s.version = "0.6.0"
+  s.version = "0.7.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Bryan Helmkamp"]
-  s.date = %q{2009-11-28}
+  s.date = %q{2010-01-17}
   s.description = %q{Webrat lets you quickly write expressive and robust acceptance tests
 for a Ruby web application. It supports simulating a browser inside
 a Ruby process to avoid the performance hit and browser dependency of
@@ -337,12 +337,15 @@ Most Ruby web frameworks and testing frameworks are supported.}
     if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<nokogiri>, [">= 1.2.0"])
       s.add_runtime_dependency(%q<rack>, [">= 1.0"])
+      s.add_runtime_dependency(%q<rack-test>, [">= 0.5.3"])
     else
       s.add_dependency(%q<nokogiri>, [">= 1.2.0"])
       s.add_dependency(%q<rack>, [">= 1.0"])
+      s.add_dependency(%q<rack-test>, [">= 0.5.3"])
     end
   else
     s.add_dependency(%q<nokogiri>, [">= 1.2.0"])
     s.add_dependency(%q<rack>, [">= 1.0"])
+    s.add_dependency(%q<rack-test>, [">= 0.5.3"])
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: webrat
 version: !ruby/object:Gem::Version 
-  version: 0.6.0
+  version: 0.7.0
 platform: ruby
 authors: 
 - Bryan Helmkamp
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-11-28 00:00:00 -05:00
+date: 2010-01-17 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -32,6 +32,16 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: "1.0"
     version: 
+- !ruby/object:Gem::Dependency 
+  name: rack-test
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 0.5.3
+    version: 
 description: |-
   Webrat lets you quickly write expressive and robust acceptance tests
   for a Ruby web application. It supports simulating a browser inside