mark_story
4d37e75f18
Merge branch '1.2' into 1.3-merger
...
Conflicts:
cake/console/libs/tasks/controller.php
cake/console/libs/tasks/extract.php
cake/console/libs/tasks/model.php
cake/libs/configure.php
cake/libs/controller/components/cookie.php
cake/libs/debugger.php
cake/libs/flay.php
cake/libs/http_socket.php
cake/libs/inflector.php
cake/libs/model/cake_schema.php
cake/libs/model/connection_manager.php
cake/libs/model/datasources/dbo/dbo_mysql.php
cake/libs/model/datasources/dbo_source.php
cake/libs/router.php
cake/libs/view/helper.php
cake/libs/view/helpers/form.php
cake/libs/view/helpers/html.php
cake/libs/view/helpers/js.php
2009-11-22 20:38:50 -05:00
Juan Basso
df9e1e0bd1
Replace function join (alias) by implode.
...
Signed-off-by: Mark Story <mark@mark-story.com>
2009-11-21 13:43:11 -05:00
predominant
0977b3fe15
Standardising docblock endings throughout.
2009-11-14 23:19:25 +11:00
renan.saddam
8cab87fd8e
Fixing fixtures path when using a fixture inside a plugin.
2009-11-11 20:14:24 -02:00
predominant
1185681549
Removing newline caused by Subversion line removal.
2009-11-06 18:01:22 +11:00
predominant
d7b604c8ed
Fixing links throughout
2009-11-06 17:46:59 +11:00
predominant
5dfe1777af
Removing Subversion file headers.
2009-11-06 16:51:09 +11:00
predominant
ceee56013c
Remove Subversion $Date$ lines.
2009-11-06 16:17:01 +11:00
predominant
04f1b6cdfe
Remove Subversion $LastChangedBy$ lines.
2009-11-06 16:11:16 +11:00
predominant
42f3f16d60
Remove subversion $Revision$ lines.
2009-11-06 16:08:02 +11:00
predominant
1b9b0aae5e
Updating Copyright date to include 2009.
2009-11-06 15:34:28 +11:00
predominant
8f75ff58c7
Removing @filesource
2009-11-06 15:24:02 +11:00
predominant
bed9b6e58d
Extending TextReporter from SimpleTest to provide memory usage and execution time information for text output test results.
2009-10-31 18:30:59 +11:00
mark_story
2f81c29def
Updating $pluginPath loops to use App::pluginPath().
2009-10-14 09:47:07 -04:00
mark_story
de8f251758
Replacing $pluginPath loops with App::pluginPath(). Minor optimization for App::pluginPath().
2009-10-14 09:28:06 -04:00
mark_story
b95d9e1060
Fixing time tracking on group test cases.
2009-09-18 00:54:13 -04:00
mark_story
e5083b88c4
Merge branch '1.3-test' into 1.3-misc
2009-09-14 23:57:35 -04:00
mark_story
ea7df4f7ce
Adding time and memory output to the test suite results.
2009-09-13 13:29:44 -04:00
mark_story
edf5f2d6e2
Updating doc blocks.
2009-09-13 13:11:37 -04:00
mark_story
e9c747badc
Updating all group tests to extend TestSuite instead of the deprecated GroupTest class. Updating the TestManager.
2009-09-11 21:43:53 -04:00
mark_story
c49662e2ca
Fixing deprecation error due to changes in API
2009-09-10 22:56:44 -04:00
gwoo
33adb6e40b
fixing test header from bad merge
2009-08-03 11:57:39 -07:00
mark_story
83a705f739
Merge branch '1.3' into 1.3-jshelper
2009-08-03 14:39:21 -04:00
AD7six
b9987e1712
whitespace normalization
2009-08-02 16:09:39 -07:00
gwoo
15ed658a27
Revert "Merge branch '1.3-newlines' into 1.3"
...
This reverts commit c088131cd8e9f53396852e8a320e2b0396807d20, reversing
changes made to 9341a2bb5eda1db208019aa8a9171224fb76fc6b.
2009-08-02 15:59:54 -07:00
AD7six
d61e8736e4
Merge branch '1.3' into 1.3-bake
2009-08-02 22:44:28 +02:00
AD7six
7eb150b49a
Merge branch '1.3' into 1.3-bake
...
Conflicts:
cake/console/libs/tasks/model.php
2009-08-02 22:31:01 +02:00
gwoo
d118c6a764
Merge branch '1.3-newlines' into 1.3
2009-08-02 12:08:55 -07:00
gwoo
1423b0067b
Merge branch '1.2' into 1.3
2009-07-30 11:34:33 -07:00
AD7six
bbc2562d3f
Correcting use of CONSOLE_LIBS to refer to template files
2009-07-29 10:17:06 +02:00
AD7six
f64f4cbddc
whitespace normalization
2009-07-26 11:59:51 +02:00
mark_story
a6f25f5c64
Removing ending html tags, they were being generated before the page ended.
...
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@8256 3807eeeb-6ff5-0310-8944-8be069107fe0
2009-07-25 21:45:30 +00:00
mark_story
def4c98a08
Merge branch '1.3' into 1.3-jshelper
...
Conflicts:
cake/libs/view/helpers/html.php
cake/libs/view/helpers/js.php
cake/tests/cases/libs/view/helpers/html.test.php
cake/tests/cases/libs/view/helpers/js.test.php
cake/tests/lib/header.php
2009-07-25 17:35:27 -04:00
gwoo
766e12bc2a
Merge branch '1.3' into 1.3-newlines
2009-07-25 10:41:40 -07:00
mark_story
4ebf5a4e32
Merge commit 'code/1.3' into 1.3-jshelper
...
Conflicts:
cake/tests/cases/libs/view/helpers/html.test.php
cake/tests/lib/header.php
2009-07-25 01:35:36 -04:00
gwoo
986af28de0
Merge branch '1.2' into 1.3
2009-07-24 15:57:30 -07:00
AD7six
b2142df2bc
adding a newline before all comment blocks
2009-07-24 21:18:37 +02:00
mark_story
565cd96120
Fixing issue in CakeTestCase where fixture tables were incorrectly detected and dropped when running tests with no $test config or $test config and $default config on the same database.
...
Updating TestAppsPostsController to fix compatibility issues with postgres.
Defining $name in CakeTestFixture to remove notice errors, when constructing a nameless Fixture.
Fixes #6518
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@8254 3807eeeb-6ff5-0310-8944-8be069107fe0
2009-07-24 16:29:18 +00:00
gwoo
f295a21831
updating some code related to Configure/App changes. Fixing issue when cache is not configured
2009-07-22 09:11:38 -07:00
gwoo
025942e354
updating test header for 1.3
2009-07-20 10:06:13 -07:00
mark_story
9c51f720ed
Merge branch '1.3' into jshelper-integration
...
Conflicts:
cake/tests/cases/libs/view/helpers/js.test.php
2009-07-06 23:43:57 -04:00
gwoo
bc359259a2
Merge branch '1.2' into 1.3
2009-07-02 09:27:00 -07:00
gwoo
58b5c0d77d
cleaning up some ;;
2009-06-30 19:56:15 -07:00
mark_story
fb6b2aecde
Renaming {{{SimpleTestOptions::ignore()}}} to {{{SimpleTest::ignore()}}} Refs #6425
...
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@8207 3807eeeb-6ff5-0310-8944-8be069107fe0
2009-06-30 01:37:33 +00:00
gwoo
c3643767bf
some more updates to path handling
2009-06-10 16:13:39 -07:00
gwoo
24d78dd671
moving path configuration to App class
2009-06-07 15:24:10 -07:00
gwoo
6f21c18366
Merge branch '1.3-lib_renames' into 1.3
2009-06-02 10:17:02 -07:00
jperras
a6017e6f6a
Updating code coverage manager to work with application-level datasources.
...
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@8179 3807eeeb-6ff5-0310-8944-8be069107fe0
2009-05-28 17:44:41 +00:00
davidpersson
fd7d6718a1
Updating tests to not affect other ones when run from a group
...
Adding NoCrossContamination group
Shortening group class names
Renaming lib_controller group
Updating test imports to include the core AppController by default
Some cosmetics
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@8123 3807eeeb-6ff5-0310-8944-8be069107fe0
2009-03-21 23:55:39 +00:00
jperras
70e0316cd2
Renaming schema.php to cake_schema.php. Modifying relevant App::import calls.
2009-03-15 22:22:18 -04:00
