PHP Class VersionPress\Tests\GitRepositoryTests\MergeDriverTest

Inheritance: extends PHPUnit_Framework_TestCase

Afficher le fichier Open project: versionpress/versionpress

Méthodes publiques

Méthode	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 ( )

Private Methods

Méthode	Description
installMergeDriver ( string $driver )

Method Details

changesOnAdjacentLinesMergeWithoutConflict() public méthode

public changesOnAdjacentLinesMergeWithoutConflict ( string $driver )
$driver	string

conflictingContentsCreatedConflict() public méthode

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

public conflictingContentsCreatedConflict ( string $driver )
$driver	string

driverProvider() public méthode

public driverProvider ( )

gitAttributesIsSameAfterInstallAndUninstall() public méthode

public gitAttributesIsSameAfterInstallAndUninstall ( )

gitAttributesRemovedCorrectlyAfterUninstall() public méthode

public gitAttributesRemovedCorrectlyAfterUninstall ( )

gitAttributesRemovedWhenEmpty() public méthode

public gitAttributesRemovedWhenEmpty ( )

mergeDriverInstalledCorrectly() public méthode

public mergeDriverInstalledCorrectly ( )

mergeDriverIsNotAddedWhenPresent() public méthode

public mergeDriverIsNotAddedWhenPresent ( )

mergeDriverUninstalledCorrectly() public méthode

public mergeDriverUninstalledCorrectly ( )

mergedDatesWithoutConflict() public méthode

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

public mergedDatesWithoutConflict ( string $driver )
$driver	string

setUp() public méthode

public setUp ( )

setUpBeforeClass() public static méthode

public static setUpBeforeClass ( )

tearDown() public méthode

public tearDown ( )