composite_primary_keys 7.0.16 → 8.0.0

data/test/test_attribute_methods.rb

@@ -1,63 +1,63 @@
-require File.expand_path('../abstract_unit', __FILE__)
-
-class TestAttributeMethods < ActiveSupport::TestCase
-  fixtures :reference_types, :reference_codes
-
-  def test_read_attribute_with_single_key
-    rt = ReferenceType.find(1)
-    assert_equal(1, rt.reference_type_id)
-    assert_equal('NAME_PREFIX', rt.type_label)
-    assert_equal('Name Prefix', rt.abbreviation)
-  end
-
-  def test_read_attribute_with_composite_keys
-    ref_code = ReferenceCode.find([1, 1])
-    assert_equal(1, ref_code.id.first)
-    assert_equal(1, ref_code.id.last)
-    assert_equal('Mr', ref_code.abbreviation)
-  end
-
-  # to_key returns array even for single key
-  def test_to_key_with_single_key
-    rt = ReferenceType.find(1)
-    assert_equal([1], rt.to_key)
-  end
-
-  def test_to_key_with_composite_keys
-    ref_code = ReferenceCode.find([1, 1])
-    assert_equal(1, ref_code.to_key.first)
-    assert_equal(1, ref_code.to_key.last)
-  end
-
-  def test_to_key_with_single_key_unsaved
-    rt = ReferenceType.new
-    assert_nil(rt.to_key)
-  end
-
-  def test_to_key_with_composite_keys_unsaved
-    ref_code = ReferenceCode.new
-    assert_nil(ref_code.to_key)
-  end
-
-  def test_to_key_with_single_key_destroyed
-    rt = ReferenceType.find(1)
-    rt.destroy
-    assert_equal([1], rt.to_key)
-  end
-
-  def test_to_key_with_composite_key_destroyed
-    ref_code = ReferenceCode.find([1, 1])
-    ref_code.destroy
-    assert_equal([1,1], ref_code.to_key)
-  end
-
-  def test_id_was
-    rt = ReferenceType.find(1)
-    rt.id = 2
-    assert_equal 1, rt.id_was
-    
-    ref_code = ReferenceCode.find([1, 1])
-    ref_code.id = [1,2]
-    assert_equal [1,1], ref_code.id_was
-  end
-end
+require File.expand_path('../abstract_unit', __FILE__)
+
+class TestAttributeMethods < ActiveSupport::TestCase
+  fixtures :reference_types, :reference_codes
+
+  def test_read_attribute_with_single_key
+    rt = ReferenceType.find(1)
+    assert_equal(1, rt.reference_type_id)
+    assert_equal('NAME_PREFIX', rt.type_label)
+    assert_equal('Name Prefix', rt.abbreviation)
+  end
+
+  def test_read_attribute_with_composite_keys
+    ref_code = ReferenceCode.find([1, 1])
+    assert_equal(1, ref_code.id.first)
+    assert_equal(1, ref_code.id.last)
+    assert_equal('Mr', ref_code.abbreviation)
+  end
+
+  # to_key returns array even for single key
+  def test_to_key_with_single_key
+    rt = ReferenceType.find(1)
+    assert_equal([1], rt.to_key)
+  end
+
+  def test_to_key_with_composite_keys
+    ref_code = ReferenceCode.find([1, 1])
+    assert_equal(1, ref_code.to_key.first)
+    assert_equal(1, ref_code.to_key.last)
+  end
+
+  def test_to_key_with_single_key_unsaved
+    rt = ReferenceType.new
+    assert_nil(rt.to_key)
+  end
+
+  def test_to_key_with_composite_keys_unsaved
+    ref_code = ReferenceCode.new
+    assert_nil(ref_code.to_key)
+  end
+
+  def test_to_key_with_single_key_destroyed
+    rt = ReferenceType.find(1)
+    rt.destroy
+    assert_equal([1], rt.to_key)
+  end
+
+  def test_to_key_with_composite_key_destroyed
+    ref_code = ReferenceCode.find([1, 1])
+    ref_code.destroy
+    assert_equal([1,1], ref_code.to_key)
+  end
+
+  def test_id_was
+    rt = ReferenceType.find(1)
+    rt.id = 2
+    assert_equal 1, rt.id_was
+    
+    ref_code = ReferenceCode.find([1, 1])
+    ref_code.id = [1,2]
+    assert_equal [1,1], ref_code.id_was
+  end
+end

data/test/test_attributes.rb

@@ -1,61 +1,61 @@
-require File.expand_path('../abstract_unit', __FILE__)
-
-class TestAttributes < ActiveSupport::TestCase
-  fixtures :reference_types, :reference_codes, :products, :tariffs, :product_tariffs
-  
-  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_brackets
-    testing_with do
-      @first.attributes.each_pair do |attr_name, value|
-        assert_equal value, @first[attr_name]
-      end
-    end
-  end
-
-  def test_brackets_primary_key
-    testing_with do
-      assert_equal(@first.id, @first[@primary_keys])
-      assert_equal(@first.id, @first[@first.class.primary_key])
-    end
-  end
-
-  def test_brackets_assignment
-    testing_with do
-      @first.attributes.each_pair do |attr_name, value|
-        next if attr_name == @first.class.primary_key
-        @first[attr_name]= !value.nil? ? value * 2 : '1'
-        assert_equal !value.nil? ? value * 2 : '1', @first[attr_name]
-      end
-    end
-  end
-    
-  def test_brackets_foreign_key_assignment
-    tarrif = tariffs(:flat)
-    product_tariff = product_tariffs(:first_flat)
-    compare_indexes(tarrif, tarrif.class.primary_key, product_tariff, [:tariff_id, :tariff_start_date])
-  end
-  
-  private
-
-  def compare_indexes(obj1, indexes1, obj2, indexes2)
-    indexes1.length.times do |key_index|
-      key1 = indexes1[key_index]
-      key2 = indexes2[key_index]
-      assert_equal(obj1[key1], obj2[key2])
-    end
-  end
+require File.expand_path('../abstract_unit', __FILE__)
+
+class TestAttributes < ActiveSupport::TestCase
+  fixtures :reference_types, :reference_codes, :products, :tariffs, :product_tariffs
+  
+  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_brackets
+    testing_with do
+      @first.attributes.each_pair do |attr_name, value|
+        assert_equal value, @first[attr_name]
+      end
+    end
+  end
+
+  def test_brackets_primary_key
+    testing_with do
+      assert_equal(@first.id, @first[@primary_keys])
+      assert_equal(@first.id, @first[@first.class.primary_key])
+    end
+  end
+
+  def test_brackets_assignment
+    testing_with do
+      @first.attributes.each_pair do |attr_name, value|
+        next if attr_name == @first.class.primary_key
+        @first[attr_name]= !value.nil? ? value * 2 : '1'
+        assert_equal !value.nil? ? value * 2 : '1', @first[attr_name]
+      end
+    end
+  end
+    
+  def test_brackets_foreign_key_assignment
+    tarrif = tariffs(:flat)
+    product_tariff = product_tariffs(:first_flat)
+    compare_indexes(tarrif, tarrif.class.primary_key, product_tariff, [:tariff_id, :tariff_start_date])
+  end
+  
+  private
+
+  def compare_indexes(obj1, indexes1, obj2, indexes2)
+    indexes1.length.times do |key_index|
+      key1 = indexes1[key_index]
+      key2 = indexes2[key_index]
+      assert_equal(obj1[key1], obj2[key2])
+    end
+  end
 end

data/test/test_calculations.rb

@@ -1,42 +1,37 @@
-require File.expand_path('../abstract_unit', __FILE__)
-
-class TestCalculations < ActiveSupport::TestCase
-  fixtures :articles, :products, :tariffs, :product_tariffs, :suburbs, :streets, :restaurants,
-           :dorms, :rooms, :room_attributes, :room_attribute_assignments, :students, :room_assignments, :users, :readings,
-           :departments, :employees, :memberships, :membership_statuses
-
-  def test_count
-    assert_equal(3, Product.includes(:product_tariffs).count)
-    assert_equal(3, Tariff.includes(:product_tariffs).count)
-
-    expected = {Date.today => 2,
-                Date.today.next => 1}
-
-    assert_equal(expected, Tariff.group(:start_date).count)
-  end
-
-  def test_count_distinct
-    product = products(:first_product)
-    assert_equal(1, product.product_tariffs.select('tariff_start_date').distinct.count)
-  end
-  
-  def test_count_not_distinct
-    product = products(:first_product)
-    assert_equal(2, product.product_tariffs.select('tariff_start_date').count)
-  end
-
-  def test_count_includes
-    count = Dorm.where("rooms.room_id = ?", 2).includes(:rooms).references(:rooms).count
-    assert_equal(1, count)
-  end
-
-  def test_count_includes_dup_columns
-    count = Tariff.includes(:product_tariffs).references(:product_tariffs).where("product_tariffs.tariff_id = ?", 2).count
-    assert_equal(1, count)
-  end
-
-  def test_average
-    average = Tariff.average(:amount)
-    assert_equal(50, average)
-  end
-end
+require File.expand_path('../abstract_unit', __FILE__)
+
+class TestCalculations < ActiveSupport::TestCase
+  fixtures :articles, :products, :tariffs, :product_tariffs, :suburbs, :streets, :restaurants,
+           :dorms, :rooms, :room_attributes, :room_attribute_assignments, :students, :room_assignments, :users, :readings,
+           :departments, :employees, :memberships, :membership_statuses
+
+  def test_count
+    assert_equal(3, Product.includes(:product_tariffs).count)
+    assert_equal(3, Tariff.includes(:product_tariffs).count)
+
+    expected = {Date.today => 2,
+                Date.today.next => 1}
+
+    assert_equal(expected, Tariff.group(:start_date).count)
+  end
+
+  def test_count_distinct
+    product = products(:first_product)
+    assert_equal(1, product.product_tariffs.select('tariff_start_date').distinct.count)
+  end
+  
+  def test_count_not_distinct
+    product = products(:first_product)
+    assert_equal(2, product.product_tariffs.select('tariff_start_date').count)
+  end
+
+  def test_count_includes
+    count = Dorm.where("rooms.room_id = ?", 2).includes(:rooms).references(:rooms).count
+    assert_equal(1, count)
+  end
+
+  def test_count_includes_dup_columns
+    count = Tariff.includes(:product_tariffs).references(:product_tariffs).where("product_tariffs.tariff_id = ?", 2).count
+    assert_equal(1, count)
+  end
+end

data/test/test_callbacks.rb

@@ -1,99 +1,99 @@
-require File.expand_path('../abstract_unit', __FILE__)
-
-class TestCallbacks < ActiveSupport::TestCase
-  fixtures :suburbs
-
-  def setup
-    @@callbacks = OpenStruct.new
-
-    Suburb.class_eval do
-      before_create do
-        @@callbacks.before_create = true
-      end
-
-      after_create do
-        @@callbacks.after_create = true
-      end
-
-      around_create do |suburb, block|
-        @@callbacks.around_create = true
-        block.call
-      end
-
-      before_save do
-        @@callbacks.before_save = true
-      end
-
-      after_save do
-        @@callbacks.after_save = true
-      end
-
-      around_save do |suburb, block|
-        @@callbacks.around_save = true
-        block.call
-      end
-
-      before_update do
-        @@callbacks.before_update = true
-      end
-
-      after_update do
-        @@callbacks.after_update = true
-      end
-
-      around_update do |suburb, block|
-        @@callbacks.around_update = true
-        block.call
-      end
-    end
-  end
-
-  def teardown
-    Suburb.reset_callbacks(:create)
-    Suburb.reset_callbacks(:save)
-    Suburb.reset_callbacks(:update)
-  end
-
-  def test_create
-    refute(@@callbacks.before_save)
-    refute(@@callbacks.after_save)
-    refute(@@callbacks.around_save)
-
-    refute(@@callbacks.before_create)
-    refute(@@callbacks.after_create)
-    refute(@@callbacks.around_create)
-
-    suburb = Suburb.new(:city_id => 3, :suburb_id => 3, :name => 'created')
-    suburb.save!
-
-    assert(@@callbacks.before_save)
-    assert(@@callbacks.after_save)
-    assert(@@callbacks.around_save)
-
-    assert(@@callbacks.before_create)
-    assert(@@callbacks.after_create)
-    assert(@@callbacks.around_create)
-  end
-
-  def test_update
-    refute(@@callbacks.before_save)
-    refute(@@callbacks.after_save)
-    refute(@@callbacks.around_save)
-
-    refute(@@callbacks.before_create)
-    refute(@@callbacks.after_create)
-    refute(@@callbacks.around_create)
-
-    suburb = suburbs(:first)
-    suburb.name = 'Updated'
-    suburb.save
-
-    assert(@@callbacks.before_update)
-    assert(@@callbacks.after_update)
-    assert(@@callbacks.around_update)
-
-    assert(@@callbacks.before_save)
-    assert(@@callbacks.after_save)
-    assert(@@callbacks.around_save)
-  end
-end
+require File.expand_path('../abstract_unit', __FILE__)
+
+class TestCallbacks < ActiveSupport::TestCase
+  fixtures :suburbs
+
+  def setup
+    @@callbacks = OpenStruct.new
+
+    Suburb.class_eval do
+      before_create do
+        @@callbacks.before_create = true
+      end
+
+      after_create do
+        @@callbacks.after_create = true
+      end
+
+      around_create do |suburb, block|
+        @@callbacks.around_create = true
+        block.call
+      end
+
+      before_save do
+        @@callbacks.before_save = true
+      end
+
+      after_save do
+        @@callbacks.after_save = true
+      end
+
+      around_save do |suburb, block|
+        @@callbacks.around_save = true
+        block.call
+      end
+
+      before_update do
+        @@callbacks.before_update = true
+      end
+
+      after_update do
+        @@callbacks.after_update = true
+      end
+
+      around_update do |suburb, block|
+        @@callbacks.around_update = true
+        block.call
+      end
+    end
+  end
+
+  def teardown
+    Suburb.reset_callbacks(:create)
+    Suburb.reset_callbacks(:save)
+    Suburb.reset_callbacks(:update)
+  end
+
+  def test_create
+    refute(@@callbacks.before_save)
+    refute(@@callbacks.after_save)
+    refute(@@callbacks.around_save)
+
+    refute(@@callbacks.before_create)
+    refute(@@callbacks.after_create)
+    refute(@@callbacks.around_create)
+
+    suburb = Suburb.new(:city_id => 3, :suburb_id => 3, :name => 'created')
+    suburb.save!
+
+    assert(@@callbacks.before_save)
+    assert(@@callbacks.after_save)
+    assert(@@callbacks.around_save)
+
+    assert(@@callbacks.before_create)
+    assert(@@callbacks.after_create)
+    assert(@@callbacks.around_create)
+  end
+
+  def test_update
+    refute(@@callbacks.before_save)
+    refute(@@callbacks.after_save)
+    refute(@@callbacks.around_save)
+
+    refute(@@callbacks.before_create)
+    refute(@@callbacks.after_create)
+    refute(@@callbacks.around_create)
+
+    suburb = suburbs(:first)
+    suburb.name = 'Updated'
+    suburb.save
+
+    assert(@@callbacks.before_update)
+    assert(@@callbacks.after_update)
+    assert(@@callbacks.around_update)
+
+    assert(@@callbacks.before_save)
+    assert(@@callbacks.after_save)
+    assert(@@callbacks.around_save)
+  end
+end