diff test/unit/initializers/patches_test.rb @ 1526:404aa68d4227

Merge from live branch

--- a/test/unit/initializers/patches_test.rb	Mon Mar 17 08:57:04 2014 +0000
+++ b/test/unit/initializers/patches_test.rb	Thu Sep 11 12:46:20 2014 +0100
@@ -1,5 +1,5 @@
 # Redmine - project management software
-# Copyright (C) 2006-2012  Jean-Philippe Lang
+# Copyright (C) 2006-2014  Jean-Philippe Lang
 #
 # This program is free software; you can redistribute it and/or
 # modify it under the terms of the GNU General Public License
@@ -20,21 +20,80 @@
 class PatchesTest < ActiveSupport::TestCase
   include Redmine::I18n
 
-  context "ActiveRecord::Base.human_attribute_name" do
-    setup do
-      Setting.default_language = 'en'
+  def setup
+    Setting.default_language = 'en'
+    @symbols = { :a => 1, :b => 2 }
+    @keys = %w( blue green red pink orange )
+    @values = %w( 000099 009900 aa0000 cc0066 cc6633 )
+    @hash = Hash.new
+    @ordered_hash = ActiveSupport::OrderedHash.new
+
+    @keys.each_with_index do |key, index|
+      @hash[key] = @values[index]
+      @ordered_hash[key] = @values[index]
+    end
+  end
+
+  test "ActiveRecord::Base.human_attribute_name should transform name to field_name" do
+    assert_equal l('field_last_login_on'), ActiveRecord::Base.human_attribute_name('last_login_on')
+  end
+
+  test "ActiveRecord::Base.human_attribute_name should cut extra _id suffix for better validation" do
+    assert_equal l('field_last_login_on'), ActiveRecord::Base.human_attribute_name('last_login_on_id')
+  end
+
+  test "ActiveRecord::Base.human_attribute_name should default to humanized value if no translation has been found (useful for custom fields)" do
+    assert_equal 'Patch name', ActiveRecord::Base.human_attribute_name('Patch name')
+  end
+
+  # https://github.com/rails/rails/pull/14198/files
+  if RUBY_VERSION >= "1.9"
+    def test_indifferent_select
+      hash = ActiveSupport::HashWithIndifferentAccess.new(@symbols).select { |_ ,v| v == 1 }
+      assert_equal({ 'a' => 1 }, hash)
+      assert_instance_of ((Rails::VERSION::MAJOR < 4 && RUBY_VERSION < "2.1") ?
+                            Hash : ActiveSupport::HashWithIndifferentAccess),
+                          hash
     end
 
-    should "transform name to field_name" do
-      assert_equal l('field_last_login_on'), ActiveRecord::Base.human_attribute_name('last_login_on')
-    end
-
-    should "cut extra _id suffix for better validation" do
-      assert_equal l('field_last_login_on'), ActiveRecord::Base.human_attribute_name('last_login_on_id')
-    end
-
-    should "default to humanized value if no translation has been found (useful for custom fields)" do
-      assert_equal 'Patch name', ActiveRecord::Base.human_attribute_name('Patch name')
+    def test_indifferent_select_bang
+      indifferent_strings = ActiveSupport::HashWithIndifferentAccess.new(@symbols)
+      indifferent_strings.select! { |_, v| v == 1 }
+      assert_equal({ 'a' => 1 }, indifferent_strings)
+      assert_instance_of ActiveSupport::HashWithIndifferentAccess, indifferent_strings
     end
   end
+
+  def test_indifferent_reject
+    hash = ActiveSupport::HashWithIndifferentAccess.new(@symbols).reject { |_, v| v != 1 }
+    assert_equal({ 'a' => 1 }, hash)
+    assert_instance_of ActiveSupport::HashWithIndifferentAccess, hash
+  end
+
+  def test_indifferent_reject_bang
+    indifferent_strings = ActiveSupport::HashWithIndifferentAccess.new(@symbols)
+    indifferent_strings.reject! { |_, v| v != 1 }
+    assert_equal({ 'a' => 1 }, indifferent_strings)
+    assert_instance_of ActiveSupport::HashWithIndifferentAccess, indifferent_strings
+  end
+
+  if RUBY_VERSION >= "1.9"
+    def test_select
+      assert_equal @keys, @ordered_hash.select { true }.map(&:first)
+      new_ordered_hash = @ordered_hash.select { true }
+      assert_equal @keys, new_ordered_hash.map(&:first)
+      assert_instance_of ((Rails::VERSION::MAJOR < 4 && RUBY_VERSION < "2.1") ?
+                            Hash : ActiveSupport::OrderedHash),
+                          new_ordered_hash
+    end
+  end
+
+  def test_reject
+    copy = @ordered_hash.dup
+    new_ordered_hash = @ordered_hash.reject { |k, _| k == 'pink' }
+    assert_equal copy, @ordered_hash
+    assert !new_ordered_hash.keys.include?('pink')
+    assert @ordered_hash.keys.include?('pink')
+    assert_instance_of ActiveSupport::OrderedHash, new_ordered_hash
+  end
 end