Juan Basso
b9010b05f2
Support to proxy in HttpSocket.
2010-12-01 13:46:13 -02:00
Juan Basso
634d686288
Merge branch '2.0' into 2.0-http
2010-12-01 11:49:26 -02:00
José Lorenzo Rodríguez
0d93520e0a
Fixing test case for sqlite
2010-11-29 20:52:32 -04:30
Juan Basso
ffaec10a7c
Fixing the result of App::import() when name of class have slash.
2010-11-29 22:37:08 -02:00
José Lorenzo Rodríguez
130fe603a7
Skipping test incompatiblw with mysql
2010-11-28 23:34:20 -04:30
José Lorenzo Rodríguez
592dda92de
Fixing test to make it pass using DboSqlite
2010-11-28 22:48:34 -04:30
Mark Story
40585a34e8
Adding support for userPath in IniAcl.
...
Test case added.
Fixes #1291
2010-11-28 21:22:10 -05:00
Mark Story
2495b3cd4c
Trimming whitespace and adding a file header.
2010-11-28 21:11:18 -05:00
Mark Story
3ddff879b1
Converting IniAcl to use IniFile, this removes one of the classes responsibilities.
2010-11-28 21:06:22 -05:00
Mark Story
35611d50c3
Fleshing out IniFile a bit more.
2010-11-28 21:05:32 -05:00
Mark Story
071cd9b477
Adding very naive implementation of an ini file parser.
2010-11-28 21:05:32 -05:00
mark_story
9d3b3a72ce
Starting to extract Ini file parsing out of IniAcl as it breaks single responsibility, and ini file parsing should be generic enough to be reused.
...
Adding a test case.
2010-11-28 21:05:32 -05:00
Mark Story
1f72e504d5
Fixing incorrect imports that caused test case to fail in CLI when run by itself.
2010-11-28 20:49:42 -05:00
mark_story
284a8db3f4
Moving error handling classes into a separate directory.
...
Moving error handling test cases into a directory that matches the one in libs.
Updating imports.
2010-11-28 12:27:51 -05:00
Jeremy Harris
1411e9495e
Fixed failing test due to missing CakeRequest class
2010-11-27 12:47:19 -08:00
Jeremy Harris
8492f2055b
Added tests for object collection
2010-11-27 12:09:43 -08:00
José Lorenzo Rodríguez
0ff01330c4
Making dates deconstruction in model more consistent for different datasources
2010-11-27 00:13:04 -04:30
José Lorenzo Rodríguez
41ee035d28
Starting to bring sqlite dbo up to date
2010-11-26 23:46:34 -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
ADmad
70ae66edf7
Fixing test cases for EmailComponent
2010-11-27 01:21:19 +05:30
mark_story
04d3feb6c0
Unknown errors cannot be mapped as they generate another error. Having a default case doesn't make much sense here.
...
Adding additional coverage to ErrorHandler.
2010-11-25 22:51:30 -05:00
mark_story
f2f3f13c75
Adding exception logging configuration setting. Allows uncaught exceptions to be logged.
...
Implementing logging, and adding a test case.
2010-11-25 22:51:30 -05:00
mark_story
3bc708ba19
Adding the new group to AllTests.
...
Removing ErrorHandler test from AllLibs.
2010-11-25 22:51:30 -05:00
mark_story
fac222e2cd
Removing classes that were not used in the ErrorHandler test case. Adding a new test suite for error classes.
2010-11-25 22:51:29 -05:00
mark_story
e2c8e20afa
Pulling exception page rendering out into a separate class, ErrorHandler felt very large and confusing, as it had a few too many jobs.
2010-11-25 22:51:29 -05:00
mark_story
722b1a02ba
Adding Debugger output to ErrorHandler::handleError, and adding tracing for log writes.
...
Renaming Debugger::_output() -> Debugger::outputError() and making it public instead of protected.
2010-11-25 22:51:29 -05:00
mark_story
f373fc19d1
Removing logError from CakeLog, it will be moved into ErrorHandler::handleError()
2010-11-25 22:51:29 -05:00
mark_story
6c2c4f91df
Removing dead tests and updating ones to reflect changes in how Configure works.
2010-11-25 22:51:29 -05:00
mark_story
4960b6e7bf
Changing method names on CakeLog and Debugger to better reflect what they do. Updating test cases.
2010-11-25 22:51:28 -05:00
mark_story
da3bf1c747
Adding ErrorHandler::handleError for consolidating core error handling out of CakeLog and Debugger.
2010-11-25 22:51:28 -05:00
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
7d158e8d1f
Fixing Set::sort() for arrays with out of sequence, or missing keys.
...
Tests added.
Fixes #1312
2010-11-25 06:39:08 -05:00
mark_story
4214242efd
Adding test for correct merge order for $uses.
...
Fixing incorrect merge ordering for $uses, so it matches historical behaviour.
Fixes #1309
2010-11-24 22:44:12 -05:00
mark_story
0e29567f8d
Adding an array cast to fix issues where users could modify cookie
...
values causing iteration errors. Fixes #1309
2010-11-24 22:09:08 -05:00
Juan Basso
af06b8f179
Added test to a request that server dont response WWW-Authenticate.
2010-11-24 21:14:52 -02:00
mark_story
d5fb0b25cb
Fixing issue where Date header would be missing from Emails sent by
...
EmailComponent.
Adding user configurable field for date.
Test cases added. Fixes #1304
2010-11-22 22:08:46 -05:00
mark_story
4c0e69b8fc
Removing constant checks, they aren't used anymore.
2010-11-21 15:13:33 -05:00
mark_story
8aabf3689e
Making BehaviorCollection more consistent with other object collections.
...
Fixing failing tests caused by not being updated when behavior changed.
2010-11-21 14:42:13 -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
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
8f82156a51
Adding _mergeVars to Controller (this duplicated method will be re-factored away).
...
Updating tests in ControllerMergeVarsTest to use PHPUnit assertions.
2010-11-21 00:14:29 -05:00
mark_story
79aafda698
Removing use of serialize() for locked fields. This removes any
...
possible exploit related to serialize()/unserialize(). Instead values
are passed as | delimited.
2010-11-21 00:09:45 -05:00
mark_story
ae7855692d
Removing unserialize() as its dangerous. Instead using | delimited fields for locked fields. This totally avoids issues with serialize(). Removing str_rot13, as its only child proof.
...
Tests updated.
2010-11-20 23:42:54 -05:00
mark_story
3237402fb8
Merge branch '1.3' into merger
...
Conflicts:
cake/libs/configure.php
2010-11-20 23:14:33 -05:00
mark_story
ef3cb0e50c
Adding tests for Set::normalize()
2010-11-20 22:46:55 -05:00
mark_story
6d9b000aee
Changing how mergeVars are handled, so the difference of app/current is used as a base.
...
Also fixing issues where passing settings to helpers in AppController could result in them not being correctly merged.
Thanks to hashmich for the partial patch.
Fixes #1183
2010-11-20 22:34:24 -05:00
Juan Basso
3056fbf680
Changing authentication classes to use suffix Authentication instead of Method.
2010-11-20 17:47:35 -02:00
mark_story
e0a8ffe8a3
Applying patch from 'jmccaffrey' to fix issues on windows where virtual
...
machine paths would not be correctly handled. Fixes #1254
2010-11-20 13:26:30 -05:00
José Lorenzo Rodríguez
40418de218
Freeing up some memory in dbos after the result set has been completly fetched.
...
Adding dbo_mysql and dbo_postgres to the AllDAtabase testsuite
2010-11-16 23:59:24 -04:30
mark_story
ba10003ef2
Fixing failing tests when HtmlHelper test was run by itself.
2010-11-16 22:52:49 -05:00
mark_story
d12c232d8a
Merge branch '1.3' into merger
...
Conflicts:
app/config/core.php
cake/console/templates/skel/config/core.php
cake/dispatcher.php
cake/libs/controller/components/auth.php
cake/libs/view/helpers/form.php
cake/tests/cases/libs/cake_test_case.test.php
cake/tests/cases/libs/controller/components/security.test.php
cake/tests/cases/libs/model/models.php
cake/tests/cases/libs/router.test.php
cake/tests/cases/libs/view/helpers/paginator.test.php
cake/tests/lib/cake_test_case.php
2010-11-16 21:48:13 -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
mark_story
f0ac462775
Updating test cases with failing tests.
2010-11-15 22:53:49 -05:00
mark_story
66e6ec763e
Merge branch 'dispatcher-request' into 2.0
...
Conflicts:
cake/libs/configure.php
cake/tests/cases/libs/all_routing.test.php
cake/tests/cases/libs/controller/controller.test.php
2010-11-15 22:42:54 -05:00
Juan Basso
7bea5d9410
Added the http directory to AllSocket tests.
2010-11-14 23:56:12 -02:00
mark_story
27287e4b9f
Moving AppTest into a separate file.
...
Updating test suite.
2010-11-14 13:06:25 -05:00
mark_story
f02e0483ee
Reworking parameter munging specific to requestAction into requestAction. Updating tests cases for Object. As request->data is an array() not null. And leading / is trimmed off of [url][url].
2010-11-14 01:01:11 -05:00
mark_story
55cc3296ab
Making the Debugger tests pass when you have debug = 0 in your config file. Tests are runnable while debug = 0 from CLI.
2010-11-14 00:59:45 -05:00
mark_story
557d797297
Making Dispatcher test cases pass when Dispatcher expects a CakeRequest instead of a string.
2010-11-14 00:29:56 -05:00
mark_story
dad7963ea4
Moving Dispatcher inside libs directory, as it is part of CakePHP's libs.
2010-11-14 00:00:23 -05:00
mark_story
6073ac5dfa
Fixing errors caused by accessing things that don't exist.
2010-11-13 23:57:01 -05:00
mark_story
9b08b725fe
Merge branch '2.0' into 2.0-view
...
Conflicts:
cake/libs/controller/controller.php
cake/libs/view/helpers/cache.php
2010-11-13 21:03:54 -05:00
Juan Basso
974161cf3a
Changed the name of header to use in Digest method.
2010-11-13 21:47:25 -02:00
Juan Basso
85607a9963
Removed interference in the name of the headers.
2010-11-13 21:44:11 -02:00
Juan Basso
44629bd673
Support to digest method in HttpSocket. Thanks to jmcneese and Adrien Gibrat.
2010-11-13 20:51:09 -02:00
mark_story
76a80c262e
Fixing failing test caused by name() being able to quote things better now.
2010-11-13 12:04:22 -05:00
mark_story
e63f81c12a
Fixing test case that was missing request access.
2010-11-12 23:23:08 -05:00
mark_story
01894b315f
Fixing issues caused by not accessing the request object correctly.
2010-11-12 23:14:34 -05:00
mark_story
18bb5f6b8b
Removing =& operators for construction of objects.
2010-11-12 23:05:44 -05:00
mark_story
d044cdd02f
Fixing test case that was missing request access.
2010-11-12 22:50:15 -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
mark_story
ec2884f17c
Making routing suite include RedirectRoute.
2010-11-10 23:50:01 -05:00
mark_story
6c2b088706
Merge branch '2.0' into 2.0-view
2010-11-10 23:41:44 -05:00
mark_story
f4b0ec1d20
Updating E_STRICT issues in view test.
...
Removing dead methods and classes.
2010-11-10 23:40:56 -05:00
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
Mariano Iglesias
a1467822fb
Fixing wrong assertion in test for CakeTestCase::testAction. Fixing testAction issue that would always include layout
2010-11-10 23:03:38 -04:30
mark_story
b297bf633d
Updating test to be correct.
2010-11-09 23:55:42 -05:00
mark_story
6c0dfe9592
Fixing error where params[url] has moved.
2010-11-09 23:44:33 -05:00
mark_story
1f5999f388
Adding some tests for element caching.
2010-11-09 22:31:05 -05:00
mark_story
1cf5e72054
Removing duplicated calls to slug()
...
Extracting getElementFilename() into a method, this should allow developers to more easily replace how elements are found.
Refs #1268
2010-11-09 22:16:45 -05:00
Juan Basso
777afb6d3e
separeted auth from HttpSocket. Refs #880
2010-11-09 23:09:56 -02:00
Juan Basso
2bed6622fe
Added tests to thown in connect.
2010-11-09 21:00:57 -02:00
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
f93a759220
Merge remote branch 'origin/2.0' into feature/2.0/pdo
2010-11-08 21:30:38 -04:30
mark_story
dfefc2d97b
Very initial pass at getting elements cached with Cache. Refs #1268
2010-11-08 00:06:10 -05:00
mark_story
a9a9bc0e2e
Removing bogus crud in the test.
2010-11-07 23:48:14 -05:00
mark_story
e431e86aa4
Fixing issue found by Felix Wilhelm(flxm) where users could send potentially dangerous or corrupted serialized objects to SecurityComponent, potentially allowing manipulation of file map caches. Test case added.
2010-11-07 20:53:04 -05:00
Jeremy Harris
c98306727d
Merge branch '2.0-redirect' into 2.0
2010-11-07 17:42:04 -08:00
Jeremy Harris
7630580511
Added support for redirection routes. Fixes #1151
2010-11-07 17:33:05 -08:00
Jeremy Harris
060f149a84
Added configurable ellipsis on Paginator::numbers(), Paginator::first(), Paginator::last(). Fixes #1086
2010-11-07 17:08:01 -08:00
mark_story
3216c902cd
Removing the enable parameter on HelperCollection, BehaviorCollection, and ComponentCollection. They all now support the enabled option that Behaviors have historically supported. This provides a simpler API with fewer arguments, and allows callbacks to be disabled on objects in their declared arrays.
...
Test cases updated.
2010-11-07 13:23:45 -05:00
mark_story
22497eb41c
Fixing failing tests in controller test.
2010-11-07 13:23:45 -05:00
mark_story
88c717dbd8
Removing the 3rd param from ObjectCollection::load() and adding a uniform setting of 'callbacks'. This setting is used to disable callbacks on objects by convention. Test cases updated.
2010-11-07 13:23:45 -05:00
mark_story
1ba28c246b
Adding settings['callbacks'] as a way to define enabled/disabled state of helpers in settings arrays. This should replace the separate parameter.
...
Tests updated.
2010-11-07 13:23:45 -05:00
mark_story
4c0fd76a2e
Changing <cake:nocache></cake:nocache> into <!--nocache--><!--/nocache--> This makes no cache tags valid html/xml at all times, and will not interfere with validation.
2010-11-07 13:23:45 -05:00
mark_story
4739d7f955
Adding tests for CacheHelper callback methods.
2010-11-07 13:23:45 -05:00
mark_story
f7f9c3f6a2
Removing a test case that doesn't need to exist anymore as the conditions for cache generation are now in CacheHelper.
2010-11-07 13:23:44 -05:00
mark_story
2e140a9fd3
Adding tests for element callbacks.
2010-11-07 13:23:43 -05:00
mark_story
1b19ad48b4
Adding parameters to helper callbacks, these allow helpers to introspect more on the view/layout being rendered.
...
Updating tests.
2010-11-07 13:23:42 -05:00
mark_story
76919902b9
Removing direct tests of protected method.
...
Refactoring View with the intention of eventually removing coupling with CacheHelper.
Making Helpers load after the first rendering method is called.
Moving callbacks out of _render() to make logic simpler, and with the idea that elements will get a callback too.
2010-11-07 13:23:42 -05:00
Mark Story
8f31ef7149
Making $scripts_for_layout and $content_for_layout regular viewVars. This will allow helpers to manipulate them in callbacks.
...
Made $___dataForView an optional parameter, it defaults to $this->viewVars if left undefined. Refs #624
2010-11-07 13:23:42 -05:00
mark_story
1424e02488
Adding a method to CakeRequest to parse out the accept-language header. This will help remove features from l10n.
2010-11-07 01:35:36 -04:00
ADmad
eb76ab95f2
Fixed issue where Model::saveAll() would incorrectly commit a transaction which was not started in that function call itself.
2010-11-06 09:33:50 +05:30
mark_story
d56b812181
Fixing issue where an array to string conversion error could occur if you had multiple values for a model's primary key and you created a matching form. Tests added.
...
Fixes #1257
2010-11-04 21:08:40 -04:00
ADmad
81ce6f40b9
Added test cases showing usage of 'full_base' key for url generation. Refs #1256
2010-11-04 17:59:23 +05: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
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
Juan Basso
b0a600f925
Merge branch '2.0-post-method' into 2.0
2010-11-03 01:42:06 -02:00
Juan Basso
adb2d90b9a
Changed the regex to follow the RFC 3986, working to protocols like "svn+ssh://" and "ed2k://"
2010-11-03 01:26:41 -02:00
mark_story
d1403b0da8
Changing NumberHelper::currency() to format < 1euro based on the suggestions from 'Joel Haasnoot'. Instead of 99c you will get €0,99.
...
Test cases updated. Fixes #1253
2010-11-02 21:56:24 -04:00
Mark Story
94f9f7afeb
Fixing failing tests from merge with 1.3. Most tests were failing due to internal changes and PHPUnit being more specific than SimpleTest.
2010-10-31 22:42:16 -04:00
Mark Story
c2063f1229
Merge branch '2.0' of github.com:cakephp/cakephp into 2.0
2010-10-31 21:58:38 -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
Juan Basso
7f448a1d35
Allowed the use of empty() and isset() in Controllers aliases properties.
2010-10-31 22:02:26 -02:00
Juan Basso
4eed660a62
Changed the form style to not affect layout.
2010-10-30 22:39:31 -02:00
Robert Sworder
593c45b6e7
Whitespace changes
2010-10-29 23:43:50 -04:00
Robert Sworder
9eb533b9f6
dateTime functions + tests
2010-10-29 23:43:50 -04:00
Robert Sworder
a876c77987
meridian function
2010-10-29 23:43:50 -04:00
Robert Sworder
d3c1e8c974
minute function + tests
2010-10-29 23:43:49 -04:00
Robert Sworder
5f0700342b
hour function + tests
2010-10-29 23:43:49 -04:00
Robert Sworder
6620b3b8fc
month function + tests
2010-10-29 23:43:49 -04:00
Robert Sworder
529791842c
year function + tests
2010-10-29 23:43:49 -04:00
Robert Sworder
a1b1a07af2
__dateTimeSelected and day functions done, with tests
2010-10-29 23:43:48 -04:00
Robert Sworder
30f3494c98
Select function signature changed. Corresponding tests changed.
2010-10-29 23:43:48 -04:00
Robert Sworder
115c6102b9
Changes to make tests pass...
2010-10-29 23:43:48 -04:00
Mark Story
3ca0cdb1ee
Adding support for route objects to return full urls. These urls are not changed by Router, and just returned. This will allow subdomain route classes to be created.
...
Tests added.
2010-10-29 21:33:56 -04:00
mark_story
f29bb562cb
Adding a test for saving blank fields on a model. Closes #1243 .
2010-10-29 00:13:09 -04:00
mark_story
f5fd069583
Applying patch from 'Justas Butkus' to fix CakeSchema::compare()
...
Fixes issues with comparing null == '' and adds a new protected method to handle null aware array difference generation.
Tests added.
Fixes #1206
2010-10-27 23:03:31 -04:00
mark_story
d7847288e4
Adding Fennec as a built-in mobile browser.
...
Refactoring a test case to pull out the exceptional case.
Fixes #932
2010-10-27 22:32:15 -04:00
José Lorenzo Rodríguez
8d80188c6c
Updating more tests with boolean handling, maybe in the near future fixing this for both mysql and postgres is coming
2010-10-26 21:59:48 -04:30
José Lorenzo Rodríguez
eb49181c48
Bringing more boolean tests up to date in postgres
2010-10-26 21:49:03 -04:30
José Lorenzo Rodríguez
b3d8a619a3
Updating test for booleans in postgres
2010-10-26 21:46:29 -04:30
mark_story
3639f52117
Adding a test for containable modifying return. Refs #1219
2010-10-26 21:39:48 -04:00
José Lorenzo Rodríguez
d9222cf90a
Merge remote branch 'origin/2.0' into feature/2.0/pdo
2010-10-26 20:42:30 -04:30
José Lorenzo Rodríguez
ff9748c6ba
Adding some workaround in traslate behavior tests for postgres, all tests passing now
2010-10-26 20:34:25 -04:30
José Lorenzo Rodríguez
cc32ac8904
Simplifying tests for translatable behavior as they were hard to understand
2010-10-26 17:55:50 -04:30
José Lorenzo Rodríguez
16524bc72f
Fixing test case for translate behavior
2010-10-26 17:53:33 -04:30
José Lorenzo Rodríguez
25c213e976
Preventing zero length of fields using prostgres
2010-10-25 20:25:07 -04:30
José Lorenzo Rodríguez
cec3512835
Fixing more errors in tests related to type casting
2010-10-25 19:47:32 -04:30
José Lorenzo Rodríguez
f027bf0f7b
Fixing some errors in tests
2010-10-25 19:47:00 -04:30
SKAhack
9f2d33aa88
meta characters don't match on regex string
...
Signed-off-by: mark_story <mark@mark-story.com>
2010-10-24 21:42:11 -04:00
mark_story
a57f8d3851
Adding another test for csrfUseOnce.
2010-10-24 20:57:12 -04:00
José Lorenzo Rodríguez
1acb619e75
Implementing DboSource::insertMulti so it uses prepared statements, also changing internal uses of this method to reflect the new api, this brings as consequence a better abstracttion for datasources in model and fixtures, but breaks BC
2010-10-24 19:59:54 -04:30
mark_story
22239b4481
Making the ability to use longer shared csrf tokens possible. This should make for fewer blackholed' requests when doing complicated javascript.
2010-10-24 20:26:31 -04:00
José Lorenzo Rodríguez
34813ab35c
Merge remote branch 'origin/2.0' into feature/2.0/pdo
2010-10-24 19:55:02 -04:30
mark_story
4496a0a0bb
Reformatting code to use tabs.
...
Fixing issue with float comparison.
Fixes #219
2010-10-24 19:43:41 -04:00
C. James Callaway
b8f0dda964
Updating to match ticket, using radians() SQL function.
2010-10-24 19:39:18 -04:00
C. James Callaway
a429287c19
Adding testcase for ticket #219
2010-10-24 19:38:23 -04:00
Graham Weldon
d3e0ddbb0e
Update copyright years.
2010-10-25 07:58:22 +11:00
mark_story
54854c493b
Changing output buffering, as ajaxtest was making output and breaking tests in group contexts.
2010-10-24 00:39:46 -04:00
mark_story
155bfe6293
Fixing failing test caused by setting an expiry value outside of the PECL extensions limits.
2010-10-24 00:05:27 -04:00
mark_story
0b2a6acc64
Merge branch '2.0' into 2.0-console
2010-10-23 19:19:04 -04:00
mark_story
bf7b8b0e93
Fixing issues with RssHelper and updating tests to reflect changes in how Xml::build() differs from previous versions' Xml.
2010-10-23 13:11:50 -04:00
mark_story
7aaf7e6b68
Fixing issue where Xml would not read CDATA blocks.
2010-10-23 11:01:13 -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
José Lorenzo Rodríguez
c7763b316e
Fixing some boolean issues in DboPostgres
2010-10-21 20:34:11 -04:30
José Lorenzo Rodríguez
0ffe6de9e4
Allowing multiple sql sentences to be executed only for creting or altering databases
2010-10-20 23:57:00 -04:30
mark_story
7c296211ef
Making generating schema for connections with prefixes work correctly. The prefix needs to be removed so that when tables are created or updated they do not get the prefix added twice.
...
Moving tests around. Fixes #1180
2010-10-20 23:17:04 -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
mark_story
077d1c5ad5
Applying patch from 'hashmich' to fix issues with slideUp and slideDown effects in prototype engine.
...
Tests updated.
Fixes #1213
2010-10-20 22:07:53 -04:00
José Lorenzo Rodríguez
d0fc2fd171
Fixing describing of table columns for postgres
2010-10-19 00:48:08 -04:30
mark_story
1c25e627ad
Applying patch from 'Mark Mitchell' fixes issues with sending Email via smtp. Which were incorrect based on previous patches given for ticket #1100 .
...
Fixes #1205 , Fixes #1204
2010-10-18 22:06:12 -04:00
Juan Basso
373fa780f7
Created the method FormHelper::postLink() to create a link with form to send data via POST. This feature require javascript.
2010-10-18 21:51:17 -02:00
Juan Basso
4c106490ef
Created the method FormHelper::postButton() to create a button with form to send data via POST.
2010-10-18 17:53:27 -02:00
José Lorenzo Rodríguez
5c87daf083
Implementing listSources for postgres
2010-10-18 00:08:34 -04:30
José Lorenzo Rodríguez
aedf69dee1
More refactoring to DboSource::value()
2010-10-17 23:55:11 -04:30
José Lorenzo Rodríguez
6778d4b565
Updating test case for floats
2010-10-17 23:42:12 -04:30
José Lorenzo Rodríguez
d9c9a32ff3
Refactoring DboSource::value() so postgres and mysq behavior is the same, updating test case
2010-10-17 23:38:55 -04:30
mark_story
84a8dbd85a
Merge branch '2.0' into 2.0-console
2010-10-17 23:32:38 -04:00
Juan Basso
d771239104
Fixed support to save XML data in Models.
2010-10-17 22:47:43 -02:00
mark_story
d64aed59cc
Adding console libs into AllTests
2010-10-17 17:33:16 -04:00
Juan Basso
b2035a5c96
Fixing tests that failing in Set because merge of Xml class.
2010-10-17 18:40:33 -02:00
José Lorenzo Rodríguez
ee4add9c32
Fixing test case
2010-10-17 15:53:44 -04:30
José Lorenzo Rodríguez
f215cd01f1
Fixing tests for CakeSchema
2010-10-17 15:25:04 -04:30
José Lorenzo Rodríguez
cbdfb3f76e
Removing all references to mysqli
2010-10-17 11:49:17 -04:30
José Lorenzo Rodríguez
78717ab45c
Fixing some test cases
2010-10-17 11:29:49 -04:30
José Lorenzo Rodríguez
7e2fe43ee3
FIxing query caching to take in account bound parameters
2010-10-17 10:51:54 -04:30
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
José Lorenzo Rodríguez
25915bd931
Merge remote branch 'origin/2.0' into feature/2.0/pdo
2010-10-16 14:20:58 -04:30
José Lorenzo Rodríguez
d83c95cf46
Fixing bug in DboMysql::value()
2010-10-16 14:01:01 -04:30
José Lorenzo Rodríguez
88a2fb5058
Fixing bug in DboMysql::describe()
2010-10-16 13:44:16 -04:30
José Lorenzo Rodríguez
17f24719ee
Replacing reference assignation for normal assignation in test case
2010-10-16 13:32:59 -04:30
José Lorenzo Rodríguez
84283ed6f3
Fixing DboMysql::listDetailedSources()
2010-10-16 13:28:18 -04:30
mark_story
c35ef7dbab
Making class attribute bubble down into FormHelper::__selectOption().
...
Fixes issue where you couldn't change the classname of checkbox options.
Fixes #1202
2010-10-16 13:32:04 -04:00
José Lorenzo Rodríguez
e03cbcb167
Fixing model describing and making pass testBlobSaving
2010-10-16 10:23:13 -04:30
mark_story
98a654c4b9
Expanding String::wrap to be able to indent and start indenting at a specific offset.
2010-10-15 22:46:03 -04:00
José Lorenzo Rodríguez
526205b546
Fixing test case in DboMysql
2010-10-15 18:41:17 -04:30
José Lorenzo Rodríguez
5e80cf8ff7
Improving DboMysql::index()
2010-10-15 17:27:36 -04:30
José Lorenzo Rodríguez
0fb2ac0285
Chaging implementation of DboMysql::getVersion(), improving connection options
2010-10-15 17:03:59 -04:30
José Lorenzo Rodríguez
70ed9a7b12
Fixing DboMysql::index() method
2010-10-15 17:02:37 -04:30
José Lorenzo Rodríguez
dc362d1a38
Adding test for DboMysql::getEncoding()
2010-10-14 23:18:07 -04:30
José Lorenzo Rodríguez
09e06d52b9
Implementing DboMysql::getVersion()
2010-10-14 23:15:17 -04:30
mark_story
7b5ae6a5c4
Adding String::wrap() to handle wrapping strings for console output.
2010-10-14 22:32:56 -04:00
mark_story
67874bd906
Fixing issue where defining a pattern for :action would create an optional route parameter that wouldn't respect its pattern.
...
Added the default action value only when a pattern isn't defined.
Added tests to CakeRoute and Router to cover this case.
Fixes #1197
2010-10-14 21:54:44 -04:00
José Lorenzo Rodríguez
b8479459d6
Inital work for connecting to mysql using PDO and gettng the table list, testing is easier as it now uses mocks
2010-10-14 01:10:51 -04:30
mark_story
517c8949f9
Merge branch '2.0' of github.com:cakephp/cakephp into 2.0
2010-10-13 23:17:50 -04:00
mark_story
0c070f7131
Fixing tests that were failing due to SimpleTest being less sensitive to types than PHPUnit.
...
Fixing tests that were failing due to XmlHelper being removed in 2.0.
2010-10-13 23:09:55 -04:00
mark_story
f19e3d501c
Merge branch '1.3' into integration
...
Conflicts:
cake/libs/model/cake_schema.php
cake/libs/model/datasources/dbo_source.php
cake/libs/model/model.php
cake/libs/view/helpers/form.php
cake/libs/view/view.php
cake/libs/xml.php
cake/tests/cases/libs/model/model_delete.test.php
cake/tests/cases/libs/view/view.test.php
cake/tests/cases/libs/xml.test.php
2010-10-13 22:30:40 -04:00
mark_story
6529e0e2b4
Making optiongroup elements follow the escape parameter.
...
Tests added.
Fixes #1191
2010-10-13 21:59:53 -04:00
mark_story
3f2109f3c3
Applying patch from 'dragonfly' to fix issue where FormHelper would always append an argument even if one was supplied.
...
Test Added
Fixes #1155
2010-10-13 21:36:05 -04:00
Jeremy Harris
692aafbf42
Merge remote branch 'upstream/2.0' into 2.0
2010-10-11 20:12:24 -07:00
mark_story
a0a84d1a8d
Changing pattern used to read digest auth data. Allows emails to be used as usernames.
...
This also adds the realm to the return value of SecurityComponent::parseDigestAuth(). Fixes #1181
2010-10-11 22:35:47 -04:00
Jeremy Harris
b58899cf04
Added 'double' option to Santize::html() to pass double_encode parameter to htmlentities()
2010-10-11 18:25:11 -07:00
Juan Basso
c95c808f88
Merge with 2.0-xml
2010-10-10 23:21:56 -03:00
ADmad
62161203f2
Fixed issue where FormHelper::radio() and FormHelper::select() with option "multiple"=>"checkbox" would generate tag with invalid "id" attribute if a value was non alphanumeric
2010-10-10 23:16:48 +05:30
Phally
0d86302404
Fixed issue with Set::extract() where conditions containing a space and a slash would fail. Fixes #1185
...
Signed-off-by: mark_story <mark@mark-story.com>
2010-10-08 23:28:23 -04:00
Phally
0e5613f63d
Fixed Set::extract() where single numeric keys (everything not 0) were skipped. Fixes #1175
...
Signed-off-by: mark_story <mark@mark-story.com>
2010-10-07 20:33:31 -04:00
José Lorenzo Rodríguez
5c025d0a18
More testing over the MediaView class
2010-10-03 23:30:47 -04:30
José Lorenzo Rodríguez
9daab17374
Improving test case for MediaView class
2010-10-03 23:30:02 -04:30
José Lorenzo Rodríguez
a611fd0e6c
Merge branch '2.0' of github.com:cakephp/cakephp into 2.0
2010-10-03 19:36:24 -04:30
José Lorenzo Rodríguez
bf22928b6a
Improving the CakeResponse::cache() method
2010-10-03 19:27:08 -04:30
José Lorenzo Rodríguez
0ba5023f3a
Updating testcase and fixing small bug in last commit
2010-10-03 16:48: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
6cabfcec5b
Removing dead tests from SessionHelper test case.
2010-10-03 12:15:01 -04:00
teknoid
503b7cf5d7
Adding slug option to avoid auto-slug of tags. Test included. Addresses #284
...
Signed-off-by: mark_story <mark@mark-story.com>
2010-10-02 19:16:07 -04:00
mark_story
d83c51cde9
Fixing expiration conditions on CSRF tokens.
2010-10-02 18:27:39 -04:00
mark_story
7f7c202f35
Removing old CSRF token validation checks.
...
Removing failing test because the feature moved.
Adding tests for expired and wrong keys.
2010-10-02 17:16:40 -04:00
mark_story
a10f1478ee
Adding support for nonce expiry.
...
Adding simple time based nonce expiration. This does a simple cleanup on
each request, to remove stale tokens. Tests added.
2010-10-02 00:20:58 -04:00
mark_story
5c27abd35f
Applying patch from 'hashmich' to make jQueryEngine not override the success callback. This allows you to provide a success callback and still get the html insertion when used with the update key.
...
Tests updated.
Fixes #1158
2010-10-01 22:43:46 -04:00
mark_story
711e736cd3
Adding very minimal and incomplete implementation of csrf consumption.
...
Tests added for consuming csrf tokens on each request.
2010-10-01 00:13:34 -04:00
mark_story
5e26d282a1
Fixing connection specific schema generation
...
Fixing missing table errors when reading schema for specific connections.
Tests updated to check that tables not on a connection are never touched. Fixes #1106
2010-09-30 23:22:57 -04:00
mark_story
dc6b33f80e
Making tokens persist across 'requests'.
...
Removing more serialize/unserialize calls.
2010-09-30 00:26:44 -04:00
mark_story
f5ed91137a
Adding csrfCheck related properties.
...
nonces are now being populated into the session.
2010-09-30 00:18:25 -04:00
mark_story
b088daf045
Adding tests for csrf feature separation.
...
Removing serialize() calls as they didn't really add anything.
2010-09-30 00:06:38 -04:00
mark_story
c573fd0432
Fixing issue where a beforeDelete() could trigger a table truncation.
...
Moving the exists check below beforeDelete() and behavior->beforeDelete() so any records deleted in the callbacks will not exist when db->delete() is called. Test updated. Fixes #250
2010-09-29 23:31:41 -04:00
evilbloodydemon
38e128b597
test for #250
...
Signed-off-by: mark_story <mark@mark-story.com>
2010-09-29 23:06:47 -04:00
mark_story
72a1c959a1
Adding CakeSession::clear() which is primarily useful when testing, and offers an alternative to using CakeSession::destroy()
2010-09-29 23:01:23 -04:00
mark_story
597058bab5
Reordering tests in AllRouting case.
...
Changing how output buffers are emptied, so that its only done in cli.
2010-09-29 22:42:01 -04:00
José Lorenzo Rodríguez
cff2864ba5
Fixing testcase
2010-09-29 01:14:44 -04:30
José Lorenzo Rodríguez
9d35ea0cbc
Upgrading CodeCoverage repoting fo phpunit 3.5
2010-09-29 01:14:14 -04:30
mark_story
b08aba8e86
Adding a missing rollback when validation on an associated record fails, and validate = first. Fixes #1147
2010-09-28 23:37:28 -04:00
mark_story
0761edecfb
Making the cake:nocache stripping more relaxed so that if either condition to enable caching is on, tags will be stripped. Tests added. Fixes #1148
2010-09-28 23:03:56 -04:00
mark_story
9992cff96c
Adding another test for #250 .
2010-09-28 22:26:54 -04:00
José Lorenzo Rodríguez
4445c24008
Merge remote branch 'origin/2.0' into 2.0-phpunit-upgrade
2010-09-28 20:56:44 -04:30
José Lorenzo Rodríguez
f2b51d2375
Fixing parse error
2010-09-27 23:41:11 -04:30
José Lorenzo Rodríguez
87d5a791c6
Fixing helper tests
2010-09-27 23:40:57 -04:30
José Lorenzo Rodríguez
c3ccf15546
Replacing the use of removed "sharedFixture" and adding custom "fixtureManager" property to CakeTestCase
2010-09-27 23:37:56 -04:30
mark_story
3a14f780b9
Moving parent call to fix fatal errors caused by registry being empty.
2010-09-28 00:03:23 -04:00
José Lorenzo Rodríguez
0eaf437fe4
Merge remote branch 'origin/2.0' into 2.0-phpunit-upgrade
2010-09-27 23:19:47 -04:30
José Lorenzo Rodríguez
2635733aba
Merge branch '2.0' into 2.0-phpunit-upgrade
2010-09-27 22:42:10 -04:30
José Lorenzo Rodríguez
ba168d1a72
Initial steps towards migrating to phpunit 3.5
2010-09-27 22:37:23 -04:30
mark_story
06ed3a96a7
Moving the plugin import tests to a separate method.
...
Adding tests for importing a pluginAppHelper.
Closes #1111
2010-09-26 12:30:12 -04:00
mark_story
0990728385
Adding tests for non latin domains to MemcacheEngine. Closes #1143
2010-09-26 12:04:06 -04:00
mark_story
995a14c140
Making MemcacheEngine understand IPv6 addresses. Fixes #1143
2010-09-26 01:11:19 -04:00
mark_story
6d7f2d37ab
Fixing issue where fields with the exact same name as the model would result in incorrect name attributes. Tests added. Fixes #1123
2010-09-26 00:46:51 -04:00
mark_story
237b66d193
Adding support for httpOnly cookies to CookieComponent. Fixes #1127
2010-09-25 23:24:37 -04:00
mark_story
3395f4221e
Adding Inflector::reset(). This makes non-isolated test runs possible. Adding inflector to the libs suite.
2010-09-25 23:04:49 -04:00
mark_story
63d23df77a
Merge branch 'setup-teardown' into all-tests
2010-09-25 22:34:20 -04:00
mark_story
0222717e33
Merge branch 'all-tests' of github.com:markstory/cakephp into all-tests
2010-09-25 22:34:10 -04:00
mark_story
54fa2e3742
Uncommenting model group in all tests.
2010-09-25 22:33:23 -04:00
José Lorenzo Rodríguez
27dfe2d521
Adding all_model suite to the all_tests one
2010-09-25 22:00:30 -04:30
mark_story
2b1bc99eb5
Fixing failing tests in auth and scaffold.
...
Fixing more tests that had stray buffers.
2010-09-25 22:27:31 -04:00
José Lorenzo Rodríguez
18b38f61e0
Fixing CakeTestFixture import feature
2010-09-25 21:53:48 -04:30
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
24dd0af601
Adding debug backup for view test.
2010-09-25 10:50:35 -04:00
mark_story
f60a7fb854
Adding all libs to the all tests.
2010-09-25 10:42:20 -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
714d8298c4
Fixing all tasks include.
...
Removing drop table queries that cause other tests to fail.
2010-09-25 01:25:42 -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
mark_story
8e6277c9d1
Updating schema shell test so it doesn't fail in groups.
...
Updating suites to use new method.
2010-09-25 00:13:37 -04:00
mark_story
5c94bdd028
Fixing failing tests in group context caused by state being stuck in static objects.
2010-09-24 23:30:02 -04:00
mark_story
4e5ebc5c0f
Renaming all bake tasks to all tasks.
...
Updating all tests.
2010-09-24 23:30:02 -04:00
mark_story
94d738e834
Fixing failing tests and group test situational fails in console tests. Adding console tests to all tests.
2010-09-24 23:30:02 -04:00
mark_story
6974a8752f
Removing a test that used eval(). It caused issues in group tests.
2010-09-24 23:30:02 -04:00
mark_story
12d0bdd2ee
Adding a missing require to make tests run in cli.
...
Adding test_suite suite to all tests as it now runs.
2010-09-24 23:30:02 -04:00
mark_story
460a8bc4f6
test_suite suite now runs. Still has a few failing tests from the fixture test case.
2010-09-24 23:30:02 -04:00
mark_story
32dc4aac7b
Fixing usage of mb_internal_encoding so it doesn't bone group tests.
2010-09-24 23:30:02 -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
José Lorenzo Rodríguez
e89860e079
Skiping memcache test if Memcache is not installed
2010-09-24 23:30:01 -04:00
mark_story
53086635b3
Adding CakeRequest and CakeResponse to the routing group.
...
Making more tests not fail in cli.
2010-09-24 23:30:01 -04:00
José Lorenzo Rodríguez
0a1bc06843
Skiping ApcCache test if APC is not installed
2010-09-24 23:30:01 -04:00
mark_story
b52f78297f
Removing dependencies on AppController because it can be a bit crazy.
...
Uncommenting more groups from the AllTests.
2010-09-24 23:30:01 -04:00
mark_story
e6824e6a41
Fixing duplicate class names.
2010-09-24 23:30:01 -04:00
mark_story
973841a264
Fixing issues in tests that caused group test to fail, and removing duplicate environment backup.
2010-09-24 23:30:01 -04:00
mark_story
d64bd2a82c
Making cookie component not send gobs of headers when being tested.
...
Making test case pass in cli.
2010-09-24 23:30:01 -04:00
mark_story
b59033687d
Making private properties and methods protected so they can be manipulated with mocks.
2010-09-24 23:30:00 -04:00
mark_story
c5a47d4daa
Clearing referrer more thoroughly.
2010-09-24 23:30:00 -04:00
mark_story
03d99d43be
Fixing unbalanced ob_start().
...
Removing dead code.
2010-09-24 23:30:00 -04:00
mark_story
92ed1e76da
Fixing file included in all_models.
...
Adding skip as tests fail when classes already exist.
Fixing skip condition to use newer api.
2010-09-24 23:30:00 -04:00
mark_story
78c838bcdd
Fixing failing tests caused by fixture data changes.
2010-09-24 23:30:00 -04:00
mark_story
2385747899
Some more fixes to make tests run better under all tests.
2010-09-24 23:28:49 -04:00
mark_story
76ef390d4a
Updating CakeSchema test case to run in suites. It did not account for additional tables being in the database when it ran.
2010-09-24 23:28:48 -04:00
mark_story
7202a5e398
Starting something that will hopefully become a real All Tests.
2010-09-24 23:28:48 -04:00
mark_story
326ae9755f
Updating debugger and error_handler tests to remove errors in CLI.
2010-09-24 23:28:48 -04:00
mark_story
98d1272374
Some fixes to make the test more reliable.
2010-09-24 23:28:48 -04:00
mark_story
d0028bf971
Fixing issue in HtmlHelper test where test files would be left behind.
2010-09-24 23:28:48 -04:00
mark_story
c9a6eba000
Fixing scaffold test so all_controllers suite runs in cli.
2010-09-24 23:28:48 -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