From fda1863e1a8c120294c56482631d8254ad6125ff Mon Sep 17 00:00:00 2001 From: Daniel Colson Date: Thu, 25 Jan 2018 18:57:25 -0500 Subject: Remove extra whitespace --- .../has_and_belongs_to_many_associations_test.rb | 14 +++++------ .../associations/has_many_associations_test.rb | 28 +++++++++++----------- .../associations/has_one_associations_test.rb | 2 +- .../test/cases/associations/join_model_test.rb | 6 ++--- activerecord/test/cases/enum_test.rb | 8 +++---- activerecord/test/cases/nested_attributes_test.rb | 4 ++-- activerecord/test/cases/persistence_test.rb | 2 +- activerecord/test/cases/relations_test.rb | 28 +++++++++++----------- 8 files changed, 46 insertions(+), 46 deletions(-) (limited to 'activerecord') diff --git a/activerecord/test/cases/associations/has_and_belongs_to_many_associations_test.rb b/activerecord/test/cases/associations/has_and_belongs_to_many_associations_test.rb index 54ec9be684..d9e05cf7e2 100644 --- a/activerecord/test/cases/associations/has_and_belongs_to_many_associations_test.rb +++ b/activerecord/test/cases/associations/has_and_belongs_to_many_associations_test.rb @@ -367,14 +367,14 @@ class HasAndBelongsToManyAssociationsTest < ActiveRecord::TestCase # in Oracle '' is saved as null therefore need to save ' ' in not null column post = categories(:general).post_with_conditions.build(body: " ") - assert post.save - assert_equal "Yet Another Testing Title", post.title + assert post.save + assert_equal "Yet Another Testing Title", post.title # in Oracle '' is saved as null therefore need to save ' ' in not null column another_post = categories(:general).post_with_conditions.create(body: " ") - assert_predicate another_post, :persisted? - assert_equal "Yet Another Testing Title", another_post.title + assert_predicate another_post, :persisted? + assert_equal "Yet Another Testing Title", another_post.title end def test_distinct_after_the_fact @@ -557,18 +557,18 @@ class HasAndBelongsToManyAssociationsTest < ActiveRecord::TestCase developer = project.developers.first project.reload - assert_not_predicate project.developers, :loaded? + assert_not_predicate project.developers, :loaded? assert_queries(1) do assert_includes project.developers, developer end - assert_not_predicate project.developers, :loaded? + assert_not_predicate project.developers, :loaded? end def test_include_returns_false_for_non_matching_record_to_verify_scoping project = projects(:active_record) developer = Developer.create name: "Bryan", salary: 50_000 - assert_not_predicate project.developers, :loaded? + assert_not_predicate project.developers, :loaded? assert ! project.developers.include?(developer) end diff --git a/activerecord/test/cases/associations/has_many_associations_test.rb b/activerecord/test/cases/associations/has_many_associations_test.rb index b506280d4e..9ee42cef0f 100644 --- a/activerecord/test/cases/associations/has_many_associations_test.rb +++ b/activerecord/test/cases/associations/has_many_associations_test.rb @@ -713,13 +713,13 @@ class HasManyAssociationsTest < ActiveRecord::TestCase def test_find_each firm = companies(:first_firm) - assert_not_predicate firm.clients, :loaded? + assert_not_predicate firm.clients, :loaded? assert_queries(4) do firm.clients.find_each(batch_size: 1) { |c| assert_equal firm.id, c.firm_id } end - assert_not_predicate firm.clients, :loaded? + assert_not_predicate firm.clients, :loaded? end def test_find_each_with_conditions @@ -732,13 +732,13 @@ class HasManyAssociationsTest < ActiveRecord::TestCase end end - assert_not_predicate firm.clients, :loaded? + assert_not_predicate firm.clients, :loaded? end def test_find_in_batches firm = companies(:first_firm) - assert_not_predicate firm.clients, :loaded? + assert_not_predicate firm.clients, :loaded? assert_queries(2) do firm.clients.find_in_batches(batch_size: 2) do |clients| @@ -746,7 +746,7 @@ class HasManyAssociationsTest < ActiveRecord::TestCase end end - assert_not_predicate firm.clients, :loaded? + assert_not_predicate firm.clients, :loaded? end def test_find_all_sanitized @@ -1441,13 +1441,13 @@ class HasManyAssociationsTest < ActiveRecord::TestCase def test_creation_respects_hash_condition ms_client = companies(:first_firm).clients_like_ms_with_hash_conditions.build - assert ms_client.save - assert_equal "Microsoft", ms_client.name + assert ms_client.save + assert_equal "Microsoft", ms_client.name another_ms_client = companies(:first_firm).clients_like_ms_with_hash_conditions.create - assert_predicate another_ms_client, :persisted? - assert_equal "Microsoft", another_ms_client.name + assert_predicate another_ms_client, :persisted? + assert_equal "Microsoft", another_ms_client.name end def test_clearing_without_initial_access @@ -1869,18 +1869,18 @@ class HasManyAssociationsTest < ActiveRecord::TestCase client = firm.clients.first firm.reload - assert_not_predicate firm.clients, :loaded? + assert_not_predicate firm.clients, :loaded? assert_queries(1) do assert_equal true, firm.clients.include?(client) end - assert_not_predicate firm.clients, :loaded? + assert_not_predicate firm.clients, :loaded? end def test_include_returns_false_for_non_matching_record_to_verify_scoping firm = companies(:first_firm) client = Client.create!(name: "Not Associated") - assert_not_predicate firm.clients, :loaded? + assert_not_predicate firm.clients, :loaded? assert_equal false, firm.clients.include?(client) end @@ -2055,7 +2055,7 @@ class HasManyAssociationsTest < ActiveRecord::TestCase def test_calling_one_should_return_false_if_zero firm = companies(:another_firm) - assert_not_predicate firm.clients_like_ms, :one? + assert_not_predicate firm.clients_like_ms, :one? assert_equal 0, firm.clients_like_ms.size end @@ -2067,7 +2067,7 @@ class HasManyAssociationsTest < ActiveRecord::TestCase def test_calling_one_should_return_false_if_more_than_one firm = companies(:first_firm) - assert_not_predicate firm.clients, :one? + assert_not_predicate firm.clients, :one? assert_equal 3, firm.clients.size end diff --git a/activerecord/test/cases/associations/has_one_associations_test.rb b/activerecord/test/cases/associations/has_one_associations_test.rb index 60b599d968..1a213ef7e4 100644 --- a/activerecord/test/cases/associations/has_one_associations_test.rb +++ b/activerecord/test/cases/associations/has_one_associations_test.rb @@ -433,7 +433,7 @@ class HasOneAssociationsTest < ActiveRecord::TestCase def test_create_respects_hash_condition account = companies(:first_firm).create_account_limit_500_with_hash_conditions - assert_predicate account, :persisted? + assert_predicate account, :persisted? assert_equal 500, account.credit_limit end diff --git a/activerecord/test/cases/associations/join_model_test.rb b/activerecord/test/cases/associations/join_model_test.rb index 1f231cb9f1..f19a9f5f7a 100644 --- a/activerecord/test/cases/associations/join_model_test.rb +++ b/activerecord/test/cases/associations/join_model_test.rb @@ -720,18 +720,18 @@ class AssociationsJoinModelTest < ActiveRecord::TestCase category = david.categories.first david.reload - assert_not_predicate david.categories, :loaded? + assert_not_predicate david.categories, :loaded? assert_queries(1) do assert_includes david.categories, category end - assert_not_predicate david.categories, :loaded? + assert_not_predicate david.categories, :loaded? end def test_has_many_through_include_returns_false_for_non_matching_record_to_verify_scoping david = authors(:david) category = Category.create!(name: "Not Associated") - assert_not_predicate david.categories, :loaded? + assert_not_predicate david.categories, :loaded? assert ! david.categories.include?(category) end diff --git a/activerecord/test/cases/enum_test.rb b/activerecord/test/cases/enum_test.rb index 336592c43b..d5a1d11e12 100644 --- a/activerecord/test/cases/enum_test.rb +++ b/activerecord/test/cases/enum_test.rb @@ -453,7 +453,7 @@ class EnumTest < ActiveRecord::TestCase end test "query state by predicate with custom suffix" do - assert_predicate @book, :medium_to_read? + assert_predicate @book, :medium_to_read? assert_not_predicate @book, :easy_to_read? assert_not_predicate @book, :hard_to_read? end @@ -475,18 +475,18 @@ class EnumTest < ActiveRecord::TestCase test "update enum attributes with custom suffix" do @book.medium_to_read! assert_not_predicate @book, :easy_to_read? - assert_predicate @book, :medium_to_read? + assert_predicate @book, :medium_to_read? assert_not_predicate @book, :hard_to_read? @book.easy_to_read! - assert_predicate @book, :easy_to_read? + assert_predicate @book, :easy_to_read? assert_not_predicate @book, :medium_to_read? assert_not_predicate @book, :hard_to_read? @book.hard_to_read! assert_not_predicate @book, :easy_to_read? assert_not_predicate @book, :medium_to_read? - assert_predicate @book, :hard_to_read? + assert_predicate @book, :hard_to_read? end test "uses default status when no status is provided in fixtures" do diff --git a/activerecord/test/cases/nested_attributes_test.rb b/activerecord/test/cases/nested_attributes_test.rb index dd3d84aa53..1ed3a61bbb 100644 --- a/activerecord/test/cases/nested_attributes_test.rb +++ b/activerecord/test/cases/nested_attributes_test.rb @@ -632,10 +632,10 @@ module NestedAttributesOnACollectionAssociationTests def test_should_not_load_association_when_updating_existing_records @pirate.reload @pirate.send(association_setter, [{ id: @child_1.id, name: "Grace OMalley" }]) - assert_not_predicate @pirate.send(@association_name), :loaded? + assert_not_predicate @pirate.send(@association_name), :loaded? @pirate.save - assert_not_predicate @pirate.send(@association_name), :loaded? + assert_not_predicate @pirate.send(@association_name), :loaded? assert_equal "Grace OMalley", @child_1.reload.name end diff --git a/activerecord/test/cases/persistence_test.rb b/activerecord/test/cases/persistence_test.rb index daccd9da05..e8052914d4 100644 --- a/activerecord/test/cases/persistence_test.rb +++ b/activerecord/test/cases/persistence_test.rb @@ -217,7 +217,7 @@ class PersistenceTest < ActiveRecord::TestCase def test_destroy_all conditions = "author_name = 'Mary'" topics_by_mary = Topic.all.merge!(where: conditions, order: "id").to_a - assert_not_empty topics_by_mary + assert_not_empty topics_by_mary assert_difference("Topic.count", -topics_by_mary.size) do destroyed = Topic.where(conditions).destroy_all.sort_by(&:id) diff --git a/activerecord/test/cases/relations_test.rb b/activerecord/test/cases/relations_test.rb index f83916c588..bc7c54dbe0 100644 --- a/activerecord/test/cases/relations_test.rb +++ b/activerecord/test/cases/relations_test.rb @@ -108,7 +108,7 @@ class RelationTest < ActiveRecord::TestCase 2.times { assert_equal "The First Topic", topics.first.title } end - assert_not_predicate topics, :loaded? + assert_not_predicate topics, :loaded? end def test_loaded_first @@ -875,7 +875,7 @@ class RelationTest < ActiveRecord::TestCase davids = Author.where(name: "David") assert_difference("Author.count", -1) { davids.delete_all } - assert_not_predicate davids, :loaded? + assert_not_predicate davids, :loaded? end def test_delete_all_loaded @@ -1006,7 +1006,7 @@ class RelationTest < ActiveRecord::TestCase posts = Post.all assert_queries(1) { assert_equal 11, posts.size } - assert_not_predicate posts, :loaded? + assert_not_predicate posts, :loaded? best_posts = posts.where(comments_count: 0) best_posts.load # force load @@ -1017,7 +1017,7 @@ class RelationTest < ActiveRecord::TestCase posts = Post.limit(10) assert_queries(1) { assert_equal 10, posts.size } - assert_not_predicate posts, :loaded? + assert_not_predicate posts, :loaded? best_posts = posts.where(comments_count: 0) best_posts.load # force load @@ -1028,7 +1028,7 @@ class RelationTest < ActiveRecord::TestCase posts = Post.limit(0) assert_no_queries { assert_equal 0, posts.size } - assert_not_predicate posts, :loaded? + assert_not_predicate posts, :loaded? posts.load # force load assert_no_queries { assert_equal 0, posts.size } @@ -1038,7 +1038,7 @@ class RelationTest < ActiveRecord::TestCase posts = Post.limit(0) assert_no_queries { assert_equal true, posts.empty? } - assert_not_predicate posts, :loaded? + assert_not_predicate posts, :loaded? end def test_count_complex_chained_relations @@ -1052,11 +1052,11 @@ class RelationTest < ActiveRecord::TestCase posts = Post.all assert_queries(1) { assert_equal false, posts.empty? } - assert_not_predicate posts, :loaded? + assert_not_predicate posts, :loaded? no_posts = posts.where(title: "") assert_queries(1) { assert_equal true, no_posts.empty? } - assert_not_predicate no_posts, :loaded? + assert_not_predicate no_posts, :loaded? best_posts = posts.where(comments_count: 0) best_posts.load # force load @@ -1067,11 +1067,11 @@ class RelationTest < ActiveRecord::TestCase posts = Post.select("comments_count").where("id is not null").group("author_id").where("comments_count > 0") assert_queries(1) { assert_equal false, posts.empty? } - assert_not_predicate posts, :loaded? + assert_not_predicate posts, :loaded? no_posts = posts.where(title: "") assert_queries(1) { assert_equal true, no_posts.empty? } - assert_not_predicate no_posts, :loaded? + assert_not_predicate no_posts, :loaded? end def test_any @@ -1087,7 +1087,7 @@ class RelationTest < ActiveRecord::TestCase assert_queries(3) do assert posts.any? # Uses COUNT() - assert_not_predicate posts.where(id: nil), :any? + assert_not_predicate posts.where(id: nil), :any? assert posts.any? { |p| p.id > 0 } assert ! posts.any? { |p| p.id <= 0 } @@ -1112,7 +1112,7 @@ class RelationTest < ActiveRecord::TestCase posts = Post.all assert_predicate posts, :many? - assert_not_predicate posts.limit(1), :many? + assert_not_predicate posts.limit(1), :many? end def test_none? @@ -1121,7 +1121,7 @@ class RelationTest < ActiveRecord::TestCase assert ! posts.none? # Uses COUNT() end - assert_not_predicate posts, :loaded? + assert_not_predicate posts, :loaded? assert_queries(1) do assert posts.none? { |p| p.id < 0 } @@ -1137,7 +1137,7 @@ class RelationTest < ActiveRecord::TestCase assert ! posts.one? # Uses COUNT() end - assert_not_predicate posts, :loaded? + assert_not_predicate posts, :loaded? assert_queries(1) do assert ! posts.one? { |p| p.id < 3 } -- cgit v1.2.3