Merge pull request #660 from libgit2/cmn/mt-deprecation

Use assert_nil instead of assert_equal

Author: carlosmn

test/commit_test.rb

@@ -181,7 +181,7 @@ def test_header_field
 
     expected_header_field = "Scott Chacon <[email protected]> 1273360386 -0700"
     assert_equal expected_header_field, obj.header_field("author")
-    assert_equal nil, obj.header_field("foobar")
+    assert_nil   obj.header_field("foobar")
   end
 
   def test_header_field?

test/diff_test.rb

@@ -854,7 +854,7 @@ def test_each_line_patch
 
     assert_equal(:context, lines[2].line_origin)
     assert_equal("Git is fast. With Git, nearly all operations are performed locally, giving\n", lines[2].content)
-    assert_equal(nil, lines[2].content_offset)
+    assert_nil(lines[2].content_offset)
     assert_equal(1, lines[2].old_lineno)
     assert_equal(1, lines[2].new_lineno)
 

test/rebase_test.rb

@@ -76,7 +76,7 @@ def test_merge_finish
     rebase.commit(committer: @sig)
 
     op = rebase.next()
-    assert_equal nil, op
+    assert_nil op
 
     rebase.finish(@sig)
   end

test/reference_test.rb

@@ -1,4 +1,4 @@
-# encoding: UTF-8
+# encoding: utf-8
 require "test_helper"
 
 class ReferenceTest < Rugged::TestCase
@@ -81,7 +81,7 @@ def test_can_open_a_symbolic_reference
 
   def test_looking_up_missing_ref_returns_nil
     ref = @repo.references["lol/wut"]
-    assert_equal nil, ref
+    assert_nil ref
   end
 
   def test_reference_exists
@@ -303,7 +303,7 @@ def test_create_default_log
 
     assert_equal '0000000000000000000000000000000000000000', reflog[0][:id_old]
     assert_equal 'a65fedf39aefe402d3bb6e24df4d4f5fe4547750', reflog[0][:id_new]
-    assert_equal nil, reflog[0][:message]
+    assert_nil   reflog[0][:message]
     assert_equal @ident[:name], reflog[0][:committer][:name]
     assert_equal @ident[:email], reflog[0][:committer][:email]
     assert_kind_of Time, reflog[0][:committer][:time]
@@ -323,7 +323,7 @@ def test_create_default_log_custom_ident
 
     assert_equal '0000000000000000000000000000000000000000', reflog[0][:id_old]
     assert_equal 'a65fedf39aefe402d3bb6e24df4d4f5fe4547750', reflog[0][:id_new]
-    assert_equal nil, reflog[0][:message]
+    assert_nil   reflog[0][:message]
     assert_equal 'Other User', reflog[0][:committer][:name]
     assert_equal '[email protected]', reflog[0][:committer][:email]
     assert_kind_of Time, reflog[0][:committer][:time]
@@ -378,7 +378,7 @@ def test_set_target_default_log
 
     assert_equal 'a65fedf39aefe402d3bb6e24df4d4f5fe4547750', reflog[1][:id_old]
     assert_equal '5b5b025afb0b4c913b4c338a42934a3863bf3644', reflog[1][:id_new]
-    assert_equal nil, reflog[1][:message]
+    assert_nil   reflog[1][:message]
     assert_equal @ident[:name], reflog[1][:committer][:name]
     assert_equal @ident[:email], reflog[1][:committer][:email]
     assert_kind_of Time, reflog[1][:committer][:time]
@@ -397,7 +397,7 @@ def test_set_target_default_log_custom_signature
 
     assert_equal 'a65fedf39aefe402d3bb6e24df4d4f5fe4547750', reflog[1][:id_old]
     assert_equal '5b5b025afb0b4c913b4c338a42934a3863bf3644', reflog[1][:id_new]
-    assert_equal nil, reflog[1][:message]
+    assert_nil   reflog[1][:message]
     assert_equal "Other User", reflog[1][:committer][:name]
     assert_equal "[email protected]", reflog[1][:committer][:email]
     assert_kind_of Time, reflog[1][:committer][:time]

test/remote_test.rb

@@ -241,12 +241,11 @@ def test_remote_set_url
   def test_remote_set_push_url
     remote = @repo.remotes['origin']
 
-    old_url = remote.push_url
     new_url = 'git://github.com/l?#!@#$ibgit2/TestGitRepository.git'
 
     @repo.remotes.set_push_url(remote, new_url)
 
-    assert_equal old_url, remote.push_url
+    assert_nil   remote.push_url
     assert_equal new_url, @repo.remotes['origin'].push_url
   end
 

test/repo_test.rb

@@ -386,29 +386,29 @@ def test_default_signature
   end
 
   def test_ident
-    assert_equal(nil, @repo.ident[:name])
-    assert_equal(nil, @repo.ident[:email])
+    assert_nil(@repo.ident[:name])
+    assert_nil(@repo.ident[:email])
 
     @repo.ident = { name: "Other User" }
     assert_equal("Other User", @repo.ident[:name])
-    assert_equal(nil, @repo.ident[:email])
+    assert_nil(@repo.ident[:email])
 
     @repo.ident = { email: "[email protected]" }
-    assert_equal(nil, @repo.ident[:name])
+    assert_nil(@repo.ident[:name])
     assert_equal("[email protected]", @repo.ident[:email])
 
     @repo.ident = { name: "Other User", email: "[email protected]" }
     assert_equal("Other User", @repo.ident[:name])
     assert_equal("[email protected]", @repo.ident[:email])
 
     @repo.ident = {}
-    assert_equal(nil, @repo.ident[:name])
-    assert_equal(nil, @repo.ident[:email])
+    assert_nil(@repo.ident[:name])
+    assert_nil(@repo.ident[:email])
 
     @repo.ident = { name: "Other User", email: "[email protected]" }
     @repo.ident = nil
-    assert_equal(nil, @repo.ident[:name])
-    assert_equal(nil, @repo.ident[:email])
+    assert_nil(@repo.ident[:name])
+    assert_nil(@repo.ident[:email])
   end
 end
 
@@ -635,7 +635,7 @@ def test_changing_namespace
     assert_equal "foo/bar", @repo.namespace
 
     @repo.namespace = nil
-    assert_equal nil, @repo.namespace
+    assert_nil @repo.namespace
   end
 
   def test_refs_in_namespaces
@@ -714,7 +714,7 @@ def test_read_attributes_internal
     assert_equal 'text', @repo.fetch_attributes('new.txt', 'linguist-lang')
     assert_equal 'this', @repo.fetch_attributes('new.txt', 'other-attr')
     assert_equal true, @repo.fetch_attributes('README', 'is_readme')
-    assert_equal nil, @repo.fetch_attributes('README', 'linguist-lang')
+    assert_nil   @repo.fetch_attributes('README', 'linguist-lang')
   end
 
   def test_read_attributes_internal_multi
@@ -743,16 +743,16 @@ def test_attributes
 
     atr = @repo.attributes('branch_file.txt')
     assert_equal 'text', atr['linguist-lang']
-    assert_equal nil, atr['other-attr']
+    assert_nil   atr['other-attr']
 
     atr.each do |key, value|
       assert key.instance_of? String
       assert [String, TrueClass, FalseClass].include? value.class
     end
 
     atr = @repo.attributes('new.txt', :priority => [:index])
-    assert_equal nil, atr['linguist-lang']
-    assert_equal nil, atr['linguist-lang']
+    assert_nil atr['linguist-lang']
+    assert_nil atr['linguist-lang']
   end
 end
 

test/tree_test.rb

@@ -77,7 +77,7 @@ def test_get_entry_by_oid
 
   def test_get_entry_by_oid_returns_nil_if_no_oid
     nada = @tree.get_entry_by_oid("1385f264afb75a56a5bec74243be9b367ba4ca07")
-    assert_equal nil, nada
+    assert_nil nada
   end
 
   def test_get_entry_by_oid_throws_error_if_wrong_type