Merge pull request #41973 from jbampton/fix-spelling
chore: fix spelling
This commit is contained in:
commit
ac170aa8a7
@ -72,7 +72,7 @@ class PostgresqlInfinity < ActiveRecord::Base
|
||||
|
||||
test "assigning 'infinity' on a datetime column with TZ aware attributes" do
|
||||
in_time_zone "Pacific Time (US & Canada)" do
|
||||
# reset_column_information should be called to recrate types with TimeZoneConverter
|
||||
# reset_column_information should be called to recreate types with TimeZoneConverter
|
||||
PostgresqlInfinity.reset_column_information
|
||||
|
||||
record = PostgresqlInfinity.create!(datetime: "infinity")
|
||||
|
@ -327,7 +327,7 @@ def test_child_instance_should_be_shared_with_replaced_via_accessor_parent
|
||||
assert_equal face, human.face
|
||||
assert_equal face.description, human.face.description, "Description of the face should be the same before changes to child instance"
|
||||
face.description = "Bongo"
|
||||
assert_equal face.description, human.face.description, "Description of the face should be the same after changes to chield instance"
|
||||
assert_equal face.description, human.face.description, "Description of the face should be the same after changes to child instance"
|
||||
human.face.description = "Mungo"
|
||||
assert_equal face.description, human.face.description, "Description of the face should be the same after changes to replaced-parent-owned instance"
|
||||
end
|
||||
|
@ -30,26 +30,26 @@ class LoadAsyncTest < ActiveRecord::TestCase
|
||||
fixtures :posts, :comments
|
||||
|
||||
def test_scheduled?
|
||||
defered_posts = Post.where(author_id: 1).load_async
|
||||
deferred_posts = Post.where(author_id: 1).load_async
|
||||
if in_memory_db?
|
||||
assert_not_predicate defered_posts, :scheduled?
|
||||
assert_not_predicate deferred_posts, :scheduled?
|
||||
else
|
||||
assert_predicate defered_posts, :scheduled?
|
||||
assert_predicate deferred_posts, :scheduled?
|
||||
end
|
||||
assert_predicate defered_posts, :loaded?
|
||||
defered_posts.to_a
|
||||
assert_not_predicate defered_posts, :scheduled?
|
||||
assert_predicate deferred_posts, :loaded?
|
||||
deferred_posts.to_a
|
||||
assert_not_predicate deferred_posts, :scheduled?
|
||||
end
|
||||
|
||||
def test_reset
|
||||
defered_posts = Post.where(author_id: 1).load_async
|
||||
deferred_posts = Post.where(author_id: 1).load_async
|
||||
if in_memory_db?
|
||||
assert_not_predicate defered_posts, :scheduled?
|
||||
assert_not_predicate deferred_posts, :scheduled?
|
||||
else
|
||||
assert_predicate defered_posts, :scheduled?
|
||||
assert_predicate deferred_posts, :scheduled?
|
||||
end
|
||||
defered_posts.reset
|
||||
assert_not_predicate defered_posts, :scheduled?
|
||||
deferred_posts.reset
|
||||
assert_not_predicate deferred_posts, :scheduled?
|
||||
end
|
||||
|
||||
def test_notification_forwarding
|
||||
@ -65,9 +65,9 @@ def test_notification_forwarding
|
||||
end
|
||||
end
|
||||
|
||||
defered_posts = wait_for_async_query(Post.where(author_id: 1).load_async)
|
||||
deferred_posts = wait_for_async_query(Post.where(author_id: 1).load_async)
|
||||
|
||||
assert_equal expected_records, defered_posts.to_a
|
||||
assert_equal expected_records, deferred_posts.to_a
|
||||
assert_equal Post.connection.supports_concurrent_connections?, status[:async]
|
||||
assert_equal Thread.current.object_id, status[:thread_id]
|
||||
ensure
|
||||
@ -86,9 +86,9 @@ def test_simple_query
|
||||
end
|
||||
end
|
||||
|
||||
defered_posts = wait_for_async_query(Post.where(author_id: 1).load_async)
|
||||
deferred_posts = wait_for_async_query(Post.where(author_id: 1).load_async)
|
||||
|
||||
assert_equal expected_records, defered_posts.to_a
|
||||
assert_equal expected_records, deferred_posts.to_a
|
||||
assert_equal Post.connection.supports_concurrent_connections?, status[:async]
|
||||
ensure
|
||||
ActiveSupport::Notifications.unsubscribe(subscriber) if subscriber
|
||||
@ -124,17 +124,17 @@ def test_eager_loading_query
|
||||
end
|
||||
end
|
||||
|
||||
defered_posts = wait_for_async_query(Post.where(author_id: 1).eager_load(:comments).load_async)
|
||||
deferred_posts = wait_for_async_query(Post.where(author_id: 1).eager_load(:comments).load_async)
|
||||
|
||||
if in_memory_db?
|
||||
assert_not_predicate defered_posts, :scheduled?
|
||||
assert_not_predicate deferred_posts, :scheduled?
|
||||
else
|
||||
assert_predicate defered_posts, :scheduled?
|
||||
assert_predicate deferred_posts, :scheduled?
|
||||
end
|
||||
|
||||
assert_equal expected_records, defered_posts.to_a
|
||||
assert_equal expected_records, deferred_posts.to_a
|
||||
assert_queries(0) do
|
||||
defered_posts.each(&:comments)
|
||||
deferred_posts.each(&:comments)
|
||||
end
|
||||
assert_equal Post.connection.supports_concurrent_connections?, status[:async]
|
||||
ensure
|
||||
@ -157,17 +157,17 @@ def test_pluck
|
||||
def test_size
|
||||
expected_size = Post.where(author_id: 1).size
|
||||
|
||||
defered_posts = Post.where(author_id: 1).load_async
|
||||
deferred_posts = Post.where(author_id: 1).load_async
|
||||
|
||||
assert_equal expected_size, defered_posts.size
|
||||
assert_predicate defered_posts, :loaded?
|
||||
assert_equal expected_size, deferred_posts.size
|
||||
assert_predicate deferred_posts, :loaded?
|
||||
end
|
||||
|
||||
def test_empty?
|
||||
defered_posts = Post.where(author_id: 1).load_async
|
||||
deferred_posts = Post.where(author_id: 1).load_async
|
||||
|
||||
assert_equal false, defered_posts.empty?
|
||||
assert_predicate defered_posts, :loaded?
|
||||
assert_equal false, deferred_posts.empty?
|
||||
assert_predicate deferred_posts, :loaded?
|
||||
end
|
||||
end
|
||||
|
||||
@ -189,18 +189,18 @@ def teardown
|
||||
end
|
||||
|
||||
def test_scheduled?
|
||||
defered_posts = Post.where(author_id: 1).load_async
|
||||
assert_not_predicate defered_posts, :scheduled?
|
||||
assert_predicate defered_posts, :loaded?
|
||||
defered_posts.to_a
|
||||
assert_not_predicate defered_posts, :scheduled?
|
||||
deferred_posts = Post.where(author_id: 1).load_async
|
||||
assert_not_predicate deferred_posts, :scheduled?
|
||||
assert_predicate deferred_posts, :loaded?
|
||||
deferred_posts.to_a
|
||||
assert_not_predicate deferred_posts, :scheduled?
|
||||
end
|
||||
|
||||
def test_reset
|
||||
defered_posts = Post.where(author_id: 1).load_async
|
||||
assert_not_predicate defered_posts, :scheduled?
|
||||
defered_posts.reset
|
||||
assert_not_predicate defered_posts, :scheduled?
|
||||
deferred_posts = Post.where(author_id: 1).load_async
|
||||
assert_not_predicate deferred_posts, :scheduled?
|
||||
deferred_posts.reset
|
||||
assert_not_predicate deferred_posts, :scheduled?
|
||||
end
|
||||
|
||||
def test_simple_query
|
||||
@ -215,9 +215,9 @@ def test_simple_query
|
||||
end
|
||||
end
|
||||
|
||||
defered_posts = Post.where(author_id: 1).load_async
|
||||
deferred_posts = Post.where(author_id: 1).load_async
|
||||
|
||||
assert_equal expected_records, defered_posts.to_a
|
||||
assert_equal expected_records, deferred_posts.to_a
|
||||
assert_not_equal Post.connection.supports_concurrent_connections?, status[:async]
|
||||
ensure
|
||||
ActiveSupport::Notifications.unsubscribe(subscriber) if subscriber
|
||||
@ -249,13 +249,13 @@ def test_eager_loading_query
|
||||
end
|
||||
end
|
||||
|
||||
defered_posts = Post.where(author_id: 1).eager_load(:comments).load_async
|
||||
deferred_posts = Post.where(author_id: 1).eager_load(:comments).load_async
|
||||
|
||||
assert_not_predicate defered_posts, :scheduled?
|
||||
assert_not_predicate deferred_posts, :scheduled?
|
||||
|
||||
assert_equal expected_records, defered_posts.to_a
|
||||
assert_equal expected_records, deferred_posts.to_a
|
||||
assert_queries(0) do
|
||||
defered_posts.each(&:comments)
|
||||
deferred_posts.each(&:comments)
|
||||
end
|
||||
|
||||
assert_predicate Post.connection, :supports_concurrent_connections?
|
||||
@ -280,17 +280,17 @@ def test_pluck
|
||||
def test_size
|
||||
expected_size = Post.where(author_id: 1).size
|
||||
|
||||
defered_posts = Post.where(author_id: 1).load_async
|
||||
deferred_posts = Post.where(author_id: 1).load_async
|
||||
|
||||
assert_equal expected_size, defered_posts.size
|
||||
assert_predicate defered_posts, :loaded?
|
||||
assert_equal expected_size, deferred_posts.size
|
||||
assert_predicate deferred_posts, :loaded?
|
||||
end
|
||||
|
||||
def test_empty?
|
||||
defered_posts = Post.where(author_id: 1).load_async
|
||||
deferred_posts = Post.where(author_id: 1).load_async
|
||||
|
||||
assert_equal false, defered_posts.empty?
|
||||
assert_predicate defered_posts, :loaded?
|
||||
assert_equal false, deferred_posts.empty?
|
||||
assert_predicate deferred_posts, :loaded?
|
||||
end
|
||||
end
|
||||
|
||||
@ -324,18 +324,18 @@ def teardown
|
||||
end
|
||||
|
||||
def test_scheduled?
|
||||
defered_posts = Post.where(author_id: 1).load_async
|
||||
assert_predicate defered_posts, :scheduled?
|
||||
assert_predicate defered_posts, :loaded?
|
||||
defered_posts.to_a
|
||||
assert_not_predicate defered_posts, :scheduled?
|
||||
deferred_posts = Post.where(author_id: 1).load_async
|
||||
assert_predicate deferred_posts, :scheduled?
|
||||
assert_predicate deferred_posts, :loaded?
|
||||
deferred_posts.to_a
|
||||
assert_not_predicate deferred_posts, :scheduled?
|
||||
end
|
||||
|
||||
def test_reset
|
||||
defered_posts = Post.where(author_id: 1).load_async
|
||||
assert_predicate defered_posts, :scheduled?
|
||||
defered_posts.reset
|
||||
assert_not_predicate defered_posts, :scheduled?
|
||||
deferred_posts = Post.where(author_id: 1).load_async
|
||||
assert_predicate deferred_posts, :scheduled?
|
||||
deferred_posts.reset
|
||||
assert_not_predicate deferred_posts, :scheduled?
|
||||
end
|
||||
|
||||
def test_simple_query
|
||||
@ -349,9 +349,9 @@ def test_simple_query
|
||||
end
|
||||
end
|
||||
|
||||
defered_posts = wait_for_async_query(Post.where(author_id: 1).load_async)
|
||||
deferred_posts = wait_for_async_query(Post.where(author_id: 1).load_async)
|
||||
|
||||
assert_equal expected_records, defered_posts.to_a
|
||||
assert_equal expected_records, deferred_posts.to_a
|
||||
assert_equal Post.connection.supports_concurrent_connections?, status[:async]
|
||||
ensure
|
||||
ActiveSupport::Notifications.unsubscribe(subscriber) if subscriber
|
||||
@ -382,13 +382,13 @@ def test_eager_loading_query
|
||||
end
|
||||
end
|
||||
|
||||
defered_posts = wait_for_async_query(Post.where(author_id: 1).eager_load(:comments).load_async)
|
||||
deferred_posts = wait_for_async_query(Post.where(author_id: 1).eager_load(:comments).load_async)
|
||||
|
||||
assert_predicate defered_posts, :scheduled?
|
||||
assert_predicate deferred_posts, :scheduled?
|
||||
|
||||
assert_equal expected_records, defered_posts.to_a
|
||||
assert_equal expected_records, deferred_posts.to_a
|
||||
assert_queries(0) do
|
||||
defered_posts.each(&:comments)
|
||||
deferred_posts.each(&:comments)
|
||||
end
|
||||
assert_equal Post.connection.supports_concurrent_connections?, status[:async]
|
||||
ensure
|
||||
@ -411,17 +411,17 @@ def test_pluck
|
||||
def test_size
|
||||
expected_size = Post.where(author_id: 1).size
|
||||
|
||||
defered_posts = Post.where(author_id: 1).load_async
|
||||
deferred_posts = Post.where(author_id: 1).load_async
|
||||
|
||||
assert_equal expected_size, defered_posts.size
|
||||
assert_predicate defered_posts, :loaded?
|
||||
assert_equal expected_size, deferred_posts.size
|
||||
assert_predicate deferred_posts, :loaded?
|
||||
end
|
||||
|
||||
def test_empty?
|
||||
defered_posts = Post.where(author_id: 1).load_async
|
||||
deferred_posts = Post.where(author_id: 1).load_async
|
||||
|
||||
assert_equal false, defered_posts.empty?
|
||||
assert_predicate defered_posts, :loaded?
|
||||
assert_equal false, deferred_posts.empty?
|
||||
assert_predicate deferred_posts, :loaded?
|
||||
end
|
||||
end
|
||||
|
||||
@ -458,15 +458,15 @@ def teardown
|
||||
end
|
||||
|
||||
def test_scheduled?
|
||||
defered_posts = Post.where(author_id: 1).load_async
|
||||
assert_predicate defered_posts, :scheduled?
|
||||
assert_predicate defered_posts, :loaded?
|
||||
defered_posts.to_a
|
||||
assert_not_predicate defered_posts, :scheduled?
|
||||
deferred_posts = Post.where(author_id: 1).load_async
|
||||
assert_predicate deferred_posts, :scheduled?
|
||||
assert_predicate deferred_posts, :loaded?
|
||||
deferred_posts.to_a
|
||||
assert_not_predicate deferred_posts, :scheduled?
|
||||
|
||||
defered_dogs = OtherDog.where(id: 1).load_async
|
||||
assert_not_predicate defered_dogs, :scheduled?
|
||||
assert_predicate defered_dogs, :loaded?
|
||||
deferred_dogs = OtherDog.where(id: 1).load_async
|
||||
assert_not_predicate deferred_dogs, :scheduled?
|
||||
assert_predicate deferred_dogs, :loaded?
|
||||
end
|
||||
|
||||
def test_simple_query
|
||||
@ -488,14 +488,14 @@ def test_simple_query
|
||||
end
|
||||
end
|
||||
|
||||
defered_posts = Post.where(author_id: 1).load_async
|
||||
defered_dogs = OtherDog.where(id: 1).load_async
|
||||
deferred_posts = Post.where(author_id: 1).load_async
|
||||
deferred_dogs = OtherDog.where(id: 1).load_async
|
||||
|
||||
wait_for_async_query(defered_posts)
|
||||
wait_for_async_query(defered_dogs)
|
||||
wait_for_async_query(deferred_posts)
|
||||
wait_for_async_query(deferred_dogs)
|
||||
|
||||
assert_equal expected_records, defered_posts.to_a
|
||||
assert_equal expected_dogs, defered_dogs.to_a
|
||||
assert_equal expected_records, deferred_posts.to_a
|
||||
assert_equal expected_dogs, deferred_dogs.to_a
|
||||
|
||||
assert_equal Post.connection.async_enabled?, status[:async]
|
||||
assert_equal OtherDog.connection.async_enabled?, dog_status[:async]
|
||||
|
Loading…
Reference in New Issue
Block a user