From 56ba4d02097a6eab3135281330c7574688fb0e56 Mon Sep 17 00:00:00 2001 From: Jean-Philippe Lang Date: Sat, 26 Mar 2016 09:58:06 +0000 Subject: [PATCH] No need to use custom host name in these tests. git-svn-id: http://svn.redmine.org/redmine/trunk@15285 e93f8b46-1217-0410-a6f0-8f06a7374b81 --- test/functional/account_controller_test.rb | 8 +++----- test/functional/issues_controller_test.rb | 4 ++-- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/test/functional/account_controller_test.rb b/test/functional/account_controller_test.rb index c3f7d6812..ad187b293 100644 --- a/test/functional/account_controller_test.rb +++ b/test/functional/account_controller_test.rb @@ -326,10 +326,8 @@ class AccountControllerTest < ActionController::TestCase ActionMailer::Base.deliveries.clear assert_difference 'ActionMailer::Base.deliveries.size' do assert_difference 'Token.count' do - with_settings :host_name => 'mydomain.foo', :protocol => 'http' do - post :lost_password, :mail => 'JSmith@somenet.foo' - assert_redirected_to '/login' - end + post :lost_password, :mail => 'JSmith@somenet.foo' + assert_redirected_to '/login' end end @@ -338,7 +336,7 @@ class AccountControllerTest < ActionController::TestCase assert_equal 'recovery', token.action assert_select_email do - assert_select "a[href=?]", "http://mydomain.foo/account/lost_password?token=#{token.value}" + assert_select "a[href=?]", "http://localhost:3000/account/lost_password?token=#{token.value}" end end diff --git a/test/functional/issues_controller_test.rb b/test/functional/issues_controller_test.rb index 7679195bb..2dd0f4618 100644 --- a/test/functional/issues_controller_test.rb +++ b/test/functional/issues_controller_test.rb @@ -2587,7 +2587,7 @@ class IssuesControllerTest < ActionController::TestCase set_tmp_attachments_directory @request.session[:user_id] = 2 - with_settings :host_name => 'mydomain.foo', :protocol => 'http', :notified_events => %w(issue_added) do + with_settings :notified_events => %w(issue_added) do assert_difference 'Issue.count' do post :create, :project_id => 1, :issue => { :tracker_id => '1', :subject => 'With attachment' }, @@ -2597,7 +2597,7 @@ class IssuesControllerTest < ActionController::TestCase assert_not_nil ActionMailer::Base.deliveries.last assert_select_email do - assert_select 'a[href^=?]', 'http://mydomain.foo/attachments/download', 'testfile.txt' + assert_select 'a[href^=?]', 'http://localhost:3000/attachments/download', 'testfile.txt' end end -- 2.39.5