Merge pull request #1156 from alphagov/fix-gone-unpublish

Fix issue with former redirects being unable to be unpublished

app/models/route_set.rb

@@ -27,7 +27,7 @@ def self.from_content_item(item)
       routes = item.routes.map(&:to_h).map(&:deep_symbolize_keys)
     end
 
-    redirects = item.redirects.map(&:to_h).map(&:deep_symbolize_keys)
+    redirects = Array(item.redirects).map(&:to_h).map(&:deep_symbolize_keys)
 
     new(
       routes:,

spec/models/route_set_spec.rb

@@ -49,6 +49,28 @@
       ]
 
       route_set = RouteSet.from_content_item(item)
+
+      expect(route_set.is_gone).to eq(true)
+      expected_routes = [
+        { path: "/path", type: "exact" },
+        { path: "/path.json", type: "exact" },
+        { path: "/path/subpath", type: "prefix" },
+      ]
+      expect(route_set.routes).to eq([])
+      expect(route_set.gone_routes).to match_array(expected_routes)
+      expect(route_set.redirects).to eq([])
+    end
+
+    it "constructs a route set from a gone content item with nil redirects" do
+      item = build(:gone_content_item, base_path: "/path", redirects: nil)
+      item.routes = [
+        { "path" => "/path", "type" => "exact" },
+        { "path" => "/path.json", "type" => "exact" },
+        { "path" => "/path/subpath", "type" => "prefix" },
+      ]
+
+      route_set = RouteSet.from_content_item(item)
+
       expect(route_set.is_gone).to eq(true)
       expected_routes = [
         { path: "/path", type: "exact" },