composite_primary_keys 12.0.10 → 13.0.3

data/test/test_equal.rb

@@ -1,26 +1,26 @@
-require File.expand_path('../abstract_unit', __FILE__)
-
-class TestEqual < ActiveSupport::TestCase
-  fixtures :capitols
-
-  def test_new
-    assert_equal(Capitol.new, Capitol.new)
-  end
-
-  def test_same_new
-    it = Capitol.new
-    assert_equal(it, it)
-  end
-
-  def test_same
-    first = Capitol.find(['Canada', 'Ottawa'])
-    second = Capitol.find(['Canada', 'Ottawa'])
-    assert_equal(first, second)
-  end
-
-  def test_different
-    first = Capitol.find(['Mexico', 'Mexico City'])
-    second = Capitol.find(['Canada', 'Ottawa'])
-    assert_not_equal(first, second)
-  end
-end
+require File.expand_path('../abstract_unit', __FILE__)
+
+class TestEqual < ActiveSupport::TestCase
+  fixtures :capitols
+
+  def test_new
+    assert_equal(Capitol.new, Capitol.new)
+  end
+
+  def test_same_new
+    it = Capitol.new
+    assert_equal(it, it)
+  end
+
+  def test_same
+    first = Capitol.find(['Canada', 'Ottawa'])
+    second = Capitol.find(['Canada', 'Ottawa'])
+    assert_equal(first, second)
+  end
+
+  def test_different
+    first = Capitol.find(['Mexico', 'Mexico City'])
+    second = Capitol.find(['Canada', 'Ottawa'])
+    assert_not_equal(first, second)
+  end
+end

data/test/test_find.rb

@@ -129,13 +129,19 @@ class TestFind < ActiveSupport::TestCase
   def test_find_by_all_associations
     departments = Department.all
     employees = Employee.where(:department => departments)
-    assert_equal(5, employees.to_a.count)
+    assert_equal(6, employees.to_a.count)
+  end
+
+  def test_find_by_some_associations
+    departments = Department.where(location_id: 1)
+    employees = Employee.where(:department => departments)
+    assert_equal(4, employees.to_a.count)
   end
 
   def test_expand_all
     departments = Department.all
     employees = Employee.where(:department => departments)
-    assert_equal(5, employees.count)
+    assert_equal(6, employees.count)
   end
 
   def test_find_one_with_params_id

data/test/test_habtm.rb

@@ -1,141 +1,141 @@
-require File.expand_path('../abstract_unit', __FILE__)
-
-class TestHabtm < ActiveSupport::TestCase
-  fixtures :suburbs, :restaurants, :restaurants_suburbs, :products, :groups, :employees
-
-  def test_no_cpk
-    # This test makes sure we don't break anything in standard rails by using CPK
-    groups = Group.all
-
-    # First test records
-    employee = Employee.first
-    assert_equal(0, employee.groups.length)
-    employee.groups = groups
-    employee.reload
-    assert_equal(groups, employee.groups)
-  end
-
-  def test_no_cpk_ids
-    # This test makes sure we don't break anything in standard rails by using CPK
-    groups = Group.all
-
-    employee = Employee.last
-    assert_equal(0, employee.groups.length)
-    employee.group_ids = groups.map {|group| group.id}
-    employee.group_ids = [groups.first.id]
-    employee.reload
-    assert_equal([groups.first], employee.groups)
-  end
-
-  def test_has_and_belongs_to_many
-    @restaurant = Restaurant.find([1,1])
-    assert_equal 2, @restaurant.suburbs.size
-
-    @restaurant = Restaurant.includes(:suburbs).find([1,1])
-    assert_equal 2, @restaurant.suburbs.size
-  end
-
-  def test_include_cpk_both_sides
-    # assuming the association was set up in the fixtures
-    # file restaurants_suburbs.yml
-    mcdonalds = restaurants(:mcdonalds)
-    # check positive
-    suburb = mcdonalds.suburbs[0]
-    assert mcdonalds.suburbs.include?(suburb)
-    # check negative
-    suburb_with_no_mcdonalds = suburbs(:no_mcdonalds)
-    assert !mcdonalds.suburbs.include?(suburb_with_no_mcdonalds)
-  end
-
-  def test_include_cpk_owner_side_only
-    subway = restaurants(:subway_one)
-    product = products(:first_product)
-    subway.products << product
-
-    # reload
-    # test positive
-    subway = restaurants(:subway_one)
-    assert subway.products.include?(product)
-
-    # test negative
-    product_two = products(:second_product)
-    assert !subway.products.include?(product_two)
-  end
-
-  def test_include_cpk_association_side_only
-    product = products(:first_product)
-    subway = restaurants(:subway_one)
-    product.restaurants << subway
-
-    # reload
-    # test positive
-    product = products(:first_product)
-    assert product.restaurants.include?(subway)
-
-    # test negative
-    mcdonalds = restaurants(:mcdonalds)
-    assert !product.restaurants.include?(mcdonalds)
-  end
-
-  def test_habtm_clear_cpk_both_sides
-    @restaurant = restaurants(:mcdonalds)
-    assert_equal 2, @restaurant.suburbs.size
-    @restaurant.suburbs.clear
-    assert_equal 0, @restaurant.suburbs.size
-  end
-
-  def test_habtm_clear_cpk_owner_side_only
-    subway = restaurants(:subway_one)
-    assert_equal 0, subway.products.size, 'Baseline'
-
-    first_product = products(:first_product)
-    second_product = products(:second_product)
-    subway.products << first_product << second_product
-    assert_equal 2, subway.products.size
-    subway.products.clear
-    # reload to force reload of associations
-    subway = restaurants(:subway_one)
-    assert_equal 0, subway.products.size
-  end
-
-  def test_habtm_clear_cpk_association_side_only
-    product = products(:first_product)
-    assert_equal 0, product.restaurants.size, 'Baseline'
-
-    subway_one = restaurants(:subway_one)
-    subway_two = restaurants(:subway_two)
-    product.restaurants << subway_one << subway_two
-    assert_equal 2, product.restaurants.size
-    product.restaurants.clear
-    # reload to force reload of associations
-    product = products(:first_product)
-    assert_equal 0, product.restaurants.size
-  end
-
-  # tests case reported in issue #39 where a bug resulted in
-  # deletion of incorrect join table records because the owner's id
-  # was assumed to be an array and is not in this case
-  # and evaluates to a useable but incorrect value
-  def test_habtm_clear_cpk_association_side_only_deletes_only_correct_records
-    product_one = Product.find(1)
-    product_three = Product.find(3)
-    subway_one = restaurants(:subway_one)
-    subway_two = restaurants(:subway_two)
-    product_one.restaurants << subway_one << subway_two
-    product_three.restaurants << subway_one << subway_two
-    assert_equal 2, product_one.restaurants.size
-    assert_equal 2, product_three.restaurants.size
-
-    # if product_three's id is incorrectly assumed to be
-    # an array it will be evaluated as 3[0], which is 1, which would
-    # delete product_one's associations rather than product_three's
-    product_three.restaurants.clear
-
-    # reload to force reload of associations
-    product_one = Product.find(1)
-    assert_equal(2, product_one.restaurants.size)
-
-    product_three = Product.find(3)
-    assert_equal(0, product_three.restaurants.size)
-  end
-end
+require File.expand_path('../abstract_unit', __FILE__)
+
+class TestHabtm < ActiveSupport::TestCase
+  fixtures :suburbs, :restaurants, :restaurants_suburbs, :products, :groups, :employees
+
+  def test_no_cpk
+    # This test makes sure we don't break anything in standard rails by using CPK
+    groups = Group.all
+
+    # First test records
+    employee = Employee.first
+    assert_equal(0, employee.groups.length)
+    employee.groups = groups
+    employee.reload
+    assert_equal(groups, employee.groups)
+  end
+
+  def test_no_cpk_ids
+    # This test makes sure we don't break anything in standard rails by using CPK
+    groups = Group.all
+
+    employee = Employee.last
+    assert_equal(0, employee.groups.length)
+    employee.group_ids = groups.map {|group| group.id}
+    employee.group_ids = [groups.first.id]
+    employee.reload
+    assert_equal([groups.first], employee.groups)
+  end
+
+  def test_has_and_belongs_to_many
+    @restaurant = Restaurant.find([1,1])
+    assert_equal 2, @restaurant.suburbs.size
+
+    @restaurant = Restaurant.includes(:suburbs).find([1,1])
+    assert_equal 2, @restaurant.suburbs.size
+  end
+
+  def test_include_cpk_both_sides
+    # assuming the association was set up in the fixtures
+    # file restaurants_suburbs.yml
+    mcdonalds = restaurants(:mcdonalds)
+    # check positive
+    suburb = mcdonalds.suburbs[0]
+    assert mcdonalds.suburbs.include?(suburb)
+    # check negative
+    suburb_with_no_mcdonalds = suburbs(:no_mcdonalds)
+    assert !mcdonalds.suburbs.include?(suburb_with_no_mcdonalds)
+  end
+
+  def test_include_cpk_owner_side_only
+    subway = restaurants(:subway_one)
+    product = products(:first_product)
+    subway.products << product
+
+    # reload
+    # test positive
+    subway = restaurants(:subway_one)
+    assert subway.products.include?(product)
+
+    # test negative
+    product_two = products(:second_product)
+    assert !subway.products.include?(product_two)
+  end
+
+  def test_include_cpk_association_side_only
+    product = products(:first_product)
+    subway = restaurants(:subway_one)
+    product.restaurants << subway
+
+    # reload
+    # test positive
+    product = products(:first_product)
+    assert product.restaurants.include?(subway)
+
+    # test negative
+    mcdonalds = restaurants(:mcdonalds)
+    assert !product.restaurants.include?(mcdonalds)
+  end
+
+  def test_habtm_clear_cpk_both_sides
+    @restaurant = restaurants(:mcdonalds)
+    assert_equal 2, @restaurant.suburbs.size
+    @restaurant.suburbs.clear
+    assert_equal 0, @restaurant.suburbs.size
+  end
+
+  def test_habtm_clear_cpk_owner_side_only
+    subway = restaurants(:subway_one)
+    assert_equal 0, subway.products.size, 'Baseline'
+
+    first_product = products(:first_product)
+    second_product = products(:second_product)
+    subway.products << first_product << second_product
+    assert_equal 2, subway.products.size
+    subway.products.clear
+    # reload to force reload of associations
+    subway = restaurants(:subway_one)
+    assert_equal 0, subway.products.size
+  end
+
+  def test_habtm_clear_cpk_association_side_only
+    product = products(:first_product)
+    assert_equal 0, product.restaurants.size, 'Baseline'
+
+    subway_one = restaurants(:subway_one)
+    subway_two = restaurants(:subway_two)
+    product.restaurants << subway_one << subway_two
+    assert_equal 2, product.restaurants.size
+    product.restaurants.clear
+    # reload to force reload of associations
+    product = products(:first_product)
+    assert_equal 0, product.restaurants.size
+  end
+
+  # tests case reported in issue #39 where a bug resulted in
+  # deletion of incorrect join table records because the owner's id
+  # was assumed to be an array and is not in this case
+  # and evaluates to a useable but incorrect value
+  def test_habtm_clear_cpk_association_side_only_deletes_only_correct_records
+    product_one = Product.find(1)
+    product_three = Product.find(3)
+    subway_one = restaurants(:subway_one)
+    subway_two = restaurants(:subway_two)
+    product_one.restaurants << subway_one << subway_two
+    product_three.restaurants << subway_one << subway_two
+    assert_equal 2, product_one.restaurants.size
+    assert_equal 2, product_three.restaurants.size
+
+    # if product_three's id is incorrectly assumed to be
+    # an array it will be evaluated as 3[0], which is 1, which would
+    # delete product_one's associations rather than product_three's
+    product_three.restaurants.clear
+
+    # reload to force reload of associations
+    product_one = Product.find(1)
+    assert_equal(2, product_one.restaurants.size)
+
+    product_three = Product.find(3)
+    assert_equal(0, product_three.restaurants.size)
+  end
+end

data/test/test_miscellaneous.rb

@@ -1,32 +1,32 @@
-require File.expand_path('../abstract_unit', __FILE__)
-
-class TestMiscellaneous < ActiveSupport::TestCase
-  fixtures :reference_types, :reference_codes, :products
-  
-  CLASSES = {
-    :single => {
-      :class => ReferenceType,
-      :primary_keys => :reference_type_id,
-    },
-    :dual   => { 
-      :class => ReferenceCode,
-      :primary_keys => [:reference_type_id, :reference_code],
-    },
-  }
-  
-  def setup
-    self.class.classes = CLASSES
-  end
-
-  def test_composite_class
-    testing_with do
-      assert_equal composite?, @klass.composite?
-    end
-  end
-
-  def test_composite_instance
-    testing_with do
-      assert_equal composite?, @first.composite?
-    end
-  end
-end
+require File.expand_path('../abstract_unit', __FILE__)
+
+class TestMiscellaneous < ActiveSupport::TestCase
+  fixtures :reference_types, :reference_codes, :products
+  
+  CLASSES = {
+    :single => {
+      :class => ReferenceType,
+      :primary_keys => :reference_type_id,
+    },
+    :dual   => { 
+      :class => ReferenceCode,
+      :primary_keys => [:reference_type_id, :reference_code],
+    },
+  }
+  
+  def setup
+    self.class.classes = CLASSES
+  end
+
+  def test_composite_class
+    testing_with do
+      assert_equal composite?, @klass.composite?
+    end
+  end
+
+  def test_composite_instance
+    testing_with do
+      assert_equal composite?, @first.composite?
+    end
+  end
+end

data/test/test_optimistic.rb

@@ -1,18 +1,18 @@
-require File.expand_path('../abstract_unit', __FILE__)
-
-class TestOptimisitic < ActiveSupport::TestCase
-  fixtures :restaurants
-
-  def test_update_with_stale_error
-    restaurant_1 = Restaurant.find([1, 1])
-    restaurant_1['name'] = "McDonalds renamed"
-
-    restaurant_2 = Restaurant.find([1, 1])
-    restaurant_2['name'] = "McDonalds renamed 2"
-
-    assert(restaurant_1.save)
-    assert_raise ActiveRecord::StaleObjectError do
-      restaurant_2.save
-    end
-  end
-end
+require File.expand_path('../abstract_unit', __FILE__)
+
+class TestOptimisitic < ActiveSupport::TestCase
+  fixtures :restaurants
+
+  def test_update_with_stale_error
+    restaurant_1 = Restaurant.find([1, 1])
+    restaurant_1['name'] = "McDonalds renamed"
+
+    restaurant_2 = Restaurant.find([1, 1])
+    restaurant_2['name'] = "McDonalds renamed 2"
+
+    assert(restaurant_1.save)
+    assert_raise ActiveRecord::StaleObjectError do
+      restaurant_2.save
+    end
+  end
+end

data/test/test_pagination.rb

@@ -1,36 +1,36 @@
-#require File.expand_path('../abstract_unit', __FILE__)
-#require 'plugins/pagination'
-#
-#class TestPagination < ActiveSupport::TestCase
-#  fixtures :reference_types, :reference_codes
-#
-#  include ActionController::Pagination
-#  DEFAULT_PAGE_SIZE = 2
-#
-#  attr_accessor :params
-#
-#  CLASSES = {
-#    :single => {
-#      :class => ReferenceType,
-#      :primary_keys => :reference_type_id,
-#      :table => :reference_types,
-#    },
-#    :dual   => {
-#      :class => ReferenceCode,
-#      :primary_keys => [:reference_type_id, :reference_code],
-#      :table => :reference_codes,
-#    },
-#  }
-#
-#  def setup
-#    self.class.classes = CLASSES
-#    @params = {}
-#  end
-#
-#  def test_paginate_all
-#    testing_with do
-#      @object_pages, @objects = paginate @klass_info[:table], :per_page => DEFAULT_PAGE_SIZE
-#      assert_equal 2, @objects.length, "Each page should have #{DEFAULT_PAGE_SIZE} items"
-#    end
-#  end
+#require File.expand_path('../abstract_unit', __FILE__)
+#require 'plugins/pagination'
+#
+#class TestPagination < ActiveSupport::TestCase
+#  fixtures :reference_types, :reference_codes
+#
+#  include ActionController::Pagination
+#  DEFAULT_PAGE_SIZE = 2
+#
+#  attr_accessor :params
+#
+#  CLASSES = {
+#    :single => {
+#      :class => ReferenceType,
+#      :primary_keys => :reference_type_id,
+#      :table => :reference_types,
+#    },
+#    :dual   => {
+#      :class => ReferenceCode,
+#      :primary_keys => [:reference_type_id, :reference_code],
+#      :table => :reference_codes,
+#    },
+#  }
+#
+#  def setup
+#    self.class.classes = CLASSES
+#    @params = {}
+#  end
+#
+#  def test_paginate_all
+#    testing_with do
+#      @object_pages, @objects = paginate @klass_info[:table], :per_page => DEFAULT_PAGE_SIZE
+#      assert_equal 2, @objects.length, "Each page should have #{DEFAULT_PAGE_SIZE} items"
+#    end
+#  end
 #end

data/test/test_polymorphic.rb

@@ -1,43 +1,43 @@
-require File.expand_path('../abstract_unit', __FILE__)
-
-class TestPolymorphic < ActiveSupport::TestCase
-  fixtures :articles, :departments, :employees, :users, :comments
-
-  def test_has_many
-    user = users(:santiago)
-    comments = user.comments
-    assert_equal(user.id, comments[0].person_id)
-  end
-
-  def test_has_one
-    user = users(:santiago)
-    first_comment = user.first_comment
-    assert_equal(user.id, first_comment.person_id)
-  end
-
-  def test_has_many_through
-    department = departments(:accounting)
-    comment = comments(:employee_comment)
-
-    assert_equal(1, department.comments.size)
-    assert_equal(comment, department.comments[0])
-  end
-
-  def test_has_many_through_2
-    article = articles(:second)
-
-    user = users(:santiago)
-    assert_equal(user, article.user_commentators[0])
-
-    user = users(:drnic)
-    assert_equal(user, article.user_commentators[1])
-  end
-
-  def test_clear_has_many_through
-    article = articles(:second)
-
-    assert_equal(2, article.comments.size)
-    article.user_commentators = []
-    assert_equal(0, article.comments.size)
-  end
-end
+require File.expand_path('../abstract_unit', __FILE__)
+
+class TestPolymorphic < ActiveSupport::TestCase
+  fixtures :articles, :departments, :employees, :users, :comments
+
+  def test_has_many
+    user = users(:santiago)
+    comments = user.comments
+    assert_equal(user.id, comments[0].person_id)
+  end
+
+  def test_has_one
+    user = users(:santiago)
+    first_comment = user.first_comment
+    assert_equal(user.id, first_comment.person_id)
+  end
+
+  def test_has_many_through
+    department = departments(:accounting)
+    comment = comments(:employee_comment)
+
+    assert_equal(1, department.comments.size)
+    assert_equal(comment, department.comments[0])
+  end
+
+  def test_has_many_through_2
+    article = articles(:second)
+
+    user = users(:santiago)
+    assert_equal(user, article.user_commentators[0])
+
+    user = users(:drnic)
+    assert_equal(user, article.user_commentators[1])
+  end
+
+  def test_clear_has_many_through
+    article = articles(:second)
+
+    assert_equal(2, article.comments.size)
+    article.user_commentators = []
+    assert_equal(0, article.comments.size)
+  end
+end