Refactored models.

This commit is contained in:
Dmitry Khomutov 2018-03-10 01:00:53 +07:00
commit fb11ba4652
No known key found for this signature in database
GPG key ID: EC19426474B37AAC
34 changed files with 2006 additions and 2335 deletions

View file

@ -126,32 +126,16 @@ class BuildTest extends \PHPUnit\Framework\TestCase
];
$build = new Build();
$build->setExtra(json_encode($info));
$build->setExtra($info);
self::assertEquals('Item One', $build->getExtra('item1'));
self::assertEquals(2, $build->getExtra('item2'));
self::assertNull($build->getExtra('item3'));
self::assertEquals($info, $build->getExtra());
$build->setExtraValue('item3', 'Item Three');
$build->addExtraValue('item3', 'Item Three');
self::assertEquals('Item One', $build->getExtra('item1'));
self::assertEquals('Item Three', $build->getExtra('item3'));
$build->setExtraValues([
'item3' => 'Item Three New',
'item4' => 4,
]);
self::assertEquals('Item One', $build->getExtra('item1'));
self::assertEquals('Item Three New', $build->getExtra('item3'));
self::assertEquals(4, $build->getExtra('item4'));
self::assertEquals([
'item1' => 'Item One',
'item2' => 2,
'item3' => 'Item Three New',
'item4' => 4,
], $build->getExtra());
}
}

View file

@ -148,7 +148,7 @@ class BuildServiceTest extends \PHPUnit\Framework\TestCase
$build->setFinishDate(new \DateTime());
$build->setCommitMessage('test');
$build->setCommitterEmail('test@example.com');
$build->setExtra(json_encode(['item1' => 1001]));
$build->setExtra(['item1' => 1001]);
$returnValue = $this->testedService->createDuplicateBuild($build);

View file

@ -48,7 +48,7 @@ class ProjectServiceTest extends \PHPUnit\Framework\TestCase
$options = [
'ssh_private_key' => 'private',
'ssh_public_key' => 'public',
'allow_public_status' => 1,
'allow_public_status' => true,
'build_config' => 'config',
'branch' => 'testbranch',
];
@ -59,7 +59,7 @@ class ProjectServiceTest extends \PHPUnit\Framework\TestCase
self::assertEquals('public', $returnValue->getSshPublicKey());
self::assertEquals('config', $returnValue->getBuildConfig());
self::assertEquals('testbranch', $returnValue->getBranch());
self::assertEquals(1, $returnValue->getAllowPublicStatus());
self::assertEquals(true, $returnValue->getAllowPublicStatus());
}
/**
@ -92,7 +92,7 @@ class ProjectServiceTest extends \PHPUnit\Framework\TestCase
public function testExecute_EmptyPublicStatus()
{
$project = new Project();
$project->setAllowPublicStatus(1);
$project->setAllowPublicStatus(true);
$options = [
'ssh_private_key' => 'private',
@ -102,7 +102,7 @@ class ProjectServiceTest extends \PHPUnit\Framework\TestCase
$returnValue = $this->testedService->updateProject($project, 'Test Project', 'github', 'block8/phpci', $options);
self::assertEquals(0, $returnValue->getAllowPublicStatus());
self::assertEquals(false, $returnValue->getAllowPublicStatus());
}
public function testExecute_DeleteProject()

View file

@ -39,14 +39,14 @@ class UserServiceTest extends \PHPUnit\Framework\TestCase
'Test',
'test@example.com',
'internal',
json_encode(['type' => 'internal']),
['type' => 'internal'],
'testing',
false
);
self::assertEquals('Test', $user->getName());
self::assertEquals('test@example.com', $user->getEmail());
self::assertEquals(0, $user->getIsAdmin());
self::assertEquals(false, $user->getIsAdmin());
self::assertTrue(password_verify('testing', $user->getHash()));
}
@ -56,12 +56,12 @@ class UserServiceTest extends \PHPUnit\Framework\TestCase
'Test',
'test@example.com',
'internal',
json_encode(['type' => 'internal']),
['type' => 'internal'],
'testing',
true
);
self::assertEquals(1, $user->getIsAdmin());
self::assertEquals(true, $user->getIsAdmin());
}
public function testExecute_RevokeAdminStatus()
@ -69,10 +69,10 @@ class UserServiceTest extends \PHPUnit\Framework\TestCase
$user = new User();
$user->setEmail('test@example.com');
$user->setName('Test');
$user->setIsAdmin(1);
$user->setIsAdmin(true);
$user = $this->testedService->updateUser($user, 'Test', 'test@example.com', 'testing', 0);
self::assertEquals(0, $user->getIsAdmin());
$user = $this->testedService->updateUser($user, 'Test', 'test@example.com', 'testing', false);
self::assertEquals(false, $user->getIsAdmin());
}
public function testExecute_GrantAdminStatus()
@ -80,10 +80,10 @@ class UserServiceTest extends \PHPUnit\Framework\TestCase
$user = new User();
$user->setEmail('test@example.com');
$user->setName('Test');
$user->setIsAdmin(0);
$user->setIsAdmin(false);
$user = $this->testedService->updateUser($user, 'Test', 'test@example.com', 'testing', 1);
self::assertEquals(1, $user->getIsAdmin());
$user = $this->testedService->updateUser($user, 'Test', 'test@example.com', 'testing', true);
self::assertEquals(true, $user->getIsAdmin());
}
public function testExecute_ChangesPasswordIfNotEmpty()
@ -91,7 +91,7 @@ class UserServiceTest extends \PHPUnit\Framework\TestCase
$user = new User();
$user->setHash(password_hash('testing', PASSWORD_DEFAULT));
$user = $this->testedService->updateUser($user, 'Test', 'test@example.com', 'newpassword', 0);
$user = $this->testedService->updateUser($user, 'Test', 'test@example.com', 'newpassword', false);
self::assertFalse(password_verify('testing', $user->getHash()));
self::assertTrue(password_verify('newpassword', $user->getHash()));
}
@ -101,7 +101,7 @@ class UserServiceTest extends \PHPUnit\Framework\TestCase
$user = new User();
$user->setHash(password_hash('testing', PASSWORD_DEFAULT));
$user = $this->testedService->updateUser($user, 'Test', 'test@example.com', '', 0);
$user = $this->testedService->updateUser($user, 'Test', 'test@example.com', '', false);
self::assertTrue(password_verify('testing', $user->getHash()));
}
}