Merged rails-4.1 branch (#14534).

git-svn-id: http://svn.redmine.org/redmine/trunk@13482 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Jean-Philippe Lang
2014-10-22 17:37:16 +00:00
parent a6ec78a4dc
commit 2d1866d966
331 changed files with 2540 additions and 6138 deletions

View File

@@ -17,7 +17,7 @@
require File.expand_path('../../../test_helper', __FILE__)
class RoutingAuthSourcesTest < ActionController::IntegrationTest
class RoutingAuthSourcesTest < ActionDispatch::IntegrationTest
def test_auth_sources
assert_routing(
{ :method => 'get', :path => "/auth_sources" },