2 files changed, 26 insertions, 1 deletions
diff --git a/spec/support/matchers/background_migrations_matchers.rb b/spec/support/matchers/background_migrations_matchers.rb
index 8735dac8b2a..0144a044f6c 100644
--- a/spec/support/matchers/background_migrations_matchers.rb
+++ b/spec/support/matchers/background_migrations_matchers.rb
@@ -10,7 +10,8 @@ RSpec::Matchers.define :be_scheduled_delayed_migration do |delay, *expected|
 
   failure_message do |migration|
     "Migration `#{migration}` with args `#{expected.inspect}` " \
-      'not scheduled in expected time!'
+      "not scheduled in expected time! Expected any of `#{BackgroundMigrationWorker.jobs.map { |j| j['args'] }}` to be `#{[migration, expected]}` " \
+      "and any of `#{BackgroundMigrationWorker.jobs.map { |j| j['at'].to_i }}` to be `#{delay.to_i + Time.now.to_i}` (`#{delay.to_i}` + `#{Time.now.to_i}`)."
   end
 end
 
diff --git a/spec/support/matchers/jsonb_matchers.rb b/spec/support/matchers/jsonb_matchers.rb
new file mode 100644
index 00000000000..823888708f3
--- /dev/null
+++ b/spec/support/matchers/jsonb_matchers.rb
@@ -0,0 +1,24 @@
+# frozen_string_literal: true
+
+RSpec::Matchers.define :validate_jsonb_schema do |jsonb_columns|
+  match do |actual|
+    next true if jsonb_columns.blank?
+
+    expect(actual.validators).to include(a_kind_of(JsonSchemaValidator))
+  end
+
+  failure_message do
+    <<~FAILURE_MESSAGE
+      Expected #{actual.name} to validate the schema of #{jsonb_columns.join(', ')}.
+
+      Use JsonSchemaValidator in your model when using a jsonb column.
+      See doc/development/migration_style_guide.html#storing-json-in-database for more information.
+
+      To fix this, please add `validates :#{jsonb_columns.first}, json_schema: { filename: "filename" }` in your model file, for example:
+
+      class #{actual.name}
+        validates :#{jsonb_columns.first}, json_schema: { filename: "filename" }
+      end
+    FAILURE_MESSAGE
+  end
+end