Set content type to XML. Return 404 if no sitemap file

Author: fbacall

app/controllers/sitemaps_controller.rb

@@ -3,10 +3,14 @@ class SitemapsController < ApplicationController
 
   def index
     if TeSS::Config.feature['spaces'] && !current_space.default?
-      render file: sitemap_base.join("#{current_space.host}/sitemap.xml"), layout: false
+      sitemap_path = sitemap_base.join("#{current_space.host}/sitemap.xml")
     else
-      render file: sitemap_base.join('sitemap.xml'), layout: false
+      sitemap_path = sitemap_base.join('sitemap.xml')
     end
+
+    return head :not_found unless sitemap_path.exist?
+
+    render file: sitemap_path, layout: false, content_type: 'application/xml'
   end
 
   private

test/controllers/sitemaps_controller_test.rb

@@ -9,6 +9,8 @@ class SitemapsControllerTest < ActionController::TestCase
 
     with_settings(feature: { spaces: false }) do
       get :index
+
+      assert_response :success
     end
 
     urls = sitemap_urls
@@ -19,6 +21,8 @@ class SitemapsControllerTest < ActionController::TestCase
   test 'renders global sitemap for default space when spaces feature is enabled' do
     with_settings(feature: { spaces: true }) do
       get :index
+
+      assert_response :success
     end
 
     urls = sitemap_urls
@@ -31,6 +35,8 @@ class SitemapsControllerTest < ActionController::TestCase
     with_settings(feature: { spaces: true }) do
       with_host(space.host) do
         get :index
+
+        assert_response :success
       end
     end
 
@@ -39,6 +45,17 @@ class SitemapsControllerTest < ActionController::TestCase
     assert_includes urls, 'http://plants.mytess.training/about'
   end
 
+  test 'returns 404 if sitemap file does not exist' do
+    space = spaces(:astro)
+    with_settings(feature: { spaces: true }) do
+      with_host(space.host) do
+        get :index
+
+        assert_response :not_found
+      end
+    end
+  end
+
   private
 
   def sitemap_urls