Merge pull request #19 from tractorcow/pulls/fix-tests

BUG Fix travis / unit tests
This commit is contained in:
Damian Mooyman 2015-03-25 12:59:49 +13:00
commit 747a801ba5
3 changed files with 18 additions and 10 deletions

View File

@ -10,7 +10,7 @@ env:
matrix:
include:
- php: 5.4
env: DB=MYSQL CORE_RELEASE=master
env: DB=MYSQL CORE_RELEASE=3
before_script:
- git clone git://github.com/silverstripe-labs/silverstripe-travis-support.git ~/travis-support
@ -18,4 +18,4 @@ before_script:
- cd ~/builds/ss
script:
- phpunit userforms/tests/
- vendor/bin/phpunit spamprotection/tests/

View File

@ -13,6 +13,9 @@
"require": {
"silverstripe/framework": "~3.1"
},
"require-dev": {
"phpunit/PHPUnit": "~3.7@stable"
},
"extra": {
"branch-alias": {
"dev-master": "2.0.x-dev"

View File

@ -6,6 +6,11 @@
class FormSpamProtectionExtensionTest extends SapphireTest {
protected $usesDatabase = false;
/**
* @var Form
*/
protected $form = null;
public function setUp() {
parent::setUp();
@ -16,6 +21,7 @@ class FormSpamProtectionExtensionTest extends SapphireTest {
new TextField('URL')
), new FieldList()
);
$this->form->disableSecurityToken();
}
public function testEnableSpamProtection() {
@ -36,14 +42,14 @@ class FormSpamProtectionExtensionTest extends SapphireTest {
));
$this->assertEquals('Bar', $form->Fields()->fieldByName('Captcha')->Title());
}
$protector = new FormSpamProtectionExtensionTest_BarProtector();
$protector->title = "Baz";
public function testEnableSpamProtectionCustomTitle() {
$form = $this->form->enableSpamProtection(array(
'protector' => $protector
'protector' => 'FormSpamProtectionExtensionTest_BarProtector',
'title' => 'Baz',
));
$this->assertEquals('Baz', $form->Fields()->fieldByName('Captcha')->Title());
}
@ -106,10 +112,9 @@ class FormSpamProtectionExtensionTest_BazProtector implements SpamProtector, Tes
*/
class FormSpamProtectionExtensionTest_BarProtector implements SpamProtector, TestOnly {
public $title = 'Bar';
public function getFormField($name = null, $title = null, $value = null) {
return new TextField($name, $this->title, $value);
$title = $title ?: 'Bar';
return new TextField($name, $title, $value);
}
public function setFieldMapping($fieldMapping) {}