mark_story
|
122dc65427
|
Merge branch 'merger' into 2.0
|
2011-01-08 23:51:03 -05:00 |
|
mark_story
|
443f6d1c5b
|
Merge branch '1.3' into merger
Conflicts:
cake/console/shells/tasks/test.php
cake/libs/cake_log.php
cake/libs/controller/components/email.php
cake/libs/set.php
cake/libs/view/helpers/cache.php
cake/libs/view/helpers/paginator.php
cake/libs/view/helpers/time.php
cake/libs/view/view.php
cake/tests/cases/console/libs/tasks/fixture.test.php
cake/tests/cases/console/shells/tasks/test.test.php
cake/tests/cases/libs/controller/components/email.test.php
cake/tests/cases/libs/model/db_acl.test.php
cake/tests/cases/libs/set.test.php
|
2011-01-08 23:49:19 -05:00 |
|
AD7six
|
e024b6b43b
|
only check the default template path is correct
this prevents a misleading error if you've more than one bake template installed
|
2011-01-08 14:08:28 +01:00 |
|
mark_story
|
a7061510c1
|
Applying patch from 'rynop'. Fixing FixtureTask so it includes the datasource if its not the default one.
Updating tests.
Fixes #1419
|
2010-12-31 13:05:04 -05:00 |
|
mark_story
|
ef77e60cb0
|
Removing @subpackage tags, moving contents of @subpackage into @package.
Removing duplicate cake.cake in @package tags.
Renaming cake.app -> app
|
2010-12-24 14:09:57 -05:00 |
|
mark_story
|
e20ea8ad72
|
Renaming Dispatcher::__loadRoutes -> Dispatcher::_loadRoutes to match naming conventions.
Updating method name usage, as assertType is deprecated as of PHPUnit 3.5.6
|
2010-12-24 12:54:04 -05:00 |
|
mark_story
|
a054695dca
|
Fixing failing tests.
|
2010-12-15 22:08:24 -05:00 |
|
mark_story
|
1531a7226e
|
Removing duplicated tests, and tests for methods that are not implemented in the subclasses.
|
2010-12-14 23:26:24 -05:00 |
|
mark_story
|
e410509684
|
Fixing TestTask not being able to find plugin objects when baking test skeletons interactively. Test case added. Fixes #1361
|
2010-12-13 22:04:55 -05:00 |
|
mark_story
|
f84871ae47
|
Fixing strict errors that were causing shell tests to fail.
Fixing test case for bake test that has been getting skipped.
|
2010-12-12 20:55:33 -05:00 |
|
mark_story
|
daffe3adb2
|
Making baked code throw 404 errors when you try to edit, delete, or view records that do not exist. Updated tests.
|
2010-12-12 12:37:02 -05:00 |
|
mark_story
|
44c080d5ad
|
Making all core classes throw CakeException subclasses, this allows developers to catch framework exceptions with one catch.
Adding package specific exceptions.
Replacing generic exceptions in the codebase with CakeException + package exceptions.
|
2010-12-11 19:26:10 -05:00 |
|
mark_story
|
c096eea664
|
Fixing failing tests caused by constants changing.
|
2010-12-05 23:32:34 -05:00 |
|
mark_story
|
55e06ec244
|
Merge branch '2.0-config' into 2.0
Conflicts:
cake/libs/configure.php
|
2010-12-05 23:00:05 -05:00 |
|
mark_story
|
0ec1e65013
|
Removing collisions that prevent TestTask from being loaded.
|
2010-12-05 22:53:29 -05:00 |
|
mark_story
|
ba63a2948c
|
Fixing failing test caused by additional trailing space.
|
2010-12-04 17:49:09 -05:00 |
|
José Lorenzo Rodríguez
|
e167271568
|
Making more DboSlite tests pass
|
2010-12-03 14:41:39 -04:30 |
|
José Lorenzo Rodríguez
|
7c4ab886e6
|
Merge remote branch 'origin/2.0' into feature/2.0/pdo
|
2010-12-03 14:08:03 -04:30 |
|
José Lorenzo Rodríguez
|
3370b25f14
|
Fixing a couple more tests
|
2010-12-03 14:07:46 -04:30 |
|
José Lorenzo Rodríguez
|
32af53ab82
|
Fixing test for sqlite
|
2010-12-02 00:30:21 -04:30 |
|
José Lorenzo Rodríguez
|
2e04c5260e
|
Fixing some tests to make them run on sqlite
|
2010-12-02 00:19:43 -04:30 |
|
José Lorenzo Rodríguez
|
2e9283abd9
|
Fixing fixture loading for sqlite
|
2010-11-29 20:52:54 -04:30 |
|
José Lorenzo Rodríguez
|
b6731dd9ad
|
Merge remote branch 'origin/2.0' into feature/2.0/pdo
Conflicts:
cake/tests/cases/libs/model/datasources/dbo/dbo_mysql.test.php
cake/tests/cases/libs/model/datasources/dbo/dbo_mysqli.test.php
|
2010-11-26 20:26:41 -04:30 |
|
mark_story
|
74bf455c49
|
Updating ConsoleErrorHandler to match ErrorHandler.
Updating test cases for ConsoleErrorHandler.
|
2010-11-25 22:51:30 -05:00 |
|
mark_story
|
cb657b158b
|
Fixing failing test and adding skip for test that will fail in a non-isolated case.
|
2010-11-21 14:39:07 -05:00 |
|
mark_story
|
a729d29cfd
|
Updating ModelTask test to have fewer skips and collisions with the rest of the testsuite.
|
2010-11-21 13:39:18 -05:00 |
|
mark_story
|
d7b1f70680
|
Adding some additional output to bake tasks to make them more consistent. Adding flags for Quiet output so the shells give minimal output.
|
2010-11-21 12:55:01 -05:00 |
|
mark_story
|
8a129ec3a0
|
Adding a normalize parameter to Object::_mergeVars(). This allows existing behavior to be maintained.
Updating Controller and Shell usage to match new parameters.
|
2010-11-21 00:47:42 -05:00 |
|
mark_story
|
b80535573e
|
Adding _mergeVars to Shell. This allows $tasks and $uses to work much
like $uses in Controllers, and provides consistency in the framework.
Adding tests for merging vars.
|
2010-11-21 00:12:07 -05:00 |
|
mark_story
|
4f6891705b
|
Moving Shell test to the same path as the shell class.
|
2010-11-21 00:12:06 -05:00 |
|
José Lorenzo Rodríguez
|
f2b707ac0b
|
Merge remote branch 'origin/2.0' into feature/2.0/pdo
Conflicts:
cake/tests/cases/libs/model/datasources/dbo/dbo_mysql.test.php
cake/tests/cases/libs/model/datasources/dbo/dbo_mysqli.test.php
cake/tests/cases/libs/model/datasources/dbo_source.test.php
|
2010-11-16 21:54:42 -04:30 |
|
José Lorenzo Rodríguez
|
5a881c461e
|
Fixing acl testcase so it runs smoothly on postgres
|
2010-11-16 01:22:29 -04:30 |
|
mark_story
|
6c8c7ca4a5
|
Turning __get() back into methods. There were so few properties being accessed that it didn't make sense to have __get(), over a handful of methods.
Tests updated.
|
2010-11-12 23:57:55 -05:00 |
|
mark_story
|
f9b7cbcb96
|
Making ConsoleOptionParser allow subclasses of the option, argument and subcommand classes to be supplied as arguments to the builder methods. Adding tests.
|
2010-11-12 23:52:33 -05:00 |
|
mark_story
|
faa23e8d51
|
Updating tests to reflect changes in bake templates.
|
2010-11-12 23:22:48 -05:00 |
|
mark_story
|
18bb5f6b8b
|
Removing =& operators for construction of objects.
|
2010-11-12 23:05:44 -05:00 |
|
Jeremy Harris
|
cad6fc7a17
|
Force console output tests to output as color
|
2010-11-07 15:41:40 -08:00 |
|
mark_story
|
bff711e2dc
|
Merge branch '2.0-console' into 2.0
Conflicts:
cake/console/shells/acl.php
cake/tests/cases/console/libs/tasks/plugin.test.php
|
2010-11-02 23:49:19 -04:00 |
|
mark_story
|
c9ca3c3785
|
Fixing path constants in DbConfig and FixtureTask to be more consistent between web and cli.
|
2010-11-02 23:25:36 -04:00 |
|
mark_story
|
6d54202c4c
|
Adding another group test case file for all the console tests at once.
|
2010-11-02 23:15:33 -04:00 |
|
Mark Story
|
08e7bcb7ab
|
Merge branch '1.3' into integration
Conflicts:
app/config/core.php
cake/console/libs/acl.php
cake/console/templates/skel/config/core.php
cake/console/templates/skel/webroot/test.php
cake/dispatcher.php
cake/libs/view/errors/missing_action.ctp
cake/libs/view/helpers/form.php
cake/tests/cases/libs/cache/memcache.test.php
cake/tests/cases/libs/controller/controller.test.php
cake/tests/cases/libs/log/file_log.test.php
cake/tests/cases/libs/model/cake_schema.test.php
cake/tests/cases/libs/router.test.php
cake/tests/cases/libs/view/helpers/ajax.test.php
cake/tests/groups/bake.group.php
cake/tests/groups/behaviors.group.php
cake/tests/groups/i18n.group.php
cake/tests/groups/javascript.group.php
cake/tests/lib/reporter/cake_cli_reporter.php
|
2010-10-31 21:56:59 -04:00 |
|
mark_story
|
fff8279c2b
|
Using patch from 'wals' to add generic exclude option to the ExtractTask. Allows you to exclude path segments from the generated PO files.
Fixes #1138
|
2010-10-29 00:40:04 -04:00 |
|
mark_story
|
558bd7e3c2
|
Adding a --sort param to view the command_list sorted in a different way.
Test cases added.
Fixes #574
|
2010-10-26 22:34:27 -04:00 |
|
Graham Weldon
|
d3e0ddbb0e
|
Update copyright years.
|
2010-10-25 07:58:22 +11:00 |
|
mark_story
|
6f29519f73
|
Making shells attach args and params by reference.
Adding test.
|
2010-10-24 15:47:07 -04:00 |
|
mark_story
|
c169de60e2
|
Updating tasks to not take ShellDispatcher as a parameter.
|
2010-10-24 15:27:04 -04:00 |
|
mark_story
|
5edb277111
|
Updating shells and shell tests for changes in __construct.
|
2010-10-24 15:11:30 -04:00 |
|
mark_story
|
ba17e2c9a0
|
Removing ShellDispatcher as a constructor argument for Shell.
Updating the AclShell test case.
|
2010-10-24 14:55:16 -04:00 |
|
mark_story
|
a72d6da9c3
|
Making plugin schema tests less likely to stomp on tables they shouldn't be changing.
|
2010-10-23 00:54:39 -04:00 |
|
mark_story
|
cf9166a689
|
Starting to remove Dispatch->params in favor of the constants ShellDispatcher makes, this will make removing the dependency from Shell much easier.
|
2010-10-23 00:11:31 -04:00 |
|