Merge pull request #5505 from alphagov/bump-govuk-schemas

[PP-7588] Fix compatibility with content schemas

Author: yndajas

Gemfile.lock

@@ -81,7 +81,7 @@ GEM
     autoprefixer-rails (10.4.21.0)
       execjs (~> 2)
     base64 (0.3.0)
-    bigdecimal (4.1.1)
+    bigdecimal (4.1.2)
     builder (3.3.0)
     byebug (13.0.0)
       reline (>= 0.6.0)
@@ -215,7 +215,7 @@ GEM
       rouge
       sprockets (>= 3)
       sprockets-rails
-    govuk_schemas (6.3.0)
+    govuk_schemas (6.3.1)
       json-schema (>= 2.8, < 6.3)
     govuk_tech_docs (5.2.2)
       autoprefixer-rails (~> 10.2)
@@ -780,6 +780,7 @@ PLATFORMS
   aarch64-linux
   arm64-darwin-23
   arm64-darwin-24
+  arm64-darwin-25
   x86_64-darwin-23
   x86_64-linux
 

spec/app/content_schema_spec.rb

@@ -16,7 +16,11 @@
       schema = ContentSchema.new("generic").frontend_schema
 
       expect(schema.properties["base_path"]["$ref"]).to eql(nil)
-      expect(schema.properties["base_path"]["type"]).to eql("string")
+
+      expect(schema
+        .properties
+        .dig("base_path", "allOf")
+        .map { _1["type"] }).to eql(%w[string string])
     end
   end
 
@@ -37,7 +41,10 @@
       schema = ContentSchema.new("generic").publisher_content_schema
 
       expect(schema.properties["base_path"]["$ref"]).to eql(nil)
-      expect(schema.properties["base_path"]["type"]).to eql("string")
+      expect(schema
+        .properties
+        .dig("base_path", "allOf")
+        .map { _1["type"] }).to eql(%w[string string])
     end
   end