mark_story
ce5d64b083
Remove whitespace.
2016-04-19 15:27:30 -04:00
felixmaier1989
b081ef5a38
Mock CakeResponse
...
Ability to set the class name to use for mocking the response object
2016-04-19 14:50:40 +07:00
mark_story
c6db76d044
Instead of wiping the Router, just clear requests.
...
Clearing the router also removes routes which can cause assertions to
fail. By just removing the stored requests we avoid the error reported
in #8480 and not break as many tests.
2016-03-20 11:10:34 -04:00
mark_story
7ceb0993bf
Clear the router state after testAction().
...
When using array urls, internal state in the Router would cause requests
to be incorrectly handled causing multiple testAction calls in a single
test to fail. By reloading the router we start off with a clean slate
each time.
Refs #8480
2016-03-19 12:16:21 -04:00
Gareth Ellis
af487e7f89
Fix spacing
2016-01-05 16:39:07 +00:00
Gareth Ellis
54b4170022
Add doc block for testAction magic method to enable IDE autocompletion in test classes
2016-01-05 11:57:40 +00:00
Marc Würth
1ede742d92
Various improvements to the CakePHP test files
...
Mostly CS, doc blocks and unused variables.
2015-09-25 17:22:00 +02:00
mark_story
096a2ebb72
Merge branch '2.6' into 2.7
...
Conflicts:
lib/Cake/Test/Case/TestSuite/ControllerTestCaseTest.php
lib/Cake/VERSION.txt
2015-04-20 15:42:54 -04:00
mark_story
5f2aa4c307
Fix errors when testing controllers that use file()
...
Fix errors related to ob_end_clean() closing PHPUnit's output buffer
when testing controller methods that use response->file().
2015-04-09 20:38:37 -04:00
euromark
22a4a2f5de
Correct argument. Should not have a default string.
2014-12-23 15:36:25 +01:00
euromark
d089341ee7
Wording.
2014-12-23 13:46:55 +01:00
euromark
53f1390b7d
Backport array support for testAction()
2014-12-23 13:42:21 +01:00
Marc Würth
e778b5dce2
Corrected/Improved DocBlock
2014-12-19 18:20:48 +01:00
Guy Warner
327fcb4846
Fix some missed doc block issues
2014-11-30 14:50:11 -07:00
Guy Warner
fb61d9393b
Add @trigger doc blocks of methods triggering CakeEvent
2014-11-30 14:45:40 -07:00
euromark
974ca851c2
Correct doc blocks according to cs guidelines.
...
Remove superfluous empty lines.
2014-07-03 15:36:42 +02:00
mark_story
ab5da2a09f
Fix the test suite package doc block errors.
2014-06-05 00:24:01 -04:00
euromark
0ece694a75
microptimize options and default merge and other string key array merges
2014-04-08 01:25:14 +02:00
euromark
bbe3b6a439
more cs
2014-04-02 03:09:42 +02:00
euromark
97c148a170
Correct typo
2014-03-19 12:47:31 +01:00
Marc Würth
7cfa0116f4
Removed "PHP 5" from file header DocBlocks
...
This statement does not serve a purpose anymore.
In a long forgotten world it indicated the main version number of PHP which the code in the file was compatible to.
http://pear.php.net/manual/en/standards.sample.php
But since PHP 5.1 and later this is only marginally true.
Thus I propose to remove it from CakePHP.
2013-11-13 22:58:39 +01:00
AD7six
09cf69c452
Pass Controller:$components config to mocked components
...
Otherwise there can be significant differences in behavior between using
an unmodifiedcomponent in testAction and using a mock as the config will not be
propogated from the controller
2013-08-19 10:33:16 +00:00
mark_story
95b74bd9ef
Make sure ComponentCollection has the controller dependency.
...
Add setter method as changing ComponentCollection's constructor now is
not possible. This fixes issues where components that rely on
Collection->getController() in their constructor can work properly.
Fixes #3946
2013-07-30 09:09:52 -04:00
Marc Würth
4c9f0414cb
Improved the DocBlocks and other code cleanup
...
Fixed @license tag, url comes first
Whitespace and other minor code cleanup
Added some docblocks
2013-05-31 00:11:19 +02:00
mark_story
82d57fb8b2
Add mocked components to the enable list of components.
...
Mocked components should be enabled so they receive callbacks. This
allows more realistic integration tests using testAction(). Stop
disabling the constructor as it causes a number of errors with
components that use components.
Fixes #3842
2013-05-20 22:22:22 -04:00
mark_story
9cdc3927f2
Tidy up variable names.
...
Variables with _ in them are confusing, try to use clearer names.
2013-05-20 21:52:08 -04:00
euromark
111366d5c8
== to === and != to !== where applicable
2013-02-12 03:38:08 +01:00
Graham Weldon
66d856d883
Added extra line for referencing license file for copyright
2013-02-08 21:22:51 +09:00
Graham Weldon
7b860debe4
This commit is dedicated to Mark Story, who has put in much dedicated time and effort into CakePHP over the years.
...
I just wanted to ruin his evening, because this change needs to be merged into CakePHP 3.0.
2013-02-08 20:59:49 +09:00
euromark
b811afbc44
double spaces to single ones
2012-12-22 23:48:15 +01:00
José Lorenzo Rodríguez
a8bd7c6678
Merge pull request #961 from dereuromark/2.3-unify-object-collection
...
2.3 unify object collection
2012-12-22 14:24:26 -08:00
ADmad
72d6ca636f
Docblock fixes
2012-11-29 04:36:29 +05:30
mark_story
27d7e2865e
Merge branch 'master' into 2.3
...
Conflicts:
lib/Cake/Console/Command/ConsoleShell.php
lib/Cake/Network/CakeSocket.php
lib/Cake/Network/Http/HttpResponse.php
lib/Cake/Utility/Folder.php
lib/Cake/View/MediaView.php
lib/Cake/basics.php
2012-11-20 23:02:33 -05:00
euromark
8acdb129b2
unify object load/unload and loaded methods
2012-11-16 12:14:28 +01:00
Ceeram
56225bcca3
fix all warnings except TODO warnings
2012-11-14 12:56:10 +01:00
Reuben Helms
4d87abfcdc
Add CakeTestCase::getMockForModel convenience method
...
This method provides a convenience to create mocked models that
are still associated with fixtures and the datasource.
2012-11-13 13:07:18 +10:00
mark_story
00f3e7e441
Fix silent failures.
...
Fixes #3133
2012-08-20 16:19:34 -04:00
mark_story
4541510e26
Fix notice error when a missing action error is hit.
2012-07-29 22:37:41 -04:00
mark_story
7b5e45b965
Merge branch '2.1' into 2.2
...
Conflicts:
lib/Cake/Model/Datasource/DataSource.php
lib/Cake/VERSION.txt
2012-05-03 21:06:35 -04:00
mark_story
004bc5b6e7
Fix overwriting of GET/POST
...
ControllerTestCase was overwriting GET and POST and not
restoring them at the end of testAction.
Fixes #2841
2012-04-30 20:36:19 -04:00
Jose Lorenzo Rodriguez
bf0f5ab118
Merge remote-tracking branch 'origin/2.1' into 2.2
2012-04-29 20:05:39 -04:30
Kyle Robinson Young
b8488b8dfe
Update 1.x @link in docblocks
2012-04-26 19:49:18 -07:00
Jose Lorenzo Rodriguez
f574e9644d
Fixed failing test case
2012-04-15 12:51:33 -04:30
Jose Lorenzo Rodriguez
16bde9c723
Making sure components in controller test cases always have a fresh reference to the request object, fixes #2705
2012-03-24 14:34:29 -04:30
Juan Basso
3b1bd90ad6
Updated copyright to 2012.
2012-03-12 22:46:07 -04:00
mark_story
c2f42343a3
Fix most coding standards issues in TestSuite/
2012-03-04 21:51:50 -05:00
Kyle Robinson Young
45ec5d73c5
Add missing visibility keywords
2012-02-16 23:13:12 -08:00
mark_story
0607437abd
Fix various failing tests.
2011-12-17 23:50:41 -05:00
Kyle Robinson Young
096ff76295
Fix overreaching Inflector when ControllerTestCase autoMocks
2011-12-12 10:29:33 -08:00
Kyle Robinson Young
4174ddff0f
Always set ControllerTestCase::testAction result variables
2011-12-02 06:19:15 -08:00