silverstripe / silverstripe-akismet

tests/AkismetTest.php

Spacing +3 added lines, -3 removed lines

@@ -62,7 +62,7 @@ 
         $this->assertEquals('person', $saved->Name);
         $this->assertEquals('person@domain.com', $saved->Email);
         $this->assertEquals('what a nice comment', $saved->Content);
-        $this->assertEquals(false, (bool)$saved->IsSpam);
+        $this->assertEquals(false, (bool) $saved->IsSpam);
         $saved->delete();
 
         // Test failed setting
@@ -100,7 +100,7 @@ 
         $this->assertEquals('person', $saved->Name);
         $this->assertEquals('person@domain.com', $saved->Email);
         $this->assertEquals('what a nice comment', $saved->Content);
-        $this->assertEquals(false, (bool)$saved->IsSpam);
+        $this->assertEquals(false, (bool) $saved->IsSpam);
         $saved->delete();
 
         $this->markTestIncomplete('@todo fix form validation message in AkismetField');
@@ -123,7 +123,7 @@ 
         $this->assertEquals('spam', $saved->Name);
         $this->assertEquals('spam@spam.com', $saved->Email);
         $this->assertEquals('spam', $saved->Content);
-        $this->assertEquals(true, (bool)$saved->IsSpam);
+        $this->assertEquals(true, (bool) $saved->IsSpam);
     }
 
     /**

Indentation +126 added lines, -126 removed lines

@@ -13,131 +13,131 @@
 
 class AkismetTest extends FunctionalTest
 {
-    protected static $extra_dataobjects = [AkismetTestSubmission::class];
-
-    protected $usesDatabase = true;
-
-    protected static $required_extensions = [
-        SiteConfig::class => [
-            AkismetConfig::class,
-        ],
-    ];
-
-    protected static $extra_controllers = [
-        AkismetTestController::class,
-    ];
-
-    protected function setUp()
-    {
-        parent::setUp();
-        Injector::inst()->unregisterObjects(AkismetService::class);
-
-        // Mock service
-        Config::modify()->set(Injector::class, AkismetService::class, AkismetTestService::class);
-        Config::modify()->set(AkismetSpamProtector::class, 'api_key', 'dummykey');
-
-        // Reset options to reasonable default
-        Config::modify()->remove(AkismetSpamProtector::class, 'save_spam');
-        Config::modify()->remove(AkismetSpamProtector::class, 'require_confirmation');
-        Config::modify()->remove(AkismetSpamProtector::class, 'bypass_members');
-        Config::modify()->set(AkismetSpamProtector::class, 'bypass_permission', 'ADMIN');
-    }
-
-    public function testSpamDetectionForm()
-    {
+	protected static $extra_dataobjects = [AkismetTestSubmission::class];
+
+	protected $usesDatabase = true;
+
+	protected static $required_extensions = [
+		SiteConfig::class => [
+			AkismetConfig::class,
+		],
+	];
+
+	protected static $extra_controllers = [
+		AkismetTestController::class,
+	];
+
+	protected function setUp()
+	{
+		parent::setUp();
+		Injector::inst()->unregisterObjects(AkismetService::class);
+
+		// Mock service
+		Config::modify()->set(Injector::class, AkismetService::class, AkismetTestService::class);
+		Config::modify()->set(AkismetSpamProtector::class, 'api_key', 'dummykey');
+
+		// Reset options to reasonable default
+		Config::modify()->remove(AkismetSpamProtector::class, 'save_spam');
+		Config::modify()->remove(AkismetSpamProtector::class, 'require_confirmation');
+		Config::modify()->remove(AkismetSpamProtector::class, 'bypass_members');
+		Config::modify()->set(AkismetSpamProtector::class, 'bypass_permission', 'ADMIN');
+	}
+
+	public function testSpamDetectionForm()
+	{
         
-        // Test "nice" setting
-        $result = $this->post('AkismetTestController/Form', array(
-            'Name' => 'person',
-            'Email' => 'person@domain.com',
-            'Content' => 'what a nice comment',
-            'action_doSubmit' => 'Submit',
-        ));
-
-        $this->assertContains('Thanks for your submission, person', $result->getBody());
-        $saved = AkismetTestSubmission::get()->last();
-        $this->assertNotEmpty($saved);
-        $this->assertEquals('person', $saved->Name);
-        $this->assertEquals('person@domain.com', $saved->Email);
-        $this->assertEquals('what a nice comment', $saved->Content);
-        $this->assertEquals(false, (bool)$saved->IsSpam);
-        $saved->delete();
-
-        // Test failed setting
-        $result = $this->post('AkismetTestController/Form', array(
-            'Name' => 'spam',
-            'Email' => 'spam@spam.com',
-            'Content' => 'spam',
-            'action_doSubmit' => 'Submit',
-        ));
-
-        $errorMessage = _t(
-            'SilverStripe\\Akismet\\AkismetField.SPAM',
-            "Your submission has been rejected because it was treated as spam."
-        );
-        $this->assertContains($errorMessage, $result->getBody());
-        $saved = AkismetTestSubmission::get()->last();
-        $this->assertEmpty($saved);
-    }
-
-    public function testSaveSpam()
-    {
-        Config::modify()->set(AkismetSpamProtector::class, 'save_spam', true);
-
-        // Test "nice" setting
-        $result = $this->post('AkismetTestController/Form', array(
-            'Name' => 'person',
-            'Email' => 'person@domain.com',
-            'Content' => 'what a nice comment',
-            'action_doSubmit' => 'Submit',
-        ));
-
-        $this->assertContains('Thanks for your submission, person', $result->getBody());
-        $saved = AkismetTestSubmission::get()->last();
-        $this->assertNotEmpty($saved);
-        $this->assertEquals('person', $saved->Name);
-        $this->assertEquals('person@domain.com', $saved->Email);
-        $this->assertEquals('what a nice comment', $saved->Content);
-        $this->assertEquals(false, (bool)$saved->IsSpam);
-        $saved->delete();
-
-        $this->markTestIncomplete('@todo fix form validation message in AkismetField');
-
-        // Test failed setting
-        $result = $this->post('AkismetTestController/Form', array(
-            'Name' => 'spam',
-            'Email' => 'spam@spam.com',
-            'Content' => 'spam',
-            'action_doSubmit' => 'Submit',
-        ));
-
-        $errorMessage = _t(
-            'SilverStripe\\Akismet\\AkismetField.SPAM',
-            "Your submission has been rejected because it was treated as spam."
-        );
-        $this->assertContains($errorMessage, $result->getBody());
-        $saved = AkismetTestSubmission::get()->last();
-        $this->assertNotEmpty($saved);
-        $this->assertEquals('spam', $saved->Name);
-        $this->assertEquals('spam@spam.com', $saved->Email);
-        $this->assertEquals('spam', $saved->Content);
-        $this->assertEquals(true, (bool)$saved->IsSpam);
-    }
-
-    /**
-     * Test that the request processor can safely activate when able (and only then)
-     */
-    public function testProcessor()
-    {
-        $siteconfig = SiteConfig::current_site_config();
-        $siteconfig->write();
-
-        // Test assignment via request filter
-        $processor = new AkismetTestTestMiddleware();
-        $this->assertTrue($processor->publicIsDBReady());
-
-        // Remove AkismetKey field
-        DB::query('ALTER TABLE "SiteConfig" DROP COLUMN "AkismetKey"');
-        $this->assertFalse($processor->publicIsDBReady());
-    }
+		// Test "nice" setting
+		$result = $this->post('AkismetTestController/Form', array(
+			'Name' => 'person',
+			'Email' => 'person@domain.com',
+			'Content' => 'what a nice comment',
+			'action_doSubmit' => 'Submit',
+		));
+
+		$this->assertContains('Thanks for your submission, person', $result->getBody());
+		$saved = AkismetTestSubmission::get()->last();
+		$this->assertNotEmpty($saved);
+		$this->assertEquals('person', $saved->Name);
+		$this->assertEquals('person@domain.com', $saved->Email);
+		$this->assertEquals('what a nice comment', $saved->Content);
+		$this->assertEquals(false, (bool)$saved->IsSpam);
+		$saved->delete();
+
+		// Test failed setting
+		$result = $this->post('AkismetTestController/Form', array(
+			'Name' => 'spam',
+			'Email' => 'spam@spam.com',
+			'Content' => 'spam',
+			'action_doSubmit' => 'Submit',
+		));
+
+		$errorMessage = _t(
+			'SilverStripe\\Akismet\\AkismetField.SPAM',
+			"Your submission has been rejected because it was treated as spam."
+		);
+		$this->assertContains($errorMessage, $result->getBody());
+		$saved = AkismetTestSubmission::get()->last();
+		$this->assertEmpty($saved);
+	}
+
+	public function testSaveSpam()
+	{
+		Config::modify()->set(AkismetSpamProtector::class, 'save_spam', true);
+
+		// Test "nice" setting
+		$result = $this->post('AkismetTestController/Form', array(
+			'Name' => 'person',
+			'Email' => 'person@domain.com',
+			'Content' => 'what a nice comment',
+			'action_doSubmit' => 'Submit',
+		));
+
+		$this->assertContains('Thanks for your submission, person', $result->getBody());
+		$saved = AkismetTestSubmission::get()->last();
+		$this->assertNotEmpty($saved);
+		$this->assertEquals('person', $saved->Name);
+		$this->assertEquals('person@domain.com', $saved->Email);
+		$this->assertEquals('what a nice comment', $saved->Content);
+		$this->assertEquals(false, (bool)$saved->IsSpam);
+		$saved->delete();
+
+		$this->markTestIncomplete('@todo fix form validation message in AkismetField');
+
+		// Test failed setting
+		$result = $this->post('AkismetTestController/Form', array(
+			'Name' => 'spam',
+			'Email' => 'spam@spam.com',
+			'Content' => 'spam',
+			'action_doSubmit' => 'Submit',
+		));
+
+		$errorMessage = _t(
+			'SilverStripe\\Akismet\\AkismetField.SPAM',
+			"Your submission has been rejected because it was treated as spam."
+		);
+		$this->assertContains($errorMessage, $result->getBody());
+		$saved = AkismetTestSubmission::get()->last();
+		$this->assertNotEmpty($saved);
+		$this->assertEquals('spam', $saved->Name);
+		$this->assertEquals('spam@spam.com', $saved->Email);
+		$this->assertEquals('spam', $saved->Content);
+		$this->assertEquals(true, (bool)$saved->IsSpam);
+	}
+
+	/**
+	 * Test that the request processor can safely activate when able (and only then)
+	 */
+	public function testProcessor()
+	{
+		$siteconfig = SiteConfig::current_site_config();
+		$siteconfig->write();
+
+		// Test assignment via request filter
+		$processor = new AkismetTestTestMiddleware();
+		$this->assertTrue($processor->publicIsDBReady());
+
+		// Remove AkismetKey field
+		DB::query('ALTER TABLE "SiteConfig" DROP COLUMN "AkismetKey"');
+		$this->assertFalse($processor->publicIsDBReady());
+	}
 }

tests/AkismetTestSubmission.php

Indentation +7 added lines, -7 removed lines

@@ -7,12 +7,12 @@
 
 class AkismetTestSubmission extends DataObject implements TestOnly
 {
-    private static $db = array(
-        'Name' => 'Varchar',
-        'Email' => 'Varchar',
-        'Content' => 'Text',
-        'IsSpam' => 'Boolean',
-    );
+	private static $db = array(
+		'Name' => 'Varchar',
+		'Email' => 'Varchar',
+		'Content' => 'Text',
+		'IsSpam' => 'Boolean',
+	);
 
-    private static $default_sort = 'ID';
+	private static $default_sort = 'ID';
 }

tests/AkismetTestTestMiddleware.php

Indentation +4 added lines, -4 removed lines

@@ -7,8 +7,8 @@
 
 class AkismetTestTestMiddleware extends AkismetMiddleware implements TestOnly
 {
-    public function publicIsDBReady()
-    {
-        return $this->isDBReady();
-    }
+	public function publicIsDBReady()
+	{
+		return $this->isDBReady();
+	}
 }

tests/AkismetTestController.php

Indentation +38 added lines, -38 removed lines

@@ -19,47 +19,47 @@
  */
 class AkismetTestController extends Controller implements TestOnly
 {
-    private static $allowed_actions = array(
-        'Form'
-    );
+	private static $allowed_actions = array(
+		'Form'
+	);
 
-    public function Form()
-    {
-        $fields = new FieldList(
-            new TextField('Name'),
-            new EmailField('Email'),
-            new TextareaField('Content')
-        );
-        $actions = new FieldList(new FormAction('doSubmit', 'Submit'));
-        $validator = new RequiredFields('Name', 'Content');
-        $form = new Form($this, 'Form', $fields, $actions, $validator);
+	public function Form()
+	{
+		$fields = new FieldList(
+			new TextField('Name'),
+			new EmailField('Email'),
+			new TextareaField('Content')
+		);
+		$actions = new FieldList(new FormAction('doSubmit', 'Submit'));
+		$validator = new RequiredFields('Name', 'Content');
+		$form = new Form($this, 'Form', $fields, $actions, $validator);
 
-        $form->enableSpamProtection(array(
-            'protector' => AkismetSpamProtector::class,
-            'name' => 'IsSpam',
-            'mapping' => array(
-                'Content' => 'body',
-                'Name' => 'authorName',
-                'Email' => 'authorMail',
-            )
-        ));
+		$form->enableSpamProtection(array(
+			'protector' => AkismetSpamProtector::class,
+			'name' => 'IsSpam',
+			'mapping' => array(
+				'Content' => 'body',
+				'Name' => 'authorName',
+				'Email' => 'authorMail',
+			)
+		));
 
-        // Because we don't want to be testing this
-        $form->disableSecurityToken();
-        return $form;
-    }
+		// Because we don't want to be testing this
+		$form->disableSecurityToken();
+		return $form;
+	}
 
-    public function doSubmit($data, Form $form)
-    {
-        $item = new AkismetTestSubmission();
-        $form->saveInto($item);
-        $item->write();
-        $form->sessionMessage('Thanks for your submission, ' . $data['Name'], 'good');
-        return $this->redirect($this->Link());
-    }
+	public function doSubmit($data, Form $form)
+	{
+		$item = new AkismetTestSubmission();
+		$form->saveInto($item);
+		$item->write();
+		$form->sessionMessage('Thanks for your submission, ' . $data['Name'], 'good');
+		return $this->redirect($this->Link());
+	}
 
-    public function Link($action = null)
-    {
-        return 'AkismetTestController';
-    }
+	public function Link($action = null)
+	{
+		return 'AkismetTestController';
+	}
 }

Spacing +1 added lines, -1 removed lines

@@ -54,7 +54,7 @@
         $item = new AkismetTestSubmission();
         $form->saveInto($item);
         $item->write();
-        $form->sessionMessage('Thanks for your submission, ' . $data['Name'], 'good');
+        $form->sessionMessage('Thanks for your submission, '.$data['Name'], 'good');
         return $this->redirect($this->Link());
     }
 

tests/AkismetTestService.php

Indentation +11 added lines, -11 removed lines

@@ -8,16 +8,16 @@
 
 class AkismetTestService implements TestOnly, AkismetService
 {
-    public function __construct($apiKey, $url)
-    {
-        if ($apiKey !== 'dummykey') {
-            throw new Exception("Invalid key");
-        }
-    }
+	public function __construct($apiKey, $url)
+	{
+		if ($apiKey !== 'dummykey') {
+			throw new Exception("Invalid key");
+		}
+	}
     
-    public function isSpam($content, $author = null, $email = null, $url = null, $permalink = null, $type = null)
-    {
-        // This dummy service only checks the content
-        return $content === 'spam';
-    }
+	public function isSpam($content, $author = null, $email = null, $url = null, $permalink = null, $type = null)
+	{
+		// This dummy service only checks the content
+		return $content === 'spam';
+	}
 }

tests/AkismetSpamProtectorTest.php

Indentation +17 added lines, -17 removed lines

@@ -9,26 +9,26 @@
 
 class AkismetSpamProtectorTest extends SapphireTest
 {
-    public function testGetApiKeyPriority()
-    {
-        $spamProtector = AkismetSpamProtector::singleton();
+	public function testGetApiKeyPriority()
+	{
+		$spamProtector = AkismetSpamProtector::singleton();
 
-        // Clear all possible values from the environment
-        Config::modify()->set(AkismetSpamProtector::class, 'api_key', '');
-        Environment::setEnv('SS_AKISMET_API_KEY', '');
-        $this->assertSame('', $spamProtector->getApiKey(), 'Blank string returned by default');
+		// Clear all possible values from the environment
+		Config::modify()->set(AkismetSpamProtector::class, 'api_key', '');
+		Environment::setEnv('SS_AKISMET_API_KEY', '');
+		$this->assertSame('', $spamProtector->getApiKey(), 'Blank string returned by default');
 
-        // Set some values in all possible places
-        $spamProtector->setApiKey('instance_api_key');
-        Config::modify()->set(AkismetSpamProtector::class, 'api_key', 'config_api_key');
-        Environment::setEnv('SS_AKISMET_API_KEY', 'env_api_key');
+		// Set some values in all possible places
+		$spamProtector->setApiKey('instance_api_key');
+		Config::modify()->set(AkismetSpamProtector::class, 'api_key', 'config_api_key');
+		Environment::setEnv('SS_AKISMET_API_KEY', 'env_api_key');
 
-        $this->assertSame('instance_api_key', $spamProtector->getApiKey(), 'Instance value is given priority');
+		$this->assertSame('instance_api_key', $spamProtector->getApiKey(), 'Instance value is given priority');
 
-        $spamProtector->setApiKey('');
-        $this->assertSame('config_api_key', $spamProtector->getApiKey(), 'Config value is second priority');
+		$spamProtector->setApiKey('');
+		$this->assertSame('config_api_key', $spamProtector->getApiKey(), 'Config value is second priority');
 
-        Config::modify()->set(AkismetSpamProtector::class, 'api_key', '');
-        $this->assertSame('env_api_key', $spamProtector->getApiKey(), 'Environment value is last priority');
-    }
+		Config::modify()->set(AkismetSpamProtector::class, 'api_key', '');
+		$this->assertSame('env_api_key', $spamProtector->getApiKey(), 'Environment value is last priority');
+	}
 }