test/test_tree.rb in schacon-grit-0.9.3 vs test/test_tree.rb in schacon-grit-0.9.4

@@ -48,16 +48,16 @@
     assert_equal "aa94e396335d2957ca92606f909e53e7beaf3fbb", tree.id
     assert_equal "100644", tree.mode
     assert_equal "grit.rb", tree.name
   end
   
-  def test_content_from_string_tree_should_return_commit
-    text = fixture('ls_tree_commit').split("\n")[1]
+  def test_content_from_string_tree_should_return_submodule
+    text = fixture('ls_tree_submodule').split("\n").first
     
-    tree = @t.content_from_string(nil, text)
+    sm = @t.content_from_string(nil, text)
     
-    assert_nil tree
+    assert_kind_of Submodule, sm
   end
   
   def test_content_from_string_invalid_type_should_raise
     assert_raise(RuntimeError) do
       @t.content_from_string(nil, "040000 bogus 650fa3f0c17f1edb4ae53d8dcca4ac59d86e6c44	test")
@@ -80,10 +80,10 @@
     Git.any_instance.expects(:ls_tree).returns(
       fixture('ls_tree_commit')
     )
     tree = @r.tree('master')
     
-    assert_nil tree/'bar'
+    assert_equal 'd35b34c6e931b9da8f6941007a92c9c9a9b0141a', (tree/'bar').id
     assert_equal '2afb47bcedf21663580d5e6d2f406f08f3f65f19', (tree/'foo').id
     assert_equal 'f623ee576a09ca491c4a27e48c0dfe04be5f4a2e', (tree/'baz').id
   end
   
   # inspect
\ No newline at end of file