/** * Returns previously recoded conflicts. * * @param string $wc_path Working copy path. * * @return array */ public function getNewConflicts($wc_path) { return $this->repositoryConnector->getWorkingCopyConflicts($wc_path); }
/** * @dataProvider getWorkingCopyConflictsDataProvider */ public function testGetWorkingCopyConflicts($fixture, $expected) { $this->_expectCommand("svn --non-interactive status --xml '/path/to/working-copy'", $this->getFixture($fixture)); $this->assertEquals($expected, $this->_repositoryConnector->getWorkingCopyConflicts('/path/to/working-copy')); }