From 454a5ad1ec9ef0c2b089bb4229efb3e931666d5f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Valim?= Date: Wed, 9 May 2012 23:41:05 +0200 Subject: [PATCH] Try to fix the build for rails 3.1 --- lib/devise/failure_app.rb | 4 +++- test/failure_app_test.rb | 12 +++++++----- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/lib/devise/failure_app.rb b/lib/devise/failure_app.rb index 928b2e8a..54d214a4 100644 --- a/lib/devise/failure_app.rb +++ b/lib/devise/failure_app.rb @@ -88,7 +88,9 @@ module Devise opts = {} route = :"new_#{scope}_session_path" opts[:format] = request_format unless skip_format? - opts[:script_name] = Rails.application.config.relative_url_root + + config = Rails.application.config + opts[:script_name] = (config.relative_url_root if config.respond_to?(:relative_url_root)) context = send(Devise.available_router_name) diff --git a/test/failure_app_test.rb b/test/failure_app_test.rb index a1cff058..39b0e871 100644 --- a/test/failure_app_test.rb +++ b/test/failure_app_test.rb @@ -51,11 +51,13 @@ class FailureTest < ActiveSupport::TestCase end end - test 'returns to the default redirect location considering the relative url root' do - swap Rails.application.config, :relative_url_root => "/sample" do - call_failure - assert_equal 302, @response.first - assert_equal 'http://test.host/sample/users/sign_in', @response.second['Location'] + if Rails.application.config.respond_to?(:relative_url_root) + test 'returns to the default redirect location considering the relative url root' do + swap Rails.application.config, :relative_url_root => "/sample" do + call_failure + assert_equal 302, @response.first + assert_equal 'http://test.host/sample/users/sign_in', @response.second['Location'] + end end end