lib/desert/plugin_templates/1.99.0/action_mailer.rb spec/rails_root/vendor/plugins/acts_as_spiffy/app/views/spiffy_mailer/spiffy_mail.rhtml @@ -2,6 +2,8 @@ dir = File.dirname(__FILE__) require "#{dir}/plugin_templates/action_controller" if Desert::VersionChecker.rails_version_is_below_1990? require "#{dir}/plugin_templates/1.2.0/action_mailer" +elsif Desert::VersionChecker.rails_version_is_below_rc2? + require "#{dir}/plugin_templates/1.99.0/action_mailer" else require "#{dir}/plugin_templates/2.0.0/action_mailer" end lib/desert/plugin_templates.rb @@ -2,15 +2,15 @@ dir = File.dirname(__FILE__) require "#{dir}/../rails_spec_helper" module ActionMailer -describe Base, "#render template" do - it "gives priority to the rails app" do - @base = ::SpiffyMailer.create_spiffy_mail - @base.body.should == "From App" - end + describe Base, "#render template" do + it "gives priority to the rails app" do + @base = ::SpiffyMailer.create_spiffy_mail + @base.body.should == "From App" + end - it "gives priority to plugins added later" do - @base = ::SpiffyMailer.create_acts_as_spiffy - @base.body.should == "From Super Spiffy" + it "gives priority to plugins added later" do + @base = ::SpiffyMailer.create_acts_as_spiffy + @base.body.should == "From Super Spiffy" + end end end -end spec/rails_root/spec/desert/action_mailer_integration_spec.rb @@ -17,7 +17,8 @@ class SpecSuite protected def run_with_rails_version(suite_path, rails_version) - system("export RAILS_VERSION=#{rails_version} && ruby #{suite_path}") + system("export RAILS_VERSION=#{rails_version} && ruby #{suite_path}") || + raise("Failed for version #{rails_version}") end end spec/spec_suite.rb 937c5f37c750dd53cd10c789711c8d98e2d203f4 btakita btakita@af276e61-6b34-4dac-905b-574b5f35ef33 http://github.com/tog/desert/commit/0ec1495143cb4881a0c3302f7b70d17a0e68a7bc 0ec1495143cb4881a0c3302f7b70d17a0e68a7bc 2008-05-02T14:56:44-07:00 2008-05-02T14:56:44-07:00 Accounting for multiple view paths in 1.99.0 ActionMailer. git-svn-id: svn+ssh://rubyforge.org/var/svn/pivotalrb/desert/trunk@1537 af276e61-6b34-4dac-905b-574b5f35ef33 f6bc4a64a84c6743f2a997d65d3016582c9df8fe btakita btakita@af276e61-6b34-4dac-905b-574b5f35ef33