mark_story
cd8dff362d
Merge branch '2.0-phpunit' into 2.0
...
Conflicts:
cake/libs/controller/components/email.php
cake/tests/cases/libs/cake_test_fixture.test.php
cake/tests/cases/libs/controller/components/email.test.php
2010-06-28 22:31:35 -04:00
mark_story
929bb5769e
Merge branch '1.3' into 2.0
...
Conflicts:
app/webroot/index.php
cake/console/templates/skel/webroot/index.php
cake/libs/cake_session.php
cake/libs/controller/components/email.php
cake/libs/controller/scaffold.php
cake/libs/model/datasources/dbo/dbo_oracle.php
cake/libs/model/model_behavior.php
cake/libs/view/pages/home.ctp
cake/tests/cases/libs/controller/components/acl.test.php
cake/tests/cases/libs/file.test.php
2010-06-26 12:29:20 -04:00
mark_story
9ace0100ab
Updating ExtractTaskTest to pass under PHPUnit.
2010-06-20 23:23:56 -04:00
mark_story
69559958a7
Adding ommitted new line.
2010-06-12 17:43:12 -04:00
mark_story
9cdf11a02a
Updating ModelTask test case to PHPUnit.
2010-06-12 17:42:53 -04:00
mark_story
ad8d5fa29b
Updating some tests to use onConsecutiveCalls() as its easier to read and maintain.
2010-06-12 16:10:16 -04:00
mark_story
5013ec03f1
Updating ViewTask test case to PHPUnit.
2010-06-12 15:03:00 -04:00
mark_story
aa8d909764
Updating ProjectTask test case to PHPUnit.
2010-06-10 00:59:19 -04:00
mark_story
a91e8b870a
Updating FixtureTask test case to use PHPUnit.
2010-06-10 00:25:23 -04:00
mark_story
98a3239141
Updating TestTask test case to use PHPUnit.
2010-06-09 20:15:37 -04:00
mark_story
574e1e7200
Updating PluginTask test case to use PHPUnit.
2010-06-09 18:11:21 -04:00
mark_story
f09a5bd953
Updating TemplateTask test cases to use PHPUnit.
2010-06-09 00:22:31 -04:00
mark_story
dad4b5ae5c
Updating DbConfigTask to PHPUnit.
...
Making protected methods and properties protected for easier mocking.
2010-06-08 22:14:48 -04:00
mark_story
ebfbbfea48
Partially fixing DbConfig tests to work with phpunit.
2010-06-08 00:54:42 -04:00
mark_story
94fc492623
Correcting how ExtractTask collects files. Test added. Fixes #775
2010-06-06 22:39:04 -04:00
predominant
e47c9660f9
Remove debugging.
2010-06-07 02:03:41 +10:00
predominant
d803b30388
Fix Model validation bake tests for Windows.
2010-06-07 01:39:24 +10:00
mark_story
fc79dc6232
Merge branch '2.0' into 2.0-phpunit
...
Conflicts:
cake/tests/cases/console/libs/tasks/controller.test.php
cake/tests/cases/libs/code_coverage_manager.test.php
cake/tests/cases/libs/view/helpers/js.test.php
cake/tests/lib/code_coverage_manager.php
2010-05-30 22:13:09 -04:00
mark_story
5ef9103a52
Updating the rest of the controller task test case to use phpunit.
2010-05-30 00:59:36 -04:00
Mark Story
ca5fb9fb93
Fixing tests broken by changes in default bake templates.
...
Fixing issue where admin methods wouldn't be correctly generated.
Fixes #664
2010-05-30 00:11:37 -04:00
mark_story
62ec25857f
Making more tests work in phpunit.
2010-05-30 00:07:43 -04:00
mark_story
0dc627178a
updating helper and component tests for controller task to use phpunit.
2010-05-26 23:01:14 -04:00
mark_story
8ac46c3b63
Adding return from _stop() to help testing.
...
Updating tests for getName()
2010-05-26 21:59:56 -04:00
mark_story
9647e359c4
First test passing for controllertask test
2010-05-25 23:54:28 -04:00
mark_story
08bcf55b8d
Starting to convert controller task test to phpunit.
2010-05-25 23:51:48 -04:00
predominant
6a18b2bc1d
Merge remote branch 'origin/1.3' into 2.0
...
Conflicts:
cake/basics.php
cake/console/libs/shell.php
cake/console/libs/tasks/controller.php
cake/libs/controller/components/request_handler.php
cake/libs/model/model.php
cake/libs/model/model_behavior.php
cake/libs/overloadable.php
cake/libs/overloadable_php4.php
cake/libs/overloadable_php5.php
cake/libs/sanitize.php
cake/libs/validation.php
cake/libs/view/helpers/ajax.php
cake/libs/view/helpers/javascript.php
cake/libs/view/pages/home.ctp
cake/tests/cases/console/libs/tasks/controller.test.php
cake/tests/cases/libs/overloadable.test.php
cake/tests/cases/libs/validation.test.php
cake/tests/cases/libs/view/helpers/ajax.test.php
cake/tests/cases/libs/view/helpers/javascript.test.php
cake/tests/test_app/libs/cache/test_app_cache.php
cake/tests/test_app/plugins/test_plugin/libs/cache/test_plugin_cache.php
cake/tests/test_app/plugins/test_plugin/models/test_plugin_auth_user.php
cake/tests/test_app/plugins/test_plugin/models/test_plugin_post.php
2010-05-20 12:22:04 +10:00
predominant
8f880731c6
Removing closing PHP tags.
2010-05-11 08:27:28 +10:00
predominant
1ec220dac2
Removing closing PHP tags.
2010-05-11 08:07:49 +10:00
Mark Story
45d052b55a
Fixing failing tests in ViewTask test case, caused by changes in core templates.
...
Fixing incorrect variable usage where models would be double singularized causing incorrect names. Fixes #668
2010-05-06 21:38:14 -04:00
Mark Story
fcad9b464c
Fixing tests broken by changes in default bake templates.
...
Fixing issue where admin methods wouldn't be correctly generated.
Fixes #664
2010-05-04 23:27:41 -04:00
Mark Story
0a8aafe3c8
Fixing reference to method name.
2010-04-23 22:03:11 -04:00
predominant
74d7682707
Fix translation shortcut usage through testing console for updates
2010-04-16 02:38:12 +10:00
predominant
ed02b0f54b
Fixing access modifier test on Test task.
2010-04-11 09:40:54 +10:00
predominant
4b919382bb
Fix Console Model test to correct index changes for validation.
2010-04-11 09:19:30 +10:00
predominant
b22b3b1f41
Fix a bunch of fixture tests testing for access modifiers.
2010-04-09 22:58:06 +10:00
predominant
75c741f5a6
Fix scaffold test on console, replaced 'var' with 'public'.
2010-04-09 22:55:43 +10:00
predominant
50a547167b
Changing protected methods to specify protected access.
2010-04-05 13:21:28 +10:00
predominant
1497ec3910
Changed all public methods to specify public access.
2010-04-05 13:19:38 +10:00
predominant
850ca02bb6
Changed all public 'var' declarations to be 'public $var'
2010-04-04 17:14:00 +10:00
Mark Story
49c60658b9
Fixing the ability to use regular expressions for validation rules. Fixes #453
2010-03-13 19:44:20 -05:00
Mark Story
8e8acfaccd
Fixing notice errors when bogus validation options are selected. Refs #453
2010-03-12 22:58:14 -05:00
Mark Story
220fba9bba
Fixing inflection of parameters when using bake. Model, View, Controller, and Fixture tasks all accept either singular or plural forms of the table name. Fixes #425
2010-03-05 21:30:58 -05:00
Mark Story
f8cb20e994
Passing interactive property to inner tasks. Inner tasks now share the parent interactive setting making things more consistent. Fixes #423
2010-03-04 22:02:49 -05:00
Mark Story
d4393e9058
Fixing path generation in BakeTask.
...
Removing name properties as they were causing troubles.
All BakeTasks are now interactive = false by default. This makes interfaces more consistent when working with bake. Refs #423
Tests updated.
2010-03-04 21:57:48 -05:00
Mark Story
75e98387e7
Removing debug() from test case.
2010-02-28 11:39:09 -05:00
Mark Story
b1a3e05374
Fixing failing tests in ControllerTask.
2010-02-21 22:37:18 -05:00
Mark Story
1c7c748a7c
Merge branch 'view-all' into 1.3
2010-02-21 22:29:22 -05:00
Mark Story
8615274e7f
Fixing issue where baking a model non-interactively would omit hasMany associations. Tests added.
2010-02-20 20:13:42 -05:00
Mark Story
d7dd63de82
Adding the ability to bake all views for one specific action. Tests added. Fixes #251
2010-02-13 19:07:42 -05:00
Mark Story
3f667eb412
Adding skipTables to ModelTask. Allows skipping of predefined tables. Adding i18n table to the default list of skipped tables. Fixes #327
2010-02-13 18:15:11 -05:00