diff --git a/test/functional/cms_controller_test.rb b/test/functional/cms_controller_test.rb index 1d1abfb..035b0a4 100644 --- a/test/functional/cms_controller_test.rb +++ b/test/functional/cms_controller_test.rb @@ -209,17 +209,17 @@ class CmsControllerTest < ActionController::TestCase should 'redirect to cms after remove article from content management' do a = profile.articles.build(:name => 'my-article') a.save! - @request.env['HTTP_REFERER'] = url_for :controller => 'cms', :profile => profile.identifier, :action => 'index' + @request.env['HTTP_REFERER'] = 'http://test.host/myprofile/testinguser/cms' post :destroy, :profile => profile.identifier, :id => a.id - assert_redirected_to :controller => 'cms', :profile => profile.identifier, :action => 'index' + assert_redirected_to :controller => 'cms', :action => 'index', :profile => profile.identifier end should 'redirect to blog after remove article from content viewer' do a = profile.articles.build(:name => 'my-article') a.save! - @request.env['HTTP_REFERER'] = url_for :controller => 'content_viewer', :action => 'view_page' + @request.env['HTTP_REFERER'] = 'http://colivre.net/testinguser' post :destroy, :profile => profile.identifier, :id => a.id - assert_redirected_to :controller => 'content_viewer', :action => 'view_page' + assert_redirected_to :controller => 'content_viewer', :action => 'view_page', :profile => profile.identifier, :page => [], :host => profile.environment.default_hostname end should 'be able to acess Rss feed creation page' do diff --git a/test/test_helper.rb b/test/test_helper.rb index 73bd00e..02752ce 100644 --- a/test/test_helper.rb +++ b/test/test_helper.rb @@ -256,9 +256,8 @@ module NoosferoTestHelper def will_paginate(arg1, arg2) end - def url_for *args - url = ActionController::UrlRewriter.new(@request, nil) - url.rewrite *args + def url_for(args = {}) + args end def javascript_tag(any) -- libgit2 0.21.2