Commit graph

239 commits

Author SHA1 Message Date
Schlaefer
bf0edd1112 fixes failing test cases in ModelTaskTest if not run in test-suite
Tests 'testSkipTablesAndAll' and 'testExecuteIntoAll' didn't took fixture
table 'core.number_tree' into account.
2014-05-14 10:34:09 +02:00
Schlaefer
021d765620 fixes falling test case for 'lengthBetween' validator 2014-05-13 10:46:50 +02:00
Jose Lorenzo Rodriguez
343d3279b9 Merge branch 'master' into 2.5
Conflicts:
	lib/Cake/Test/Case/Utility/FileTest.php
	lib/Cake/VERSION.txt
2014-04-06 21:50:41 +02:00
euromark
0d09a54033 more missing doc block tags added 2014-04-02 03:02:37 +02:00
mark_story
2c5d96e916 Merge branch 'master' into 2.5
Conflicts:
	lib/Cake/Model/Datasource/DboSource.php
2014-02-16 14:24:19 -05:00
mark_story
a5d50da040 Remove dead and unused code. 2014-02-11 16:38:24 -05:00
mark_story
be8ebfc005 Merge branch 'master' into 2.5 2014-02-05 09:22:46 -05:00
mark_story
4d57d3ce5b Fix plugin path filtering when directories do not exist.
When paths do not exist we should correctly remove them from the output
paths.

Fixes #2748
2014-01-30 21:40:08 -05:00
mark_story
c1ab6fa9d1 Merge branch 'master' into 2.5 2014-01-30 10:13:37 -05:00
joostdekeijzer
42daa25340 Fix Console "extract i18n from sources" to handle quotes in Model::validate parameters correctly 2014-01-29 14:53:52 +01:00
Brian Porter
bfdc41e8bb Baked test methods are marked incomplete.
Previously empty (and "passing") test methods now include PHPunit's `markTestIncomplete()` to better reflect the truth of the resulting file: The test methods are stubbed out, but are not yet complete and passing.

It is much easier when _running_ tests to locate incomplete test methods.

Fixes 2437.
2013-12-05 22:54:26 -06:00
mark_story
430ef88118 Merge branch 'master' into 2.5
Conflicts:
	lib/Cake/VERSION.txt
2013-11-25 23:15:15 -05:00
mark_story
5e77183afe Fix failing tests when Console group was run in isolation. 2013-11-23 12:36:02 -05:00
ADmad
dda6080579 Merge branch 'master' into 2.5 2013-11-19 00:27:12 +05:30
Marc Würth
7cfa0116f4 Removed "PHP 5" from file header DocBlocks
This statement does not serve a purpose anymore.
In a long forgotten world it indicated the main version number of PHP which the code in the file was compatible to.
http://pear.php.net/manual/en/standards.sample.php
But since PHP 5.1 and later this is only marginally true.
Thus I propose to remove it from CakePHP.
2013-11-13 22:58:39 +01:00
Marc Würth
19b972cfeb Implemented skipping of fields for the data validation rules when baking a model 2013-11-13 13:36:19 +01:00
ADmad
d9ca148499 Merge branch 'master' into 2.5
Conflicts:
	CONTRIBUTING.md
	lib/Cake/Model/Model.php
	lib/Cake/VERSION.txt
2013-10-30 02:34:09 +05:30
Marc Würth
86bc9d73cf Emptied home.ctp in test_app as much as possible
This file is never seen by anyone but gets analyzed by
``ExtractTaskTest::testExecute()``
2013-10-24 16:57:58 +02:00
Bryan Crowe
a943ea5c34 Add space between classname(s) 2013-10-22 22:59:50 -04:00
wyrihaximus
ac9b7f3882 Refactored the shell reflection portion into a seperate task. 2013-10-02 22:30:12 +02:00
euromark
58f38f1667 Fix casing of validation rules in bake 2013-09-18 18:31:55 +02:00
euromark
382f75dbfc cs corrections, bool to boolean and int to integer. 2013-09-17 14:44:34 +02:00
mark_story
4f237e6a93 Merge branch '2.4' making 2.4 into the master branch.
Conflicts:
	lib/Cake/VERSION.txt
2013-08-30 16:02:42 -04:00
Mark van Driel
88d7fbeb53 Extract category strings to separate .po files 2013-08-25 23:04:05 +02:00
mark_story
53d265cfba Merge branch 'master' into 2.4 2013-08-23 12:56:43 -04:00
Renan Gonçalves
703d9881e9 Adding files to be compared against bake generated files, fixing bake templates in the meantime.
Writing assertContains() or assertRegExp for generated code is a pain and making the test cover most part of it is very difficult.

Things like:
 ```
 } else {
 }
 ```

Are very easy to happen (which was the case) and was not being covered by the test.
2013-08-21 23:44:07 +02:00
Phally
6b41eaa950 Merge branch 'master' into 2.4 2013-07-26 19:44:11 +02:00
Phally
5953171c7b Fixes cake bake all. Refs #1443. 2013-07-20 20:21:35 +02:00
Phally
6d6be87f8f Replaces deprecated paginate() calls in controller bake templates.
Fixes #3895.
2013-07-20 16:59:39 +02:00
ADmad
4ded269549 Merge branch 'master' into 2.4
Conflicts:
	lib/Cake/Controller/Component/Auth/BlowfishAuthenticate.php
	lib/Cake/VERSION.txt
2013-07-07 12:22:12 +05:30
Rachman Chavik
4bb0a1228a Fix I18n to extract plugin model validation messages 2013-07-07 11:20:14 +07:00
ADmad
636cc8c103 Merge branch 'master' into 2.4 2013-06-09 18:08:32 +05:30
euromark
394bf1054d remove name attribute where not necessary, clean up doc blocks 2013-06-08 04:29:08 +02:00
ADmad
3303a2cda1 Merge branch 'master' into 2.4
Conflicts:
	lib/Cake/Console/Templates/skel/Config/Schema/db_acl.php
	lib/Cake/Console/Templates/skel/Config/Schema/i18n.php
	lib/Cake/Console/Templates/skel/Config/Schema/sessions.php
	lib/Cake/Console/Templates/skel/Config/acl.ini.php
	lib/Cake/Console/Templates/skel/Config/acl.php
	lib/Cake/Console/Templates/skel/Config/bootstrap.php
	lib/Cake/Console/Templates/skel/Config/core.php
	lib/Cake/Console/Templates/skel/Config/database.php.default
	lib/Cake/Console/Templates/skel/Config/email.php.default
	lib/Cake/Console/Templates/skel/Config/routes.php
	lib/Cake/Console/Templates/skel/Console/Command/AppShell.php
	lib/Cake/Console/Templates/skel/Console/cake.bat
	lib/Cake/Console/Templates/skel/Console/cake.php
	lib/Cake/Console/Templates/skel/Controller/AppController.php
	lib/Cake/Console/Templates/skel/Controller/PagesController.php
	lib/Cake/Console/Templates/skel/Model/AppModel.php
	lib/Cake/Console/Templates/skel/View/Errors/error400.ctp
	lib/Cake/Console/Templates/skel/View/Errors/error500.ctp
	lib/Cake/Console/Templates/skel/View/Helper/AppHelper.php
	lib/Cake/Console/Templates/skel/View/Layouts/Emails/html/default.ctp
	lib/Cake/Console/Templates/skel/View/Layouts/ajax.ctp
	lib/Cake/Console/Templates/skel/View/Layouts/default.ctp
	lib/Cake/Console/Templates/skel/View/Layouts/error.ctp
	lib/Cake/Console/Templates/skel/View/Layouts/flash.ctp
	lib/Cake/Console/Templates/skel/View/Pages/home.ctp
	lib/Cake/Console/Templates/skel/index.php
	lib/Cake/Console/Templates/skel/webroot/index.php
	lib/Cake/Console/Templates/skel/webroot/test.php
2013-06-02 18:03:59 +05:30
mark_story
be2a252345 Fix coding standards. 2013-05-31 10:37:20 -04:00
Marc Würth
4c9f0414cb Improved the DocBlocks and other code cleanup
Fixed @license tag, url comes first
Whitespace and other minor code cleanup
Added some docblocks
2013-05-31 00:11:19 +02:00
Mark Story
293ba4cdb9 Merge pull request #1261 from dereuromark/2.4-bake-fixtures
add schema param and skip interactive prompts if unnecessary
2013-05-07 18:59:42 -07:00
ADmad
a10275fb8b Merge branch 'master' into 2.4
Conflicts:
	lib/Cake/Test/Case/Model/Datasource/Database/PostgresTest.php
2013-05-05 14:36:46 +05:30
euromark
0959c7008f add schema param and skip interactive prompts if unnecessary 2013-05-02 00:19:46 +02:00
euromark
5b298c1306 remove copyright noise from test files to unify with new newer files which don't contain it anymore anyway 2013-04-29 17:16:53 +02:00
euromark
dab0c5e753 Allow behaviors to be added to bake templates and improve doc blocks 2013-03-15 12:14:06 +01:00
Adam Taylor
433dd09ec4 Fix typos 2013-03-05 00:05:14 -07:00
ADmad
431e610317 Fix broken tests 2013-02-08 19:04:41 +05:30
Graham Weldon
26a08c6780 Updated copyright 2013-02-08 21:28:17 +09:00
Graham Weldon
66d856d883 Added extra line for referencing license file for copyright 2013-02-08 21:22:51 +09:00
Graham Weldon
7b860debe4 This commit is dedicated to Mark Story, who has put in much dedicated time and effort into CakePHP over the years.
I just wanted to ruin his evening, because this change needs to be merged into CakePHP 3.0.
2013-02-08 20:59:49 +09:00
ADmad
bb767408d3 Fix cs errors 2013-01-27 23:03:06 +05:30
mark_story
4af6039107 Merge branch 'master' into 2.3
Conflicts:
	lib/Cake/Console/Command/Task/ModelTask.php
	lib/Cake/Model/Model.php
2013-01-26 21:16:26 -05:00
Ceeram
16be9d4990 remove unused local vars 2013-01-23 17:22:06 +01:00
mark_story
95ed471c41 Reduce duplication in code.
This will result in all tests being skipped when any of the required
models pre-exists.
2013-01-16 12:59:13 -05:00
mark_story
5a6a45d0d1 Add support for --admin to bake controller all.
I missed this when originally implementing bake controller all.

Fixes #3536
2013-01-16 12:57:18 -05:00
euromark
b811afbc44 double spaces to single ones 2012-12-22 23:48:15 +01:00
mark_story
c24bec679b Merge branch 'master' into 2.3
Conflicts:
	lib/Cake/View/Helper/FormHelper.php
2012-10-27 21:13:53 -04:00
Ber Clausen
a7d9422c09 Test all empty array with assertSame() because assertEquals() does not check the type. 2012-10-26 19:21:51 -03:00
euromark
cc436146be making tests pass on windows again 2012-10-25 17:37:35 +02:00
ADmad
035f727686 Replace Model::read() with Model::find('first') in baked controller
Removed references to Ajax and Javascript helpers
2012-09-30 14:41:37 +05:30
euromark
b7f1740d2b correcting coding-standards 2012-09-28 13:49:51 +02:00
Mark Story
07c5102de5 Merge pull request #850 from ceeram/2.2-filesize
Add CakeNumber::fromReadableSize() and Validation::filesize()
2012-09-17 17:55:23 -07:00
mark_story
571c8bc08c Merge branch 'master' into 2.3
Conflicts:
	lib/Cake/Console/Command/Task/TestTask.php
2012-09-01 13:51:40 +01:00
mark_story
894fc1256a Add test cases for strings containing quotes.
Show that both double and single quoted strings are
handled correctly by ExtractTask.

Closes #3155
2012-08-30 23:48:32 +01:00
Ceeram
abe74adf8a partial remove onlyAllow from baked code, only keep in delete to be rfc compliant 2012-08-26 15:00:49 +02:00
Ceeram
27d83eedfe use new onlyAllow() method in baked code, to ensure 405 responses have required Allow header included 2012-08-25 09:38:40 +02:00
Tigran Gabrielyan
0441c9f6c3 Added tests for bake shell cache prefix generation 2012-08-24 22:52:02 -04:00
Kyle Robinson Young
cbf5328b33 Fix failing test with controller task listAll 2012-07-25 22:12:55 -07:00
mark_story
35bf3097cd Fixing missing imports in generated tests.
Fixes #3059
2012-07-23 21:25:55 -04:00
Ceeram
6ec0afcf5d Add CakeNumber::fromReadableSize() and Validation::filesize() 2012-06-26 12:17:25 +02:00
AD7six
d01f0e9f67 correct tests to match desired behavior
by default we don't want fixtures pulled in from a different scope than
that of the test being baked
2012-06-14 13:38:17 +02:00
mark_story
5413143178 Don't modify app/Config/bootstrap when running tests. 2012-06-12 22:10:55 -04:00
mark_story
f6b50a948e Small fixes for validation formatting.
* Remove additional out() calls.
* Remove extra punctuation.
* Fix code standards.
* Fix failing test.
2012-06-10 21:57:15 -04:00
Jelle Henkens
c8e58b50ba Adding cake core message extraction in cake extract 2012-06-07 23:55:36 +01:00
AD7six
a56ec8d6cf Correct TestTask tests
there will not be a setUp function for Controller tests
there will not be a tearDown
there will be no returned constructor logic from generateConstructor

all because for a controller test - you'd ordinarilly just call this->testAction
2012-06-06 23:04:18 +02:00
José Lorenzo Rodríguez
06476a22da Fixing failing tests caused by adding new validator, blind editing... hoping for the best 2012-05-27 19:48:46 -05:30
mark_story
9232df839d Fix failing tests because of new validator. 2012-05-27 14:17:34 -04:00
mark_story
233e7d6c6b Fix coding standards error. 2012-05-27 14:06:29 -04:00
Rachman Chavik
907b3221ed logging: fix failing tests when called via webrunner 2012-05-25 23:52:33 +07:00
Jelle Henkens
5656461025 Adding overwrite option to the i18n extract task 2012-05-25 17:01:56 +01:00
Washington
287c7b432a fix broken tests for TestTask class 2012-05-11 15:30:47 -03:00
AD7six
6933b31be5 include plugin name in model tests 2012-05-11 00:33:10 +02:00
Graham Weldon
c77c6f3b57 Removed unncessary line to fix coding standards 2012-05-01 09:51:22 +10:00
AD7six
6a744b277e create tests for baking a test for a component, behavior and helper 2012-04-29 17:20:14 +02:00
euromark
acd06d6499 fixing test case 2012-04-24 02:46:20 +02:00
euromark
6353558622 bame themes now in correct order: app -> plugin -> default 2012-04-24 02:40:42 +02:00
euromark
bc2cd00123 cake 2.2 test case fixes (assert corrections, correct class names) 2012-04-21 15:02:35 +02:00
Kyle Robinson Young
8bbe250bec Correct method descriptions and remove unused property 2012-04-11 07:50:54 -07:00
Kyle Robinson Young
90e7afbdc7 Correct parameter order of assertEquals and assertNotEquals 2012-03-22 23:37:12 -07:00
Juan Basso
3b1bd90ad6 Updated copyright to 2012. 2012-03-12 22:46:07 -04:00
mark_story
ed1d34accc Fix most coding standards issues in Test/Console 2012-03-10 23:32:02 -05:00
mark_story
7d51db9e63 Merge branch '2.0' into 2.1 2012-03-03 12:27:22 -05:00
Rob McVey
8e93c4cd34 Fix for Consolce/Task/TestTask::getRealClassName(). Controller names of exactly 10 letters
being returned incorrectly

Signed-off-by: mark_story <mark@mark-story.com>
2012-02-28 15:21:59 -05:00
Kyle Robinson Young
22582aee63 Upgrade legacy uses of App::build() types 2012-02-18 04:31:29 -08:00
Kyle Robinson Young
c4829dc3b8 Use App::RESET instead of true with App::build() 2012-02-18 04:04:54 -08:00
Kyle Robinson Young
45ec5d73c5 Add missing visibility keywords 2012-02-16 23:13:12 -08:00
Majna
d41e5621b7 Fix missing and invalid assertions in tests.
Remove unused variables and dead code.
2012-02-16 19:28:21 +01:00
ADmad
bda05293d7 Fixed failing test cases 2012-02-16 02:22:20 +05:30
mark_story
2afb05b590 Merge branch '2.0' into 2.1
Conflicts:
	app/View/Pages/home.ctp
	lib/Cake/Config/config.php
	lib/Cake/Core/App.php
	lib/Cake/VERSION.txt
	lib/Cake/View/Helper/NumberHelper.php
2012-02-12 10:06:13 -05:00
Majna
b61f46b030 Add Console/Templates and webroot/files to bake skel. Update tests. 2012-02-07 18:51:04 +01:00
Majna
454f383951 Fix console option parser for --empty in ProjectTask.
Command 'cake bake project --empty myapp' ignores argument myapp.
2012-02-07 18:35:12 +01:00
mark_story
4949a87b7e Fix issues with duplicate msgid values.
Msgid values could be duplicated if the same string was used
for singular and pluralized translations.  Re-index how the data is
stored so duplicate singular detection per domain is easier.

Fixes #2538
2012-02-06 21:25:11 -05:00
mark_story
3b9f88030e Add tests for previous commit. 2012-01-27 20:59:03 -05:00
mark_story
9ff0739504 Improving test generation.
Class construction can be a bit more complicated now.
2012-01-27 20:59:03 -05:00