diff options
author | Sebastian Thiel <byronimo@gmail.com> | 2009-10-09 11:57:48 +0200 |
---|---|---|
committer | Sebastian Thiel <byronimo@gmail.com> | 2009-10-09 11:57:48 +0200 |
commit | 92a97480edcc0f0de787a752bf90feed0445dd39 (patch) | |
tree | 518c00ba9840a2d6f32ffa7a876d7efa98016a03 /test/git | |
parent | 2b7f5cb25e0e03e06ec506d31c001c172dd71ef6 (diff) | |
download | gitpython-92a97480edcc0f0de787a752bf90feed0445dd39.tar.gz |
Blob|Tree: renamed 'name' member to 'path', updated tests and changelog as it would make existing code incompatible in some places
Diffstat (limited to 'test/git')
-rw-r--r-- | test/git/test_blob.py | 2 | ||||
-rw-r--r-- | test/git/test_commit.py | 20 | ||||
-rw-r--r-- | test/git/test_tree.py | 4 |
3 files changed, 13 insertions, 13 deletions
diff --git a/test/git/test_blob.py b/test/git/test_blob.py index 5bd74ff7..8741fc1d 100644 --- a/test/git/test_blob.py +++ b/test/git/test_blob.py @@ -57,7 +57,7 @@ class TestBlob(object): assert_equal(git.call_args, (('cat_file', 'abc'), {'s': True})) def test_mime_type_should_return_mime_type_for_known_types(self): - blob = Blob(self.repo, **{'id': 'abc', 'name': 'foo.png'}) + blob = Blob(self.repo, **{'id': 'abc', 'path': 'foo.png'}) assert_equal("image/png", blob.mime_type) def test_mime_type_should_return_text_plain_for_unknown_types(self): diff --git a/test/git/test_commit.py b/test/git/test_commit.py index d6bd6120..fb376b02 100644 --- a/test/git/test_commit.py +++ b/test/git/test_commit.py @@ -37,8 +37,8 @@ class TestCommit(object): assert_equal(15, len(diffs)) - assert_equal('.gitignore', diffs[0].a_blob.name) - assert_equal('.gitignore', diffs[0].b_blob.name) + assert_equal('.gitignore', diffs[0].a_blob.path) + assert_equal('.gitignore', diffs[0].b_blob.path) assert_equal('4ebc8aea50e0a67e000ba29a30809d0a7b9b2666', diffs[0].a_blob.id) assert_equal('2dd02534615434d88c51307beb0f0092f21fd103', diffs[0].b_blob.id) assert_equal('100644', diffs[0].b_blob.mode) @@ -46,7 +46,7 @@ class TestCommit(object): assert_equal(False, diffs[0].deleted_file) assert_equal("--- a/.gitignore\n+++ b/.gitignore\n@@ -1 +1,2 @@\n coverage\n+pkg", diffs[0].diff) - assert_equal('lib/grit/actor.rb', diffs[5].b_blob.name) + assert_equal('lib/grit/actor.rb', diffs[5].b_blob.path) assert_equal(None, diffs[5].a_blob) assert_equal('f733bce6b57c0e5e353206e692b0e3105c2527f4', diffs[5].b_blob.id) assert_equal( None, diffs[5].a_mode ) @@ -89,7 +89,7 @@ class TestCommit(object): diffs = Commit.diff(self.repo, '59ddc32', ['lib']) assert_equal(1, len(diffs)) - assert_equal('lib/grit/diff.rb', diffs[0].a_blob.name) + assert_equal('lib/grit/diff.rb', diffs[0].a_blob.path) assert_true(git.called) assert_equal(git.call_args, (('diff', '-M', '59ddc32', '--', 'lib'), {'full_index': True})) @@ -101,7 +101,7 @@ class TestCommit(object): diffs = Commit.diff(self.repo, '59ddc32', '13d27d5', ['lib']) assert_equal(1, len(diffs)) - assert_equal('lib/grit/commit.rb', diffs[0].a_blob.name) + assert_equal('lib/grit/commit.rb', diffs[0].a_blob.path) assert_true(git.called) assert_equal(git.call_args, (('diff', '-M', '59ddc32', '13d27d5', '--', 'lib'), {'full_index': True})) @@ -115,8 +115,8 @@ class TestCommit(object): assert_equal(15, len(diffs)) - assert_equal('.gitignore', diffs[0].a_blob.name) - assert_equal('.gitignore', diffs[0].b_blob.name) + assert_equal('.gitignore', diffs[0].a_blob.path) + assert_equal('.gitignore', diffs[0].b_blob.path) assert_equal('4ebc8aea50e0a67e000ba29a30809d0a7b9b2666', diffs[0].a_blob.id) assert_equal('2dd02534615434d88c51307beb0f0092f21fd103', diffs[0].b_blob.id) assert_equal('100644', diffs[0].b_blob.mode) @@ -124,7 +124,7 @@ class TestCommit(object): assert_equal(False, diffs[0].deleted_file) assert_equal("--- a/.gitignore\n+++ b/.gitignore\n@@ -1 +1,2 @@\n coverage\n+pkg", diffs[0].diff) - assert_equal('lib/grit/actor.rb', diffs[5].b_blob.name) + assert_equal('lib/grit/actor.rb', diffs[5].b_blob.path) assert_equal(None, diffs[5].a_blob) assert_equal('f733bce6b57c0e5e353206e692b0e3105c2527f4', diffs[5].b_blob.id) assert_equal(True, diffs[5].new_file) @@ -145,7 +145,7 @@ class TestCommit(object): assert_equal(10, len(diffs)) - assert_equal('History.txt', diffs[0].b_blob.name) + assert_equal('History.txt', diffs[0].b_blob.path) assert_equal(None, diffs[0].a_blob) assert_equal('100644', diffs[0].b_blob.mode) assert_equal('81d2c27608b352814cbe979a6acd678d30219678', diffs[0].b_blob.id) @@ -153,7 +153,7 @@ class TestCommit(object): assert_equal(False, diffs[0].deleted_file) assert_equal("--- /dev/null\n+++ b/History.txt\n@@ -0,0 +1,5 @@\n+== 1.0.0 / 2007-10-09\n+\n+* 1 major enhancement\n+ * Birthday!\n+", diffs[0].diff) - assert_equal('lib/grit.rb', diffs[5].b_blob.name) + assert_equal('lib/grit.rb', diffs[5].b_blob.path) assert_equal(None, diffs[5].a_blob) assert_equal('32cec87d1e78946a827ddf6a8776be4d81dcf1d1', diffs[5].b_blob.id) assert_equal(True, diffs[5].new_file) diff --git a/test/git/test_tree.py b/test/git/test_tree.py index 947b0ffb..3946a33c 100644 --- a/test/git/test_tree.py +++ b/test/git/test_tree.py @@ -32,7 +32,7 @@ class TestTree(object): assert_equal(Tree, tree.__class__) assert_equal("650fa3f0c17f1edb4ae53d8dcca4ac59d86e6c44", tree.id) assert_equal("040000", tree.mode) - assert_equal("test", tree.name) + assert_equal("test", tree.path) def test_content_from_string_tree_should_return_blob(self): text = fixture('ls_tree_b').split("\n")[0] @@ -42,7 +42,7 @@ class TestTree(object): assert_equal(Blob, tree.__class__) assert_equal("aa94e396335d2957ca92606f909e53e7beaf3fbb", tree.id) assert_equal("100644", tree.mode) - assert_equal("grit.rb", tree.name) + assert_equal("grit.rb", tree.path) def test_content_from_string_tree_should_return_commit(self): text = fixture('ls_tree_commit').split("\n")[1] |