From 1874f6d395c97e3aa929e7cfd6ffacc55909cbab Mon Sep 17 00:00:00 2001
From: Noah Davis <noahd1@yahoo.com>
Date: Sat, 16 Jan 2010 19:28:29 -0500
Subject: [PATCH] Removed save_and_open_page's rewriting of static asset paths
 before saving (was not actually working)

---
 History.txt                              |  3 ++-
 lib/webrat/adapters/rails.rb             |  4 ----
 lib/webrat/core/save_and_open_page.rb    | 18 +-----------------
 lib/webrat/core/session.rb               |  4 ----
 spec/fakes/test_adapter.rb               |  4 ----
 spec/private/core/session_spec.rb        |  5 -----
 spec/private/rails/rails_adapter_spec.rb |  3 ---
 spec/public/save_and_open_spec.rb        | 24 ------------------------
 8 files changed, 3 insertions(+), 62 deletions(-)

diff --git a/History.txt b/History.txt
index a4fcbd6..c431e12 100644
--- a/History.txt
+++ b/History.txt
@@ -3,7 +3,8 @@
   * Save and open page directory specified via configuration (Noah Davis)
 
 * Bug fixes
-
+  
+  * 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)
    
diff --git a/lib/webrat/adapters/rails.rb b/lib/webrat/adapters/rails.rb
index c7c9992..1d4264c 100644
--- a/lib/webrat/adapters/rails.rb
+++ b/lib/webrat/adapters/rails.rb
@@ -11,10 +11,6 @@ module Webrat
       @integration_session = session
     end
 
-    def doc_root
-      File.expand_path(File.join(RAILS_ROOT, 'public'))
-    end
-
     def get(url, data, headers = nil)
       do_request(:get, url, data, headers)
     end
diff --git a/lib/webrat/core/save_and_open_page.rb b/lib/webrat/core/save_and_open_page.rb
index 01e8b52..bb912e9 100644
--- a/lib/webrat/core/save_and_open_page.rb
+++ b/lib/webrat/core/save_and_open_page.rb
@@ -11,7 +11,7 @@ module Webrat
       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,21 +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 doc_root #:nodoc:
-      nil
-    end
-
-  private
-
-    # accessor for testing
-    def ruby_platform
-      RUBY_PLATFORM
-    end
-
   end
 end
diff --git a/lib/webrat/core/session.rb b/lib/webrat/core/session.rb
index 619f3c6..939771b 100644
--- a/lib/webrat/core/session.rb
+++ b/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
diff --git a/spec/fakes/test_adapter.rb b/spec/fakes/test_adapter.rb
index afa6947..c3d2d22 100644
--- a/spec/fakes/test_adapter.rb
+++ b/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
diff --git a/spec/private/core/session_spec.rb b/spec/private/core/session_spec.rb
index c5c0ae9..8f26f46 100644
--- a/spec/private/core/session_spec.rb
+++ b/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
 
diff --git a/spec/private/rails/rails_adapter_spec.rb b/spec/private/rails/rails_adapter_spec.rb
index af3d412..3148f32 100644
--- a/spec/private/rails/rails_adapter_spec.rb
+++ b/spec/private/rails/rails_adapter_spec.rb
@@ -76,7 +76,4 @@ describe Webrat::RailsAdapter do
     end
   end
 
-  it "should provide a doc_root" do
-    Webrat::RailsAdapter.new(mock("integration session")).should respond_to(:doc_root)
-  end
 end
diff --git a/spec/public/save_and_open_spec.rb b/spec/public/save_and_open_spec.rb
index d207d23..3e090cb 100644
--- a/spec/public/save_and_open_spec.rb
+++ b/spec/public/save_and_open_spec.rb
@@ -33,30 +33,6 @@ describe "save_and_open_page" do
     save_and_open_page
   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
-
-    save_and_open_page
-  end
-
   it "should open the temp file in a browser with Launchy" do
     Launchy::Browser.should_receive(:run)
     save_and_open_page