Commit graph

315 commits

Author SHA1 Message Date
mark_story
4a0df83783 Fix failing tests.
When the app did not have the correct models, tests would fail.
2013-03-04 22:13:45 -05:00
mark_story
4b13e0a5f2 Merge branch 'master' into 2.4
Conflicts:
	lib/Cake/VERSION.txt
2013-03-04 21:55:29 -05:00
Alexander Hofbauer
c920209f58 SchemaShell: Implement "exclude" parameter
Allows for passing a list of tables to ignore when generating schemas.
Closes #3652.
2013-03-04 22:37:44 +01:00
mark_story
1d529c1dd2 Add type hints in SchemaShell.
I'm trying to figure out what's going on in the failing travis builds.
2013-02-28 22:54:31 -05: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
Ceeram
870d77c89e Make the test more accurate on type of result 2012-10-26 20:49:04 +02:00
Ceeram
39dcb80b45 Fix failing test, find('first') now returns empty array when no record was found 2012-10-26 16:32:15 +02:00
euromark
cc436146be making tests pass on windows again 2012-10-25 17:37:35 +02:00
Adam Taylor
4090c2e932 Remove trailing whitespace from comments
See http://groups.google.com/d/topic/cakephp-core/fuHTYMKVJno/discussion
2012-10-15 18:19:37 -06: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
mark_story
11227f5490 Fix coding standards. 2012-08-10 21:50:37 -04:00
euromark
5190b9f2c9 asserting that under_scored names result in valid ClassNames 2012-08-08 16:35:59 +02:00
euromark
62dee78ca5 adding models for schema generate 2012-08-08 14:15:28 +02:00
mark_story
d94cdc67fe Merge branch 'master' into 2.3 2012-07-27 22:38:24 -04:00
mark_story
6e0cf0dab7 Fix failing test. 2012-07-26 21:19:20 -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
euromark
3945c0e6a8 rtim files 2012-07-18 03:55:29 +02:00
Ceeram
6ec0afcf5d Add CakeNumber::fromReadableSize() and Validation::filesize() 2012-06-26 12:17:25 +02:00
dogmatic69
058f48fc7b Showing the list of shells grouped by plugin
The option to sort has been removed and the list of shells is now
sorted and grouped by plugin and then by command.

Core and app shells are always listed last.
2012-06-22 20:53:44 -04: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
Jelle Henkens
ef270b95c7 Fixing test assert for APP_DIR scenarios with non standard folder names 2012-05-13 18:12:31 +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
mark_story
21ba5bf04a Merge branch '2.1' into 2.2 2012-04-17 21:47:24 -04:00
mark_story
72c3059d94 Add missing parent calls.
Fixes piles of failing tests.
2012-04-15 22:20:34 -04: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
mark_story
0568746bfd Merge branch '2.0' into 2.1
Conflicts:
	lib/Cake/Model/CakeSchema.php
2012-02-26 12:04:28 -05:00
mark_story
2a9a103d62 Fix bad xml help generation.
Fixes #2619
2012-02-26 10:21:04 -05:00
euromark
e94d307ee1 code conventions 2012-02-25 19:46:05 -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
Mark Story
c2d753ffb4 Merge pull request #500 from shama/patch-visibility
Add missing visibility keywords
2012-02-21 17:36:36 -08:00
Kyle Robinson Young
45ec5d73c5 Add missing visibility keywords 2012-02-16 23:13:12 -08:00
Kyle Robinson Young
4141a3ab5b Load specific test plugins rather than all to avoid conflicts 2012-02-16 20:03:44 -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
mark_story
15c7493e39 Merge branch '2.0' into 2.1 2012-01-06 23:02:16 -05:00
mark_story
f22c80e9ec Add skip for test that fails on SQLServer.
SQLServer doesn't support LIMIT, skip the test as its tested
in Jenkins all the time.
2012-01-06 22:21:54 -05:00
Jose Lorenzo Rodriguez
ffa12f4d47 Fixing test and implementing return values for events 2011-12-25 21:52:12 -04:30
ADmad
389072708a Merge branch '2.0' into 2.1
Conflicts:
	lib/Cake/Test/Case/Model/ModelReadTest.php
	lib/Cake/Utility/Debugger.php
2011-12-22 03:15:04 +05:30
Kyle Robinson Young
51f9837db4 Code standards formatting 2011-12-15 22:52:07 -08:00
mark_story
2e8498e166 Merge branch '2.0' into 2.1
Conflicts:
	lib/Cake/Model/Datasource/Database/Postgres.php
	lib/Cake/Test/Case/Console/TaskCollectionTest.php
	lib/Cake/Test/Case/Model/ModelIntegrationTest.php
	lib/Cake/Test/Case/Utility/ClassRegistryTest.php
	lib/Cake/Utility/ClassRegistry.php
2011-12-11 22:51:40 -05:00
Kyle Robinson Young
1e1c7a036d Code consistency formatting tweaks 2011-12-06 12:52:48 -08:00
Mark Story
a32eabe492 Merge pull request #355 from shama/patch-casing
Consistently setting setUp() and tearDown() on test cases
2011-12-05 11:44:15 -08:00
Ceeram
e4e26a852b Making non-interactive behave same as interactive with odd table names 2011-12-05 17:00:48 +01:00
Kyle Robinson Young
5388237099 Consistently setting setUp() and tearDown() on test cases 2011-12-04 13:27:51 -08:00
mark_story
6d269ce25d Merge branch '2.0' into 2.1
Conflicts:
	lib/Cake/Config/config.php
	lib/Cake/Console/Command/Task/ModelTask.php
	lib/Cake/Console/Command/TestsuiteShell.php
	lib/Cake/Model/CakeSchema.php
	lib/Cake/Model/Datasource/Database/Sqlite.php
	lib/Cake/Test/Case/Model/ModelTestBase.php
	lib/Cake/Test/Case/Routing/DispatcherTest.php
	lib/Cake/Test/Case/Utility/FileTest.php
	lib/Cake/VERSION.txt
2011-12-03 13:45:28 -05:00
mark_story
0f71254fe1 Fix double inflection in bake all <foo>
ViewTask re-pluralizes the model name.  Sometimes this leads to
things like Menuses which is totally wrong.

Fixes #2318
2011-12-01 20:41:17 -05:00
Majna
87a3937def Add visibility keyword for 'helpers' property in controller template. 2011-11-30 20:06:07 +01:00
Ceeram
57a1a2814d Fixing modeltask to use correct table
ModelTask will now bake correct primaryKey when not id
2011-11-29 00:00:00 +01:00
ADmad
73674c648c Moving AppShell inside Console/Command for consistency with file location of other App classes. Also making all core shells and tasks extends AppShell instead of Shell. Closes #2278 2011-11-26 02:48:49 +05:30
mark_story
2969a8f6ac Make a few more tests run in AllTests. 2011-11-23 21:30:28 -05:00
mark_story
6d6ac10834 Fix failing tests caused by previous commit. 2011-11-20 23:00:58 -05:00
AD7six
8e38f666b7 allow baking models with missing tables - even for rdbms
test updated to reflect expected new expected behavior. If you bake a
model with the table missing, if forced to run skip any part of the
process that would result in an exception.
2011-11-20 01:11:33 +01:00
mark_story
fa0ec44dfd Merge branch '2.0' into 2.1
Conflicts:
	lib/Cake/Test/Case/Console/Command/CommandListShellTest.php
	lib/Cake/Test/Case/Error/ExceptionRendererTest.php
	lib/Cake/Test/Case/Utility/DebuggerTest.php
	lib/Cake/Test/Case/View/Helper/TextHelperTest.php
2011-11-16 21:31:16 -05:00
Kyle Robinson Young
98f03dc6df Replacing test case compatibility functions 2011-11-16 21:07:08 -05:00
mark_story
254357e9c9 Merge branch '2.0' into 2.1 2011-11-11 22:38:11 -05:00
Renan Gonçalves aka renan.saddam
2a33bc862a Merge pull request #296 from majna/2.0-dbconfig-task
Fix for 'datasource' key when baking another db config.
2011-11-07 01:58:54 -08:00
Majna
57afa1873e Make View task use prefixed template before falling back to generic one. It is possible now to create view templates for different prefixes. 2011-11-07 01:01:56 +01:00
ADmad
e1354b2ee6 Merge branch '2.0' into 2.1 2011-11-06 20:39:08 +05:30
Majna
3374406bbf Fix View task missing 'app' param when baking custom action. 2011-11-05 19:54:21 +01:00
Majna
1b9b90d2e7 Replacing 'driver' with 'datasource'. 2011-11-04 23:07:31 +01:00
mark_story
0304bb8796 Merge branch '2.0' into 2.1
Conflicts:
	lib/Cake/Config/config.php
	lib/Cake/VERSION.txt
2011-11-03 22:04:00 -04:00
Gun.io Whitespace Robot
4742168253 Remove whitespace [Gun.io WhitespaceBot] 2011-10-28 18:25:08 -04:00
mark_story
ad524b25ef Merge branch '2.0' into 2.1 2011-10-25 22:29:03 -04:00
m
dcc17f2091 ucfirst object names part two (Folder/File)
Signed-off-by: mark_story <mark@mark-story.com>
2011-10-24 21:36:48 -04:00
mark_story
d6f7669f54 Merge branch '2.0' into 2.1 2011-10-23 21:07:09 -04:00
mark_story
ab77afbaec Adding tests for lowercase type names. 2011-10-23 11:11:07 -04:00
mark_story
30225520ff Update assertEqual to assertEquals. 2011-10-23 10:44:19 -04:00
mark_story
7b9acc5c16 Fix failing test caused by addition of TestShell. 2011-10-20 21:39:58 -04:00
AD7six
53bc963315 Merge branch '2.0' into 2.1 2011-10-20 08:57:49 +02:00
Renan Gonçalves
fe9762d053 Making the test assert what it is intended to assert. 2011-10-19 16:48:03 +02:00
Renan Gonçalves
d1be66f2e1 Fixing failing test introduced in fb4a003522. 2011-10-19 15:57:46 +02:00
Majna
0a9033ba1e Fixing failing i18n ExtractTask tests on Windows. 2011-10-19 00:41:19 +02:00
AD7six
485c15d55d went missing in the merge
from 92d028630c
2011-10-18 17:49:52 +02:00
AD7six
a538c5d220 Merge branch '2.1' of github.com:cakephp/cakephp into 2.1
Conflicts:
	lib/Cake/Test/Case/Console/Command/TestsuiteShellTest.php
2011-10-18 17:46:00 +02:00
AD7six
cccb6e9867 the category will say app
because it's under app
2011-10-18 12:00:46 +02:00
AD7six
1dae2735af more not a a test tests 2011-10-18 11:58:34 +02:00
AD7six
230d67976d add a test for mapping not-test files to nothing 2011-10-18 11:57:14 +02:00
AD7six
27fa6a8cdd add test checking that tests map to .. tests. 2011-10-18 11:54:58 +02:00
AD7six
71ce18de8b use constants for APP and CAKE 2011-10-18 11:48:12 +02:00
AD7six
baf1ce93f2 add a plugin parsing test 2011-10-18 11:40:53 +02:00
AD7six
4addd9faae a random test 2011-10-18 11:37:47 +02:00
AD7six
f82ae66790 add a couple of tests for detecting the right app file 2011-10-18 11:36:30 +02:00
AD7six
6ab5f1f2a2 make it possible to test for files that don't exist 2011-10-18 11:02:08 +02:00
AD7six
6ccb1f2fb0 update test case 2011-10-18 10:21:53 +02:00
mark_story
7f3c5662ba Fix issue where plugin prefixes would be included in generated view.
Fix issue with `cake bake view Plugin.Model` style view creation.
Fixes #2095
2011-10-12 21:09:19 -04:00
mark_story
3c611eef90 Replacing direct construction with method calls. 2011-10-12 21:00:47 -04:00
Majna
8c3f64be52 Fixing doc blocks in Test suite and some visibility keywords. 2011-10-10 23:18:48 +02:00
mark_story
788d38ccef Merge branch '1.3' into 1.3-merge
Conflicts:
	cake/console/cake.php
	cake/console/libs/shell.php
	cake/tests/cases/console/libs/shell.test.php
2011-10-10 09:37:06 -04:00
mark_story
042e817e1b Fix issue where missing command would exit as success. 2011-10-03 23:08:48 -04:00
Jose Lorenzo Rodriguez
71c73503c6 Making test case less configuration independent 2011-10-03 12:13:11 -04:30
Jose Lorenzo Rodriguez
d08f916179 Grabbing the first available config defined in connection manager as a default for baking. Fixing a couple of failing test cases 2011-10-03 11:54:40 -04:30
mark_story
84f805419d Fixing issue where DbConfigTask would try to rebuild
database configuration.

This could happen when using commands like `Console/cake bake controller`.
Using ConnectionManager ensures that the database config file will be loaded
if its available.
2011-10-02 22:53:45 -04:00
mark_story
aae2b0c257 Fixing issue baking controller tests.
During interactive controller baking, controller tests
would be generated with the wrong filename.
During interactive baking fixtures would not be detected.
Fixes #2052
2011-10-02 22:53:37 -04:00
Jose Lorenzo Rodriguez
8acd980895 Converting more pattern assertions into simple string contains 2011-09-29 00:42:24 -04:30
Jose Lorenzo Rodriguez
fbdb058441 Converting regular expression assertions to simple string contains, those perform faster and consume less memory 2011-09-29 00:05:15 -04:30
Jose Lorenzo Rodriguez
27ab12dd2a Simplifying assertions in FixtureTask test 2011-09-28 23:39:07 -04:30
Jose Lorenzo Rodriguez
7b3ceb5a29 Fixing a few failing test cases and attempting to work around php segmentation fault when running the complete test suite 2011-09-28 22:57:50 -04:30
mark_story
4fda085928 Trying to fix occasional error during FixtureTaskTest. 2011-09-13 20:45:45 -04:00
mark_story
d74f442608 Making test case class names match file names.
Refs #1985
2011-09-12 23:01:04 -04:00
mark_story
3cb3424b4f Add App::uses to baked controllers.
Controllers should load their dependencies.
Bake should help with the best practice.
Fixes #1971
2011-09-09 20:43:04 -04:00
mark_story
7c08c966b0 Adding App::uses() call to model baking.
Models should always include their parent classes to be safe.
Bake should reflect the best practice.
Refs #1971
2011-09-09 20:43:04 -04:00
mark_story
d597186274 Fixing a few more failing tests.
Adding some parent calls to tests, removing duplicated junk.
2011-09-03 23:23:24 +01:00
Jose Lorenzo Rodriguez
01f26995b6 Fixing failing test in fixture test case 2011-09-03 07:04:51 -04:30
mark_story
efbeab6199 Merge branch '1.3' into merger
Conflicts:
	cake/libs/controller/components/email.php
	cake/tests/cases/console/libs/tasks/fixture.test.php
	lib/Cake/Console/Command/Task/DbConfigTask.php
2011-09-03 00:48:09 +01:00