composite_primary_keys 13.0.0 → 14.0.2

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_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

data/test/test_composite_arrays.rb

@@ -1,38 +1,38 @@
-require File.expand_path('../abstract_unit', __FILE__)
-
-class CompositeArraysTest < ActiveSupport::TestCase
-
-  def test_new_primary_keys
-    keys = CompositePrimaryKeys::CompositeKeys.new
-    assert_not_nil keys
-    assert_equal '', keys.to_s
-    assert_equal '', "#{keys}"
-  end
-
-  def test_initialize_primary_keys
-    keys = CompositePrimaryKeys::CompositeKeys.new([1,2,3])
-    assert_not_nil keys
-    assert_equal '1,2,3', keys.to_s
-    assert_equal '1,2,3', "#{keys}"
-  end
-
-  def test_to_composite_keys
-    keys = [1,2,3].to_composite_keys
-    assert_equal CompositePrimaryKeys::CompositeKeys, keys.class
-    assert_equal '1,2,3', keys.to_s
-  end
-
-  def test_parse
-    assert_equal ['1', '2'], CompositePrimaryKeys::CompositeKeys.parse('1,2')
-    assert_equal ['The USA', '^Washington, D.C.'],
-                 CompositePrimaryKeys::CompositeKeys.parse('The USA,^5EWashington^2C D.C.')
-    assert_equal ['The USA', '^Washington, D.C.'],
-                 CompositePrimaryKeys::CompositeKeys.parse(['The USA', '^Washington, D.C.'])
-  end
-
-  def test_to_s
-    assert_equal '1,2', CompositePrimaryKeys::CompositeKeys.new([1, 2]).to_s
-    assert_equal 'The USA,^5EWashington^2C D.C.',
-                 CompositePrimaryKeys::CompositeKeys.new(['The USA', '^Washington, D.C.']).to_s
-  end
-end
+require File.expand_path('../abstract_unit', __FILE__)
+
+class CompositeArraysTest < ActiveSupport::TestCase
+
+  def test_new_primary_keys
+    keys = CompositePrimaryKeys::CompositeKeys.new
+    assert_not_nil keys
+    assert_equal '', keys.to_s
+    assert_equal '', "#{keys}"
+  end
+
+  def test_initialize_primary_keys
+    keys = CompositePrimaryKeys::CompositeKeys.new([1,2,3])
+    assert_not_nil keys
+    assert_equal '1,2,3', keys.to_s
+    assert_equal '1,2,3', "#{keys}"
+  end
+
+  def test_to_composite_keys
+    keys = [1,2,3].to_composite_keys
+    assert_equal CompositePrimaryKeys::CompositeKeys, keys.class
+    assert_equal '1,2,3', keys.to_s
+  end
+
+  def test_parse
+    assert_equal ['1', '2'], CompositePrimaryKeys::CompositeKeys.parse('1,2')
+    assert_equal ['The USA', '^Washington, D.C.'],
+                 CompositePrimaryKeys::CompositeKeys.parse('The USA,^5EWashington^2C D.C.')
+    assert_equal ['The USA', '^Washington, D.C.'],
+                 CompositePrimaryKeys::CompositeKeys.parse(['The USA', '^Washington, D.C.'])
+  end
+
+  def test_to_s
+    assert_equal '1,2', CompositePrimaryKeys::CompositeKeys.new([1, 2]).to_s
+    assert_equal 'The USA,^5EWashington^2C D.C.',
+                 CompositePrimaryKeys::CompositeKeys.new(['The USA', '^Washington, D.C.']).to_s
+  end
+end

data/test/test_counter_cache.rb

@@ -1,31 +1,31 @@
-require File.expand_path('../abstract_unit', __FILE__)
-
-class TestCounterCache < ActiveSupport::TestCase
-  fixtures :dorms, :rooms, :tariffs
-
-  def test_update_counter
-    tariff = tariffs(:flat)
-    assert_equal(50, tariff.amount)
-    Tariff.update_counters(tariff.id, :amount => 1)
-    tariff.reload
-    assert_equal(51, tariff.amount)
-  end
-
-  def test_increment_counter
-    tariff = tariffs(:flat)
-    assert_equal(50, tariff.amount)
-    Tariff.increment_counter(:amount, tariff.id)
-
-    tariff.reload
-    assert_equal(51, tariff.amount)
-  end
-
-  def test_decrement_counter
-    tariff = tariffs(:flat)
-    assert_equal(50, tariff.amount)
-    Tariff.decrement_counter(:amount, tariff.id)
-
-    tariff.reload
-    assert_equal(49, tariff.amount)
-  end
+require File.expand_path('../abstract_unit', __FILE__)
+
+class TestCounterCache < ActiveSupport::TestCase
+  fixtures :dorms, :rooms, :tariffs
+
+  def test_update_counter
+    tariff = tariffs(:flat)
+    assert_equal(50, tariff.amount)
+    Tariff.update_counters(tariff.id, :amount => 1)
+    tariff.reload
+    assert_equal(51, tariff.amount)
+  end
+
+  def test_increment_counter
+    tariff = tariffs(:flat)
+    assert_equal(50, tariff.amount)
+    Tariff.increment_counter(:amount, tariff.id)
+
+    tariff.reload
+    assert_equal(51, tariff.amount)
+  end
+
+  def test_decrement_counter
+    tariff = tariffs(:flat)
+    assert_equal(50, tariff.amount)
+    Tariff.decrement_counter(:amount, tariff.id)
+
+    tariff.reload
+    assert_equal(49, tariff.amount)
+  end
 end

data/test/test_delete.rb

@@ -31,6 +31,8 @@ class TestDelete < ActiveSupport::TestCase
   end
 
   def test_delete_all_with_join
+    tested_delete_all = false
+    Arel::Table.engine = nil # should not rely on the global Arel::Table.engine
     employee = employees(:mindy)
 
     assert_equal(5, Department.count)
@@ -41,6 +43,10 @@ class TestDelete < ActiveSupport::TestCase
 
     assert_equal(4, Department.count)
     assert_equal(1, deleted)
+    tested_delete_all = true
+  ensure
+    Arel::Table.engine = ActiveRecord::Base
+    assert tested_delete_all
   end
 
   def test_clear_association

data/test/test_dumpable.rb

@@ -1,15 +1,15 @@
-require File.expand_path('../abstract_unit', __FILE__)
-
-class TestDumpable < ActiveSupport::TestCase
-  fixtures :articles, :readings, :users
-
-  def test_marshal_with_simple_preload
-    articles = Article.preload(:readings).where(id: 1).to_a
-    assert_equal(Marshal.load(Marshal.dump(articles)), articles)
-  end
-
-  def test_marshal_with_comples_preload
-    articles = Article.preload({ readings: :user }).where(id: 1).to_a
-    assert_equal(Marshal.load(Marshal.dump(articles)), articles)
-  end
-end
+require File.expand_path('../abstract_unit', __FILE__)
+
+class TestDumpable < ActiveSupport::TestCase
+  fixtures :articles, :readings, :users
+
+  def test_marshal_with_simple_preload
+    articles = Article.preload(:readings).where(id: 1).to_a
+    assert_equal(Marshal.load(Marshal.dump(articles)), articles)
+  end
+
+  def test_marshal_with_comples_preload
+    articles = Article.preload({ readings: :user }).where(id: 1).to_a
+    assert_equal(Marshal.load(Marshal.dump(articles)), articles)
+  end
+end

data/test/test_dup.rb

@@ -1,38 +1,38 @@
-require File.expand_path('../abstract_unit', __FILE__)
-
-class TestClone < ActiveSupport::TestCase
-  fixtures :reference_types, :reference_codes
-  
-  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_dup
-    testing_with do
-      clone = @first.dup
-      
-      remove_keys = Array(@klass.primary_key).map(&:to_s)
-      remove_keys << Array(@klass.primary_key) # Rails 4 adds the PK to the attributes, so we want to remove it as well
-      assert_equal(@first.attributes.except(*remove_keys), clone.attributes.except(*remove_keys))
-
-      if composite?
-        @klass.primary_key.each do |key|
-          assert_nil(clone[key], "Primary key '#{key}' should be nil")
-        end
-      else
-        assert_nil(clone[@klass.primary_key], "Sole primary key should be nil")
-      end
-    end
-  end
+require File.expand_path('../abstract_unit', __FILE__)
+
+class TestClone < ActiveSupport::TestCase
+  fixtures :reference_types, :reference_codes
+  
+  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_dup
+    testing_with do
+      clone = @first.dup
+      
+      remove_keys = Array(@klass.primary_key).map(&:to_s)
+      remove_keys << Array(@klass.primary_key) # Rails 4 adds the PK to the attributes, so we want to remove it as well
+      assert_equal(@first.attributes.except(*remove_keys), clone.attributes.except(*remove_keys))
+
+      if composite?
+        @klass.primary_key.each do |key|
+          assert_nil(clone[key], "Primary key '#{key}' should be nil")
+        end
+      else
+        assert_nil(clone[@klass.primary_key], "Sole primary key should be nil")
+      end
+    end
+  end
 end

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