diff --git a/UPGRADE b/UPGRADE index 52e9439..68c4dda 100644 --- a/UPGRADE +++ b/UPGRADE @@ -25,3 +25,13 @@ I used the solution 1. I solved an incompatibility between paginate and geokit with an work around like this the one explained on the link: http://groups.google.com/group/will_paginate/browse_thread/thread/1bbb1f0c5810f1c1 + +5 - The test of this method 'theme_include' of application helper was not passing. + +I changed the tests + - "should 'render theme footer' do" + - " should 'ignore unexisting theme footer' do" + + to make the test usefull + + diff --git a/test/unit/application_helper_test.rb b/test/unit/application_helper_test.rb index 3f5c3c2..ce7b112 100644 --- a/test/unit/application_helper_test.rb +++ b/test/unit/application_helper_test.rb @@ -148,19 +148,19 @@ class ApplicationHelperTest < Test::Unit::TestCase should 'render theme footer' do stubs(:theme_path).returns('/user_themes/mytheme') - footer = '../../public/user_themes/mytheme/footer.rhtml' + footer_path = RAILS_ROOT + '/public/user_themes/mytheme/footer.rhtml' - File.expects(:exists?).with(RAILS_ROOT + '/app/views/../../public/user_themes/mytheme/footer.rhtml').returns(true) - expects(:render).with(:file => footer).returns("BLI") + File.expects(:exists?).with(footer_path).returns(true) + expects(:render).with(:file => footer_path, :use_full_path => false).returns("BLI") assert_equal "BLI", theme_footer end should 'ignore unexisting theme footer' do stubs(:theme_path).returns('/user_themes/mytheme') - footer = '../../public/user_themes/mytheme/footer.rhtml' + footer_path = RAILS_ROOT + '/public/user_themes/mytheme/footer.rhtml' - File.expects(:exists?).with(RAILS_ROOT + '/app/views/../../public/user_themes/mytheme/footer.rhtml').returns(false) + File.expects(:exists?).with(footer_path).returns(false) expects(:render).with(:file => footer).never assert_nil theme_footer -- libgit2 0.21.2