@@ -1,8 +1,11 @@ module ActionView #:nodoc: class TemplateFinder #:nodoc: def initialize_with_desert_plugins(*args) - initialize_without_desert_plugins *args - + begin + initialize_without_desert_plugins *args + rescue ActionView::TemplateFinder::InvalidViewPath + # Desert will add the missing paths next + end Desert::Manager.plugins.reverse.each do |plugin| append_view_path plugin.templates_path end lib/desert/plugin_templates/2.1.0/action_view.rb @@ -25,6 +25,10 @@ module Desert def rails_version_is_below_220? current_rails_version_matches?('<2.2.0') end + + def rails_version_is_below_230? + current_rails_version_matches?('<2.3.0') + end end end end lib/desert/version_checker.rb @@ -3,31 +3,25 @@ require File.expand_path("#{File.dirname(__FILE__)}/../rails_spec_helper") module ActionController describe Base, "#render" do include ActionController::UrlWriter - before do - # TODO: fix the pending tests. This block references Cgi stuff that is not the same across Rails versions. - #ENV["REQUEST_URI"] = super_spiffy_path - #ENV["REQUEST_METHOD"] = "GET" - #ENV["REMOTE_ADDR"] = "127.0.0.0" - #ENV["HTTP_HOST"] = 'test.host' - #cgi = CGI.new - #@request = ActionController::CgiRequest.new(cgi, {}) - #@response = ActionController::CgiResponse.new(cgi) - #@response.template - # - #@controller = ::Spiffy::SpiffyController.new - #@controller.request = @request - #@controller.response = @response + ENV["REQUEST_URI"] = super_spiffy_path + ENV["REQUEST_METHOD"] = "GET" + ENV["REMOTE_ADDR"] = "127.0.0.0" + ENV["HTTP_HOST"] = 'test.host' + @request = ActionController::TestRequest.new + @response = ActionController::TestResponse.new + + @controller = ::Spiffy::SpiffyController.new + @controller.request = @request + @controller.response = @response end it "gives priority to the rails app" do - pending @controller.process(@request, @response, :render, :template => "spiffy/spiffy/spiffy") @response.body.should == "From App" end it "gives priority to plugins added later" do - pending @controller.process(@request, @response, :render, :template => "spiffy/spiffy/acts_as_spiffy") @response.body.should == "From Super Spiffy" end spec/rails_root/spec/desert/action_controller_integration_spec.rb @@ -14,11 +14,14 @@ module ActionMailer end end end - describe "view_paths" do - it "should be memoized" do - ActionMailer::Base.view_paths = [] - SpiffyMailer.deliver_spiffy_mail - ActionMailer::Base.view_paths.should_not be_nil + + if !Desert::VersionChecker.rails_version_is_below_220? + describe "view_paths" do + it "should be memoized" do + ActionMailer::Base.view_paths = [] + SpiffyMailer.deliver_spiffy_mail + ActionMailer::Base.view_paths.should_not be_nil + end end end end spec/rails_root/spec/desert/action_mailer_integration_spec.rb 0186c737f66d9ce1c124ce76f961fe7d05eb2972 pivotal pivotal@albion.flood.pivotallabs.com http://github.com/pivotal/desert/commit/87075e6d72a9c85c9d4148b7156ef575db8c39c2 87075e6d72a9c85c9d4148b7156ef575db8c39c2 2009-08-26T16:28:06-07:00 2009-08-26T16:28:06-07:00 joemoore -- plugin view loding fixed for Rails 2.1.0. Fixed failing tests due to Rails version incompatibilities 64444557853a1f822325e36d7fb9ba29db1e551c pivotal pivotal@albion.flood.pivotallabs.com