Skip to content

Commit

Permalink
Corrects doc comment alignment
Browse files Browse the repository at this point in the history
  • Loading branch information
@kenorb
kenorb committed Mar 26, 2018
1 parent 6bfdf13 commit a410119
Show file tree
Hide file tree
Showing 4 changed files with 77 additions and 78 deletions.
14 changes: 7 additions & 7 deletions src/NT/Drupal/Testing/PHPUnit/drupal_test_case.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,10 +28,10 @@

/**
*
*@todo: Perhaps move these annotations down to the instance classes and tests.
* @todo: Perhaps move these annotations down to the instance classes and tests.
*
*@runTestsInSeparateProcess
*@preserveGlobalState disabled
* @runTestsInSeparateProcess
* @preserveGlobalState disabled
*/
abstract class DrupalTestCase extends TestCase {

Expand Down Expand Up @@ -1444,15 +1444,15 @@ protected function drupalGetToken($value = '') {
* NULL to post to the current page. For multi-stage forms you can set the
* path to NULL and have it post to the last received page. Example:
*
* @code
* @code
* // First step in form.
* $edit = array(...);
* $this->drupalPost('some_url', $edit, t('Save'));
*
* // Second step in form.
* $edit = array(...);
* $this->drupalPost(NULL, $edit, t('Save'));
* @endcode
* @endcode
* @param $edit
* Field data in an associative array. Changes the current input fields
* (where possible) to the values indicated. A checkbox can be set to
Expand All @@ -1463,10 +1463,10 @@ protected function drupalGetToken($value = '') {
* Multiple select fields can be set using name[] and setting each of the
* possible values. Example:
*
* @code
* @code
* $edit = array();
* $edit['name[]'] = array('value1', 'value2');
* @endcode
* @endcode
* @param $submit
* Value of the submit button whose click is to be emulated. For example,
* t('Save'). The processing of the request depends on this value. For
Expand Down
3 changes: 1 addition & 2 deletions src/NT/Drupal/Testing/PHPUnit/drupal_unit_test_case.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,7 @@
*
*/
abstract class DrupalUnitTestCase extends DrupalTestCase {
/**
* @var int Current drupal run time level */
/* @var int Current drupal run time level */
protected $drupal_level;

public function setUp($bootstrap = DRUPAL_BOOTSTRAP_FULL, $file = UPAL_USE_DB) {
Expand Down
130 changes: 65 additions & 65 deletions src/NT/Drupal/Testing/PHPUnit/mink_drupal_test_case.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,24 +34,24 @@
*/
abstract class MinkDrupalTestCase extends DrupalWebTestCase {
/**
* Mink instance.
*
* @var Behat\Mink\Mink
*/
* Mink instance.
*
* @var Behat\Mink\Mink
*/
private static $minkTestCaseMinkInstance;

/**
* Initializes mink instance.
*/
* Initializes mink instance.
*/
public static function setUpBeforeClass()
{
self::$minkTestCaseMinkInstance = new Mink();
static::registerMinkSessions(self::$minkTestCaseMinkInstance);
}

/**
* Destroys mink instance.
*/
* Destroys mink instance.
*/
public static function tearDownAfterClass()
{
if (null !== self::$minkTestCaseMinkInstance) {
Expand All @@ -61,18 +61,18 @@ public static function tearDownAfterClass()
}

/**
* Reset started sessions.
*/
* Reset started sessions.
*/
protected function tearDown()
{
parent::tearDown();
}

/**
* Returns Mink instance.
*
* @return Behat\Mink\Mink
*/
* Returns Mink instance.
*
* @return Behat\Mink\Mink
*/
public function getMink()
{
if (null === self::$minkTestCaseMinkInstance) {
Expand All @@ -85,12 +85,12 @@ public function getMink()
}

/**
* Returns current Mink session.
*
* @param string|null name of the session OR active session will be used
*
* @return Behat\Mink\Session
*/
* Returns current Mink session.
*
* @param string|null name of the session OR active session will be used
*
* @return Behat\Mink\Session
*/
public function getSession($name = null)
{
return $this->getMink()->getSession($name);
Expand All @@ -107,22 +107,22 @@ public function takeScreenShot($path, $file = NULL) {
}
}
/**
* Registers Mink sessions on it's initialization.
*
* @param Behat\Mink\Mink $mink Mink manager instance
*/
* Registers Mink sessions on it's initialization.
*
* @param Behat\Mink\Mink $mink Mink manager instance
*/
protected static function registerMinkSessions(Mink $mink)
{
}

/**
* Initizalizes and returns new GoutteDriver session.
*
* @param array $zendConfig zend config parameters
* @param array $serverParameters server parameters
*
* @return Behat\Mink\Session
*/
* Initizalizes and returns new GoutteDriver session.
*
* @param array $zendConfig zend config parameters
* @param array $serverParameters server parameters
*
* @return Behat\Mink\Session
*/
protected static function initGoutteSession(array $zendConfig = array(), array $serverParameters = array())
{
$zendConfig = array_merge(array('encodecookies' => false), $zendConfig);
Expand All @@ -131,30 +131,30 @@ protected static function initGoutteSession(array $zendConfig = array(), array $
}

/**
* Initizalizes and returns new SahiDriver session.
*
* @param string $browser browser name to use (default = firefox)
* @param array $sid sahi SID
* @param string $host sahi proxy host
* @param integer $port port number
*
* @return Behat\Mink\Session
*/
* Initizalizes and returns new SahiDriver session.
*
* @param string $browser browser name to use (default = firefox)
* @param array $sid sahi SID
* @param string $host sahi proxy host
* @param integer $port port number
*
* @return Behat\Mink\Session
*/
protected static function initSahiSession($browser = 'firefox', $sid = null, $host = 'localhost', $port = 9999)
{
return new Session(new SahiDriver($browser, new SahiClient(new SahiConnection($sid, $host, $port))));
}

/**
* Initizalizes and returns new ZombieDriver session.
*
* @param string $host zombie.js server host
* @param integer $port port number
* @param Boolean $autoServer use bundled with driver server or manually started one
* @param string $nodeBin path to node binary
*
* @return Behat\Mink\Session
*/
* Initizalizes and returns new ZombieDriver session.
*
* @param string $host zombie.js server host
* @param integer $port port number
* @param Boolean $autoServer use bundled with driver server or manually started one
* @param string $nodeBin path to node binary
*
* @return Behat\Mink\Session
*/
protected static function initZombieSession($host = '127.0.0.1', $port = 8124,
$autoServer = true, $nodeBin = 'node')
{
Expand All @@ -165,15 +165,15 @@ protected static function initZombieSession($host = '127.0.0.1', $port = 8124,
}

/**
* Initizalizes and returns new SeleniumDriver session.
*
* @param string $browser browser info
* @param string $baseUrl selenium start url
* @param string $host selenium server server host
* @param integer $port port number
*
* @return Behat\Mink\Session
*/
* Initizalizes and returns new SeleniumDriver session.
*
* @param string $browser browser info
* @param string $baseUrl selenium start url
* @param string $host selenium server server host
* @param integer $port port number
*
* @return Behat\Mink\Session
*/
protected static function initSeleniumSession($browser = '*firefox',
$baseUrl = 'http://localhost',
$host = '127.0.0.1', $port = 4444)
Expand All @@ -182,13 +182,13 @@ protected static function initSeleniumSession($browser = '*firefox',
}

/**
* Initizalizes and returns new Selenium2Driver session.
*
* @param string $browser browser name
* @param string $host selenium server server host
*
* @return Behat\Mink\Session
*/
* Initizalizes and returns new Selenium2Driver session.
*
* @param string $browser browser name
* @param string $host selenium server server host
*
* @return Behat\Mink\Session
*/
protected static function initWebdriverSession($browser = 'firefox',
$desiredCapabilities = NULL,
$host = 'http://localhost:4444/wd/hub')
Expand Down
8 changes: 4 additions & 4 deletions src/NT/Drupal/Testing/PHPUnit/nt_mink_drupal_test_case.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -182,11 +182,11 @@ protected function loadPlaywright(array $config) {


/**
* #edit-bbpa-item-grouping-und-none, #edit-bbpa-item-grouping-und-fnt-video, #edit-bbpa-item-grouping-und-fnt-also
* #edit-bbpa-item-grouping-und-browse, #edit-bbpa-item-grouping-und-featured-cont.
* #edit-bbpa-item-grouping-und-none, #edit-bbpa-item-grouping-und-fnt-video, #edit-bbpa-item-grouping-und-fnt-also
* #edit-bbpa-item-grouping-und-browse, #edit-bbpa-item-grouping-und-featured-cont.
*
* @param array $config
*/
* @param array $config
*/
protected function loadFeaturedItem(array $config) {

$config += array(
Expand Down

0 comments on commit a410119

Please sign in to comment.