projects
/
civicrm-core.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge pull request #4087 from robinmitra/master
[civicrm-core.git]
/
tests
/
phpunit
/
CiviTest
/
CiviSeleniumSettings.php.txt
diff --git
a/tests/phpunit/CiviTest/CiviSeleniumSettings.php.txt
b/tests/phpunit/CiviTest/CiviSeleniumSettings.php.txt
index 96efd31993b755d072c391fe6660afa87db9724f..37b868d4875c0f9cb22c6328aba6eca20fcd111c 100644
(file)
--- a/
tests/phpunit/CiviTest/CiviSeleniumSettings.php.txt
+++ b/
tests/phpunit/CiviTest/CiviSeleniumSettings.php.txt
@@
-19,22
+19,35
@@
class CiviSeleniumSettings {
var $sandboxURL = 'http://devel.drupal.tests.dev.civicrm.org';
var $sandboxPATH = '';
var $sandboxURL = 'http://devel.drupal.tests.dev.civicrm.org';
var $sandboxPATH = '';
-
+
var $username = 'demo';
var $password = 'demo';
var $adminUsername = 'USERNAME';
var $username = 'demo';
var $password = 'demo';
var $adminUsername = 'USERNAME';
-
+
var $adminPassword = 'PASSWORD';
var $adminPassword = 'PASSWORD';
+ var $adminApiKey = NULL; // civicrm_contact.api_key for admin
+
var $UFemail = 'noreply@civicrm.org';
var $UFemail = 'noreply@civicrm.org';
+ /**
+ * @var string site API key
+ */
+ var $siteKey = NULL;
+
/**
* @var int seconds
*/
var $timeout = 30;
/**
* @var int seconds
*/
var $timeout = 30;
+ /**
+ * @var array
+ * @see CiviSeleniumTestCase::setCookies
+ */
+ var $cookies = array();
+
/**
* @var int|NULL seconds to wait for SeleniumRC to become available
*
/**
* @var int|NULL seconds to wait for SeleniumRC to become available
*
@@
-47,6
+60,12
@@
class CiviSeleniumSettings {
function __construct() {
$this->fullSandboxPath = $this->sandboxURL . $this->sandboxPATH;
function __construct() {
$this->fullSandboxPath = $this->sandboxURL . $this->sandboxPATH;
+ // $this->cookies[] = array(
+ // 'name' => 'mycookie',
+ // 'value' => 'myvalue',
+ // 'path' => '/',
+ // 'max_age' => 24*60*60,
+ // );;
}
}
}
}