test on multiple getParents on log

matteosister · Jun 8, 2013 · 19dd17e · 19dd17e
1 parent 15cba0a
commit 19dd17e
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 1 deletion.
diff --git a/ROADMAP.md b/ROADMAP.md
@@ -17,7 +17,8 @@ todo
 
 1.0.0
 * remotes DONE
-* better status handling with --porcelain
+* better status handling with --porcelain DONE
+* CommitCollection instead of countable
 * tag messages and signed tags
 * named exceptions
 

diff --git a/tests/GitElephant/Objects/LogTest.php b/tests/GitElephant/Objects/LogTest.php
@@ -55,6 +55,20 @@ public function testParents()
         $lastCommit = $this->repository->getCommit();
         $lastLogCommit = $log[0];
         $this->assertEquals($lastCommit->getParents(), $lastLogCommit->getParents());
+        Branch::create($this->repository, 'new-branch');
+        $this->getRepository()->checkout('new-branch');
+        $this->addFile('another file');
+        $this->repository->commit('another commit', true);
+        $lastCommitOtherBranch = $this->getRepository()->getCommit();
+        $this->getRepository()->checkout('master');
+        $this->addFile('another file on master');
+        $this->getRepository()->commit('new commit on master', true);
+        $lastCommitOnMaster = $this->getRepository()->getCommit();
+        $this->getRepository()->merge($this->getRepository()->getBranch('new-branch'));
+        $log = $this->getRepository()->getLog();
+        $lastLogCommit = $log[0];
+        $this->assertContains($lastCommitOnMaster->getSha(), $lastLogCommit->getParents());
+        $this->assertContains($lastCommitOtherBranch->getSha(), $lastLogCommit->getParents());
     }
 
     /**