mark_story
e149c411fb
Merge branch '1.3' into merger
...
Conflicts:
cake/VERSION.txt
cake/config/config.php
cake/console/shells/tasks/template.php
cake/dispatcher.php
cake/libs/controller/component.php
cake/libs/controller/components/email.php
cake/libs/controller/scaffold.php
cake/libs/model/datasources/dbo/dbo_mysqli.php
cake/libs/view/helpers/cache.php
cake/libs/view/pages/home.ctp
cake/tests/cases/dispatcher.test.php
cake/tests/cases/libs/model/datasources/dbo/dbo_postgres.test.php
cake/tests/fixtures/datatype_fixture.php
2011-02-05 12:20:09 -05:00
mark_story
71d8e744f1
Fixing case-sensitivity of AS in fields. Tests added. Fixes #1474
2011-01-26 20:58:16 -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
b9f0fc0724
Merge branch '1.3' into merger
...
Conflicts:
cake/dispatcher.php
cake/libs/cake_session.php
cake/libs/controller/components/cookie.php
cake/libs/controller/components/email.php
cake/libs/controller/controller.php
cake/libs/controller/scaffold.php
cake/libs/set.php
cake/libs/validation.php
cake/libs/view/view.php
cake/tests/cases/dispatcher.test.php
cake/tests/cases/libs/controller/components/security.test.php
cake/tests/cases/libs/controller/controller.test.php
cake/tests/cases/libs/validation.test.php
cake/tests/cases/libs/view/view.test.php
2010-12-10 22:24:31 -05:00
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
15ca2400bc
Fixing issue in DboSource::name() where special characters in column names would not be correctly quoted.
...
Tests added.
Fixes #1264
2010-11-25 06:52:23 -05:00
mark_story
4c0e69b8fc
Removing constant checks, they aren't used anymore.
2010-11-21 15:13:33 -05:00
mark_story
18bb5f6b8b
Removing =& operators for construction of objects.
2010-11-12 23:05:44 -05:00
José Lorenzo Rodríguez
91e2d88900
Moving method back to DboSourceTest, as it was very difficult to adapt it to use mock objects
2010-11-11 00:22:08 -04:30
José Lorenzo Rodríguez
106379b7ef
Removing all methods with mysql syntax or dependent on anyway of this Dbo out form DboSourceTest.
2010-11-10 23:31:54 -04:30
José Lorenzo Rodríguez
d46f953357
Changing test case to reflect that stats option was removed from DboSource::execute and merged into "log" option
2010-11-10 23:10:13 -04:30
José Lorenzo Rodríguez
b20becc0b7
Extracting remaning methods with Mysql specific syntax out of DboSourceTest
2010-11-09 01:43:23 -04:30
José Lorenzo Rodríguez
539b90749a
Moving more methods out of DboSourceTest
2010-11-09 01:38:13 -04:30
José Lorenzo Rodríguez
66779eecfa
Moving some more method out of DboSourceTest
2010-11-09 01:26:15 -04:30
José Lorenzo Rodríguez
47c6132b24
cleaning up some tests, adding missing parameters in DboSource to match declaration on DataSource
2010-11-09 01:25:05 -04:30
José Lorenzo Rodríguez
3a8016b875
Even more methods containing quoting specific to mysql out of DboSource
2010-11-03 19:59:15 -04:30
José Lorenzo Rodríguez
6028705c72
Moving more methods out from DboSourceTest
2010-11-03 19:52:49 -04:30
José Lorenzo Rodríguez
86f1309a54
iMoving a couple of methods out from DboSourceTest
2010-11-03 19:40:09 -04:30
José Lorenzo Rodríguez
f2f378ca73
Moving testGenerateInnerJoinAssociationQuery out from DboSourceTest
2010-11-03 19:35:15 -04:30
José Lorenzo Rodríguez
605a6b17a5
Moving another method out of DboSourceTest
2010-11-03 19:18:51 -04:30
José Lorenzo Rodríguez
146af7faa5
Stating to move quoting test out from dbosource into mysql test
2010-11-03 19:14:22 -04:30
José Lorenzo Rodríguez
eedd823fd8
Merge remote branch 'origin/2.0' into feature/2.0/pdo
2010-11-03 00:23:18 -04:30
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
498417203b
Making DboSource::fields() use cacheMethod() so it respects $cacheMethods.
...
Test added.
Fixes #1211
2010-10-20 22:28:31 -04:00
José Lorenzo Rodríguez
183e9c92df
Removing some asignations by reference
2010-10-17 10:18:46 -04:30
José Lorenzo Rodríguez
082873721c
Changing param order in execute() to maintain compatibility, making all tests pass
2010-10-16 20:28:07 -04:30
mark_story
3ab77017ae
Fixing OpenTest license mentions to use MIT License
...
Fixing PHP versions 4 and 5 to only be PHP5.
2010-10-03 12:31:21 -04:00
mark_story
b908365f9d
Changing the @license tag on test files, as tests can now be MIT like
...
the rest of CakePHP.
2010-10-03 12:27:27 -04:00
mark_story
92b57d81ee
Moving common setup and teardown functionality in to CakeTestCase.
...
Removing repeated setup/teardown logic from test cases.
Switching tests to use setup/teardown instead of startTest/endTest.
2010-09-25 21:36:49 -04:00
mark_story
843ada240a
Removing AppController from ErrorHandler test as it can make testing harder.
...
Removing broken buffering from tests that trigger errors / exceptions.
Adding a loadHelper() to the test_app layout so the layout always has the required helper.
2010-09-25 10:41:08 -04:00
mark_story
26057c59c4
Fixing issue in DboSource test case where buffer would eat all the output.
...
Removing dead tests from TestManager test.
2010-09-25 01:13:01 -04:00
José Lorenzo Rodríguez
5c3b4cfcc4
Removing all uses of the test_suite connection in the test cases
2010-09-24 23:30:01 -04:00
mark_story
f21161ef46
Merge branch '1.3' into 2.0. Had to fix a number of 1.3 -> 2.0
...
differences upon merging.
Conflicts:
app/config/core.php
cake/console/templates/skel/config/core.php
cake/libs/cache/file.php
cake/libs/cake_session.php
cake/libs/controller/components/email.php
cake/libs/i18n.php
cake/libs/view/pages/home.ctp
cake/tests/cases/libs/cache/memcache.test.php
cake/tests/cases/libs/model/model_write.test.php
2010-09-24 23:27:22 -04:00
mark_story
729a45703b
Fixing issue where table names with spaces would not be quoted by name(). Fixes #1121
2010-09-21 20:34:27 -04:00
mark_story
d113d7d612
Removing dead code from DboSource::fields()
...
Updating fields() to use implode, so complex virtual fields are better handled. Fixes #1079
2010-09-18 00:04:36 -04:00
mark_story
730e373afe
Merge branch '1.3' into 2.0
...
Conflicts:
cake/libs/cake_session.php
cake/libs/view/pages/home.ctp
cake/tests/cases/libs/cache/memcache.test.php
cake/tests/cases/libs/cake_session.test.php
cake/tests/cases/libs/model/datasources/dbo_source.test.php
cake/tests/fixtures/data_test_fixture.php
2010-09-12 13:35:46 -04:00
mark_story
55ecfe0292
Fixing stupid typo.
2010-09-11 15:48:48 -04:00
Mark Story
aad72871a0
Adding more tests for virtualFields and complex expressions. Closes #1079
2010-09-07 00:32:44 -04:00
Mark Story
e15069769d
Adding tests for #1079 and fixing some formatting.
2010-09-07 00:09:06 -04:00
Mark Story
d88da3d579
Merge branch '1.3' into 2.0
...
Conflicts:
cake/libs/configure.php
cake/libs/model/connection_manager.php
cake/libs/model/model.php
cake/tests/cases/libs/model/datasources/dbo/dbo_postgres.test.php
cake/tests/cases/libs/view/helpers/text.test.php
2010-09-06 16:53:04 -04:00
mark_story
123873b4d8
Updating DboSource test to account for formatting of floats done in mysql/postgresql.
2010-08-26 21:20:13 -04:00
mark_story
d38857095a
Merge branch '1.3' into 2.0
...
Conflicts:
cake/libs/model/model.php
cake/libs/validation.php
cake/libs/view/helpers/ajax.php
cake/tests/cases/libs/controller/components/session.test.php
2010-07-24 22:34:42 -04:00
mark_story
4c27c24a72
Fixing issue in DboSource where COUNT() was hardcoded, omitting any other aggregate functions. Replaced with a regexp that accepts only letters. Test case added. Fixes #878
2010-07-15 23:17:38 -04:00
mark_story
65efd675c1
Fixing fatal error caused by associated models using a datasource that is not a subclass of dbo_source. Test added. Fixes #873
2010-07-11 13:06:33 -04:00
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
a166ea78cb
Fixing fails in dbo source test caused by not enough fixtures being loaded.
2010-06-25 23:40:29 -04:00
José Lorenzo Rodríguez
9b3df1ea0e
Migrating DboSourceTest to PHPUnit
2010-06-09 20:47:25 -04:30
mark_story
2f527cc5af
Adding a few tests for DboSource::fullTableName();
2010-06-08 23:29:40 -04:00
mark_story
7ed67e5959
Fixing virtualFields used in order clauses where virtualField was supplied with model alias. Tests added. Refs #768
2010-05-30 20:30:58 -04:00
