Skip to content

Commit 646d5da

Browse files
authored
Merge pull request rails#53203 from byroot/ruby-3.4-active-job
Update Active Job test suite for Ruby 3.4 Hash#inspect
2 parents ab35344 + 7a1e2fc commit 646d5da

File tree

1 file changed

+14
-14
lines changed

1 file changed

+14
-14
lines changed

activejob/test/cases/test_helper_test.rb

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -584,7 +584,7 @@ def test_assert_enqueued_with_failure
584584
end
585585
end
586586

587-
assert_match(/No enqueued job found with {:job=>NestedJob, :queue=>"low"}/, error.message)
587+
assert_match("No enqueued job found with #{{ job: NestedJob, queue: "low" }}", error.message)
588588
end
589589

590590
def test_assert_enqueued_with_with_no_block_failure
@@ -598,7 +598,7 @@ def test_assert_enqueued_with_with_no_block_failure
598598
assert_enqueued_with(job: NestedJob, queue: "low")
599599
end
600600

601-
assert_match(/No enqueued job found with {:job=>NestedJob, :queue=>"low"}/, error.message)
601+
assert_match("No enqueued job found with #{{ job: NestedJob, queue: "low" }}", error.message)
602602
end
603603

604604
def test_assert_enqueued_with_args
@@ -736,8 +736,8 @@ def test_assert_enqueued_with_failure_with_global_id_args
736736
end
737737
end
738738

739-
assert_match(/No enqueued job found with {:job=>HelloJob, :args=>\[#{wilma.inspect}\]}/, error.message)
740-
assert_match(/Potential matches: {.*?:job=>HelloJob, :args=>\[#<Person.* @id="9">\], :queue=>"default".*?}/, error.message)
739+
assert_match("No enqueued job found with #{{ job: HelloJob, args: [wilma] }}", error.message)
740+
assert_match(/Potential matches:.*Person.* @id="9"/, error.message)
741741
end
742742

743743
def test_show_jobs_that_are_enqueued_when_job_is_not_queued_at_all
@@ -750,7 +750,7 @@ def test_show_jobs_that_are_enqueued_when_job_is_not_queued_at_all
750750
end
751751
end
752752

753-
assert_match(/No enqueued job found with {:job=>MultipleKwargsJob, :args=>\[#{wilma.inspect}\]}/, error.message)
753+
assert_match("No enqueued job found with #{{ job: MultipleKwargsJob, args: [wilma] }}", error.message)
754754
assert_match(/No jobs of class MultipleKwargsJob were enqueued, job classes enqueued: HelloJob/, error.message)
755755
end
756756

@@ -760,7 +760,7 @@ def test_shows_no_jobs_enqueued_when_there_are_no_jobs
760760
end
761761
end
762762

763-
assert_match(/No enqueued job found with {:job=>HelloJob, :args=>\[\]}/, error.message)
763+
assert_match("No enqueued job found with #{{ job: HelloJob, args: [] }}", error.message)
764764
assert_match(/No jobs were enqueued/, error.message)
765765
end
766766

@@ -772,8 +772,8 @@ def test_assert_enqueued_with_failure_with_no_block_with_global_id_args
772772
assert_enqueued_with(job: HelloJob, args: [wilma])
773773
end
774774

775-
assert_match(/No enqueued job found with {:job=>HelloJob, :args=>\[#{wilma.inspect}\]}/, error.message)
776-
assert_match(/Potential matches: {.*?:job=>HelloJob, :args=>\[#<Person.* @id="9">\], :queue=>"default".*?}/, error.message)
775+
assert_match("No enqueued job found with #{{ job: HelloJob, args: [wilma] }}", error.message)
776+
assert_match(/Potential matches: {.*?HelloJob,.*\[#<Person.* @id="9">\].*?}/, error.message)
777777
end
778778

779779
def test_assert_enqueued_with_does_not_change_jobs_count
@@ -2027,8 +2027,8 @@ def test_assert_performed_with_failure_with_global_id_args
20272027
HelloJob.perform_later(ricardo)
20282028
end
20292029
end
2030-
assert_match(/No performed job found with {:job=>HelloJob, :args=>\[#{wilma.inspect}\]}/, error.message)
2031-
assert_match(/Potential matches: {.*?:job=>HelloJob, :args=>\[#<Person.* @id="9">\], :queue=>"default".*?}/, error.message)
2030+
assert_match("No performed job found with #{{ job: HelloJob, args: [wilma] }}", error.message)
2031+
assert_match(/Potential matches:.*Person.* @id="9"/, error.message)
20322032
end
20332033

20342034
def test_assert_performed_with_without_block_failure_with_global_id_args
@@ -2040,16 +2040,16 @@ def test_assert_performed_with_without_block_failure_with_global_id_args
20402040
assert_performed_with(job: HelloJob, args: [wilma])
20412041
end
20422042

2043-
assert_match(/No performed job found with {:job=>HelloJob, :args=>\[#{wilma.inspect}\]}/, error.message)
2044-
assert_match(/Potential matches: {.*?:job=>HelloJob, :args=>\[#<Person.* @id="9">\], :queue=>"default".*?}/, error.message)
2043+
assert_match("No performed job found with #{{ job: HelloJob, args: [wilma] }}", error.message)
2044+
assert_match(/Potential matches:.*Person.* @id="9"/, error.message)
20452045
end
20462046

20472047
def test_assert_performed_says_no_jobs_performed
20482048
error = assert_raise ActiveSupport::TestCase::Assertion do
20492049
assert_performed_with(job: HelloJob, args: [])
20502050
end
20512051

2052-
assert_match(/No performed job found with {:job=>HelloJob, :args=>\[\]}/, error.message)
2052+
assert_match("No performed job found with #{{ job: HelloJob, args: [] }}", error.message)
20532053
assert_match(/No jobs were performed/, error.message)
20542054
end
20552055

@@ -2062,7 +2062,7 @@ def test_assert_performed_when_not_matching_the_class_shows_alteratives
20622062
assert_performed_with(job: MultipleKwargsJob, args: [wilma])
20632063
end
20642064

2065-
assert_match(/No performed job found with {:job=>MultipleKwargsJob, :args=>\[#<Person.* @id=11>\]}/, error.message)
2065+
assert_match(/No performed job found with .*MultipleKwargsJob.*\[#<Person.* @id=11>\]}/, error.message)
20662066
assert_match(/No jobs of class MultipleKwargsJob were performed, job classes performed: HelloJob/, error.message)
20672067
end
20682068

0 commit comments

Comments
 (0)