Correctly run the phpunit tests again

Signed-off-by: Joas Schilling <coding@schilljs.com>
This commit is contained in:
Joas Schilling 2020-07-10 13:12:20 +02:00
parent 92e79fa024
commit 9085f08269
No known key found for this signature in database
GPG Key ID: 7076EA9751AACDDA
5 changed files with 9 additions and 6 deletions

View File

@ -2,6 +2,7 @@
namespace OCA\Registration\Tests\Integration\Controller;
use OCA\Registration\Controller\RegisterController;
use OCA\Registration\Db\RegistrationMapper;
use OCA\Registration\Service\MailService;
use OCA\Registration\Service\RegistrationService;

View File

@ -5,6 +5,7 @@ namespace OCA\Registration\Tests\Integration\Service;
use OCA\Registration\Db\Registration;
use OCA\Registration\Db\RegistrationMapper;
use OCA\Registration\Service\MailService;
use OCA\Registration\Service\RegistrationException;
use OCA\Registration\Service\RegistrationService;
use OCP\Defaults;
use OCP\IConfig;
@ -133,11 +134,11 @@ class RegistrationServiceTest extends TestCase {
}
/**
* @depends testValidateNewEmailWithinAllowedDomain
* @expectedException OCA\Registration\Service\RegistrationException
*/
public function testValidateNewEmailNotWithinAllowedDomain() {
$email2 = 'bbbb@gmail.com';
$this->expectException(RegistrationException::class);
$this->service->validateEmail($email2);
}
@ -155,11 +156,11 @@ class RegistrationServiceTest extends TestCase {
}
/**
* @depends testValidateNewEmailWithinMultipleAllowedDomain
* @expectedException OCA\Registration\Service\RegistrationException
*/
public function testValidateNewEmailNotWithinMultipleAllowedDomain() {
$email2 = 'cccc@yahoo.com';
$this->expectException(RegistrationException::class);
$this->service->validateEmail($email2);
}
@ -213,7 +214,6 @@ class RegistrationServiceTest extends TestCase {
/**
* @depends testCreateAccountWebForm
* @expectedException OCA\Registration\Service\RegistrationException
*/
public function testDuplicateUsernameWebForm() {
$reg = new Registration();
@ -223,6 +223,7 @@ class RegistrationServiceTest extends TestCase {
//$reg->setPassword("asdf");
$reg->setEmailConfirmed(true);
$this->expectException(RegistrationException::class);
$resulting_user = $this->service->createAccount($reg, 'alice1', 'asdf');
}
@ -236,7 +237,6 @@ class RegistrationServiceTest extends TestCase {
/**
* @depends testCreateAccountWebForm
* @expectedException OCA\Registration\Service\RegistrationException
*/
public function testDuplicateUsernameApi() {
$reg = new Registration();
@ -246,6 +246,7 @@ class RegistrationServiceTest extends TestCase {
$reg->setPassword("asdf");
$reg->setEmailConfirmed(true);
$this->expectException(RegistrationException::class);
$resulting_user = $this->service->createAccount($reg);
}

View File

@ -11,6 +11,7 @@
namespace OCA\Registration\Tests\Unit\Controller;
use OCA\Registration\Controller\ApiController;
use OCA\Registration\Db\Registration;
use OCA\Registration\Service\MailService;
use OCA\Registration\Service\RegistrationService;

View File

@ -3,7 +3,7 @@
verbose="true"
>
<testsuite name='Registration app tests'>
<directory suffix='Test.php'>integration</directory>
<directory suffix='Test.php'>Integration</directory>
</testsuite>
<!-- filters for code coverage -->
<filter>

View File

@ -3,7 +3,7 @@
verbose="true"
>
<testsuite name='Registration app tests'>
<directory suffix='Test.php'>unit</directory>
<directory suffix='Test.php'>Unit</directory>
</testsuite>
<!-- filters for code coverage -->
<filter>