PHP Class VersionPress\Tests\GitRepositoryTests\MergeDriverTest

Inheritance: extends PHPUnit_Framework_TestCase

Show file Open project: versionpress/versionpress

Public Methods

Method	Description
changesOnAdjacentLinesMergeWithoutConflict ( string $driver )
conflictingContentsCreatedConflict ( string $driver )	Creates two branches with a conflict in content. Asserts that dates are merged automatically but the content conflicts.
driverProvider ( )
gitAttributesIsSameAfterInstallAndUninstall ( )
gitAttributesRemovedCorrectlyAfterUninstall ( )
gitAttributesRemovedWhenEmpty ( )
mergeDriverInstalledCorrectly ( )
mergeDriverIsNotAddedWhenPresent ( )
mergeDriverUninstalledCorrectly ( )
mergedDatesWithoutConflict ( string $driver )	Creates two branches differing only in the date modified (and the GMT version of it).
setUp ( )
setUpBeforeClass ( )
tearDown ( )

Method	Description
installMergeDriver ( string $driver )

public changesOnAdjacentLinesMergeWithoutConflict ( string $driver )
$driver	string

Creates two branches with a conflict in content. Asserts that dates are merged automatically but the content conflicts.

public conflictingContentsCreatedConflict ( string $driver )
$driver	string

public driverProvider ( )

public gitAttributesIsSameAfterInstallAndUninstall ( )

public gitAttributesRemovedCorrectlyAfterUninstall ( )

public gitAttributesRemovedWhenEmpty ( )

public mergeDriverInstalledCorrectly ( )

public mergeDriverIsNotAddedWhenPresent ( )

public mergeDriverUninstalledCorrectly ( )

This should result in a clean merge when our merge driver is installed.

public mergedDatesWithoutConflict ( string $driver )
$driver	string

public setUp ( )

public static setUpBeforeClass ( )

public tearDown ( )