Revert r19810 (#10535).

git-svn-id: http://svn.redmine.org/redmine/trunk@20685 e93f8b46-1217-0410-a6f0-8f06a7374b81

2 files changed, 38 insertions, 44 deletions

diff --git a/test/functional/activities_controller_test.rb b/test/functional/activities_controller_test.rb
index 7475d4996..dbbe33b48 100644
--- a/test/functional/activities_controller_test.rb
+++ b/test/functional/activities_controller_test.rb
@@ -106,51 +106,47 @@ class ActivitiesControllerTest < Redmine::ControllerTest
   end
 
   def test_index_atom_feed
-    with_settings :protocol => 'http', :host_name => 'redmine.test' do
-      get(
-        :index,
-        :params => {
-          :format => 'atom',
-          :with_subprojects => 0
-        }
-      )
-    end
+    get(
+      :index,
+      :params => {
+        :format => 'atom',
+        :with_subprojects => 0
+      }
+    )
     assert_response :success
 
     assert_select 'feed' do
-      assert_select 'link[rel=self][href=?]', 'http://redmine.test/activity.atom?with_subprojects=0'
-      assert_select 'link[rel=alternate][href=?]', 'http://redmine.test/activity?with_subprojects=0'
+      assert_select 'link[rel=self][href=?]', 'http://test.host/activity.atom?with_subprojects=0'
+      assert_select 'link[rel=alternate][href=?]', 'http://test.host/activity?with_subprojects=0'
       assert_select 'entry' do
-        assert_select 'link[href=?]', 'http://redmine.test/issues/11'
+        assert_select 'link[href=?]', 'http://test.host/issues/11'
       end
     end
   end
 
   def test_index_atom_feed_with_explicit_selection
-    with_settings :protocol => 'https', :host_name => 'redmine.example' do
-      get(
-        :index,
-        :params => {
-          :format => 'atom',
-          :with_subprojects => 0,
-          :show_changesets => 1,
-          :show_documents => 1,
-          :show_files => 1,
-          :show_issues => 1,
-          :show_messages => 1,
-          :show_news => 1,
-          :show_time_entries => 1,
-          :show_wiki_edits => 1
-        }
-      )
-    end
+    get(
+      :index,
+      :params => {
+        :format => 'atom',
+        :with_subprojects => 0,
+        :show_changesets => 1,
+        :show_documents => 1,
+        :show_files => 1,
+        :show_issues => 1,
+        :show_messages => 1,
+        :show_news => 1,
+        :show_time_entries => 1,
+        :show_wiki_edits => 1
+      }
+    )
     assert_response :success
 
     assert_select 'feed' do
-      assert_select 'link[rel=self][href=?]', 'https://redmine.example/activity.atom?show_changesets=1&show_documents=1&show_files=1&show_issues=1&show_messages=1&show_news=1&show_time_entries=1&show_wiki_edits=1&with_subprojects=0'
-      assert_select 'link[rel=alternate][href=?]', 'https://redmine.example/activity?show_changesets=1&show_documents=1&show_files=1&show_issues=1&show_messages=1&show_news=1&show_time_entries=1&show_wiki_edits=1&with_subprojects=0'
+      assert_select 'link[rel=self][href=?]', 'http://test.host/activity.atom?show_changesets=1&show_documents=1&show_files=1&show_issues=1&show_messages=1&show_news=1&show_time_entries=1&show_wiki_edits=1&with_subprojects=0'
+      assert_select 'link[rel=alternate][href=?]', 'http://test.host/activity?show_changesets=1&show_documents=1&show_files=1&show_issues=1&show_messages=1&show_news=1&show_time_entries=1&show_wiki_edits=1&with_subprojects=0'
       assert_select 'entry' do
-        assert_select 'link[href=?]', 'https://redmine.example/issues/11'
+        assert_select 'link[href=?]', 'http://test.host/issues/11'
       end
     end
   end
diff --git a/test/functional/issues_controller_test.rb b/test/functional/issues_controller_test.rb
index 3ea6d9cef..848b2eaa2 100644
--- a/test/functional/issues_controller_test.rb
+++ b/test/functional/issues_controller_test.rb
@@ -1140,22 +1140,20 @@ class IssuesControllerTest < Redmine::ControllerTest
   end
 
   def test_index_atom
-    with_settings :protocol => 'https', :host_name => 'example.net' do
-      get(
-        :index,
-        :params => {
-          :project_id => 'ecookbook',
-          :format => 'atom'
-        }
-      )
-    end
+    get(
+      :index,
+      :params => {
+        :project_id => 'ecookbook',
+        :format => 'atom'
+      }
+    )
     assert_response :success
     assert_equal 'application/atom+xml', response.media_type
 
     assert_select 'feed' do
-      assert_select 'link[rel=self][href=?]', 'https://example.net/projects/ecookbook/issues.atom'
-      assert_select 'link[rel=alternate][href=?]', 'https://example.net/projects/ecookbook/issues'
-      assert_select 'entry link[href=?]', 'https://example.net/issues/1'
+      assert_select 'link[rel=self][href=?]', 'http://test.host/projects/ecookbook/issues.atom'
+      assert_select 'link[rel=alternate][href=?]', 'http://test.host/projects/ecookbook/issues'
+      assert_select 'entry link[href=?]', 'http://test.host/issues/1'
     end
   end