Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
#47-fix-callable-plugin-name merge master
- Loading branch information
Showing
10 changed files
with
267 additions
and
139 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,5 +1,9 @@ | ||
| language: php | ||
|
|
||
| services: | ||
| - mysql | ||
| - postgresql | ||
|
|
||
| php: | ||
| - 5.6 | ||
| - 7.0 | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,119 @@ | ||
| <?php | ||
| namespace CakeDC\Auth\Test; | ||
|
|
||
| use Cake\Console\ConsoleIo; | ||
| use Cake\Core\Configure; | ||
| use Cake\ORM\TableRegistry; | ||
|
|
||
| trait BaseTestTrait | ||
| { | ||
| /** | ||
| * Sets up the session as a logged in user for an user with id $id | ||
| * | ||
| * @param string $id User id. | ||
| * @return void | ||
| */ | ||
| public function loginAsUserId($id) | ||
| { | ||
| $data = TableRegistry::getTableLocator() | ||
| ->get(Configure::read('Users.table', 'Users'))->get($id)->toArray(); | ||
| $this->session(['Auth' => ['User' => $data]]); | ||
| } | ||
|
|
||
| /** | ||
| * Login as a username | ||
| * | ||
| * @param string $username The username to use. | ||
| * @return void | ||
| */ | ||
| public function loginAsUserName($username) | ||
| { | ||
| $data = TableRegistry::getTableLocator() | ||
| ->get(Configure::read('Users.table', 'Users'))->findByUsername($username)->first()->toArray(); | ||
| $this->session(['Auth' => ['User' => $data]]); | ||
| } | ||
|
|
||
| /** | ||
| * @return bool | ||
| */ | ||
| protected function _isVerboseOrDebug() | ||
| { | ||
| return !empty(array_intersect(['--debug', '--verbose', '-v'], $_SERVER['argv'])); | ||
| } | ||
|
|
||
| /** | ||
| * Test permission of one $url when logged as a specific $username | ||
| * | ||
| * @param string $url The est url. | ||
| * @param string $username The test username. | ||
| * @param string $method The test request method, 'post' or 'get'. | ||
| * @param string $ajax The test request is ajax or not? 'ajax' for yes and 'no-ajax' if not. | ||
| * @param string $responseCode The expected response code. | ||
| * @param string $responseContains The expected value to contains in response. When expected response code 302 it | ||
| * will check for 'Location' header, otherwise will check body response. | ||
| * @throws \PHPUnit\Exception | ||
| */ | ||
| protected function _testPermissions($url, $username, $method, $ajax, $responseCode, $responseContains) | ||
| { | ||
| if ($this->_isVerboseOrDebug()) { | ||
| (new ConsoleIo())->info(__( | ||
| "\nUrl: {0} Username: {1} Method: {2} Ajax?: {3} Response Code: {4} Response Contains: {5} ", | ||
| $url, | ||
| $username, | ||
| $method, | ||
| $ajax, | ||
| $responseCode, | ||
| $responseContains | ||
| ), 0); | ||
| } | ||
| $this->loginAsUserName($username); | ||
| if ($ajax === 'ajax') { | ||
| $_SERVER['HTTP_X_REQUESTED_WITH'] = 'XMLHttpRequest'; | ||
| } | ||
| if ($method === 'post') { | ||
| $this->enableCsrfToken(); | ||
| $this->enableSecurityToken(); | ||
| $this->post($url); | ||
| } else { | ||
| $this->get($url); | ||
| } | ||
| if ($responseCode === '200') { | ||
| $this->assertResponseOk(); | ||
| } else { | ||
| $this->assertResponseCode((int)$responseCode); | ||
| } | ||
|
|
||
| if ($responseContains) { | ||
| $this->assertResponseContains($responseContains); | ||
| } else { | ||
| $this->assertEmpty((string)$this->_response->getBody()); | ||
| } | ||
| } | ||
|
|
||
| /** | ||
| * Test permissions based on CSV file content, one test for each row. | ||
| * | ||
| * @param string $csv CSV name | ||
| * | ||
| * @return array | ||
| * @dataProvider provider | ||
| * @throws \PHPUnit\Exception | ||
| */ | ||
| public function testPermissions($csv) | ||
| { | ||
| $this->assertTrue(file_exists(TESTS . 'Provider' . DS . $csv)); | ||
| $rows = array_map('str_getcsv', file(TESTS . 'Provider' . DS . $csv)); | ||
| foreach ($rows as $row) { | ||
| if ($row[0][0] === '#') { | ||
| continue; | ||
| } | ||
| list($url, $username, $method, $ajax, $responseCode, $responseContains) = array_pad($row, 6, null); | ||
| $this->setUp(); | ||
| $this->_testPermissions($url, $username, $method, $ajax, $responseCode, $responseContains); | ||
| $this->tearDown(); | ||
| } | ||
| } | ||
| } | ||
|
|
||
| // @deprecated 4.0.2 Add backwards compatibility alias. | ||
| class_alias('CakeDC\Auth\Test\BaseTestTrait', 'CakeDC\Auth\Test\BaseTraitTest'); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,109 +1,4 @@ | ||
| <?php | ||
| namespace CakeDC\Auth\Test; | ||
|
|
||
| use Cake\Console\ConsoleIo; | ||
| use Cake\Core\Configure; | ||
| use Cake\ORM\TableRegistry; | ||
|
|
||
| trait BaseTraitTest | ||
| { | ||
| /** | ||
| * Sets up the session as a logged in user for an user with id $id | ||
| * | ||
| * @param $id | ||
| * @return void | ||
| */ | ||
| public function loginAsUserId($id) | ||
| { | ||
| $data = TableRegistry::getTableLocator() | ||
| ->get(Configure::read('Users.table', 'Users'))->get($id)->toArray(); | ||
| $this->session(['Auth' => ['User' => $data]]); | ||
| } | ||
|
|
||
| /** | ||
| * Login as a username | ||
| * | ||
| * @param $username | ||
| * @return void | ||
| */ | ||
| public function loginAsUserName($username) | ||
| { | ||
| $data = TableRegistry::getTableLocator() | ||
| ->get(Configure::read('Users.table', 'Users'))->findByUsername($username)->first()->toArray(); | ||
| $this->session(['Auth' => ['User' => $data]]); | ||
| } | ||
|
|
||
| /** | ||
| * @return bool | ||
| */ | ||
| protected function _isVerboseOrDebug() | ||
| { | ||
| return !empty(array_intersect(['--debug', '--verbose', '-v'], $_SERVER['argv'])); | ||
| } | ||
|
|
||
| /** | ||
| * @param $url | ||
| * @param $username | ||
| * @param $method | ||
| * @param $ajax | ||
| * @param $responseCode | ||
| * @param $responseContains | ||
| * @throws \PHPUnit\Exception | ||
| */ | ||
| protected function _testPermissions($url, $username, $method, $ajax, $responseCode, $responseContains) | ||
| { | ||
| if ($this->_isVerboseOrDebug()) { | ||
| (new ConsoleIo())->info(__( | ||
| "\nUrl: {0} Username: {1} Method: {2} Ajax?: {3} Response Code: {4} Response Contains: {5} ", | ||
| $url, | ||
| $username, | ||
| $method, | ||
| $ajax, | ||
| $responseCode, | ||
| $responseContains | ||
| ), 0); | ||
| } | ||
| $this->loginAsUserName($username); | ||
| if ($ajax === 'ajax') { | ||
| $_SERVER['HTTP_X_REQUESTED_WITH'] = 'XMLHttpRequest'; | ||
| } | ||
| if ($method === 'post') { | ||
| $this->enableCsrfToken(); | ||
| $this->enableSecurityToken(); | ||
| $this->post($url); | ||
| } else { | ||
| $this->get($url); | ||
| } | ||
| if ($responseCode === '200') { | ||
| $this->assertResponseOk(); | ||
| } else { | ||
| $this->assertResponseCode((int)$responseCode); | ||
| } | ||
|
|
||
| if ($responseContains) { | ||
| $this->assertResponseContains($responseContains); | ||
| } else { | ||
| $this->assertEmpty((string)$this->_response->getBody()); | ||
| } | ||
| } | ||
|
|
||
| /** | ||
| * @param $csv | ||
| * @return array | ||
| * @dataProvider provider | ||
| */ | ||
| public function testPermissions($csv) | ||
| { | ||
| $this->assertTrue(file_exists(TESTS . 'Provider' . DS . $csv)); | ||
| $rows = array_map('str_getcsv', file(TESTS . 'Provider' . DS . $csv)); | ||
| foreach ($rows as $row) { | ||
| if ($row[0][0] === '#') { | ||
| continue; | ||
| } | ||
| list($url, $username, $method, $ajax, $responseCode, $responseContains) = array_pad($row, 6, null); | ||
| $this->setUp(); | ||
| $this->_testPermissions($url, $username, $method, $ajax, $responseCode, $responseContains); | ||
| $this->tearDown(); | ||
| } | ||
| } | ||
| } | ||
| // @deprecated 4.0.2 Load new trait and alias | ||
| trait_exists('CakeDC\Auth\Test\BaseTestTrait'); | ||
| deprecationWarning('Use CakeDC\Auth\Test\BaseTestTrait instead of CakeDC\Auth\Test\BaseTraitTest.'); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.