Merge branch 'master' into fix-forum-topic-visits

test/functional/forum_topics_controller_test.rb

@@ -66,6 +66,11 @@ class ForumTopicsControllerTest < ActionController::TestCase
         get :show, {id: @forum_topic.id, format: :json}, {user_id: @user.id}
         assert_nil(@user.reload.last_forum_read_at)
       end
+
+      should "render for atom feed" do
+        get :show, {:id => @forum_topic.id, :format => :atom}
+        assert_response :success
+      end
     end
 
     context "index action" do
@@ -74,6 +79,11 @@ class ForumTopicsControllerTest < ActionController::TestCase
         assert_response :success
       end
 
+      should "render for atom feed" do
+        get :index, {:format => :atom}
+        assert_response :success
+      end
+
       context "with search conditions" do
         should "list all matching forum topics" do
           get :index, {:search => {:title_matches => "forum"}}