Merged r20931 from trunk to 4.1-stable (#34933).

git-svn-id: http://svn.redmine.org/redmine/branches/4.1-stable@20934 e93f8b46-1217-0410-a6f0-8f06a7374b81

1 files changed, 16 insertions, 0 deletions

diff --git a/test/functional/activities_controller_test.rb b/test/functional/activities_controller_test.rb
index 8d6cc3aca..dbff6a82c 100644
--- a/test/functional/activities_controller_test.rb
+++ b/test/functional/activities_controller_test.rb
@@ -111,6 +111,22 @@ class ActivitiesControllerTest < Redmine::ControllerTest
     end
   end
 
+  def test_index_atom_feed_should_respect_feeds_limit_setting
+    with_settings :feeds_limit => '20' do
+      get(
+        :index,
+        :params => {
+          :format => 'atom'
+        }
+      )
+    end
+    assert_response :success
+
+    assert_select 'feed' do
+      assert_select 'entry', :count => 20
+    end
+  end
+
   def test_index_atom_feed_with_explicit_selection
     get :index, :params => {
         :format => 'atom',