Commit graph

105 commits

Author SHA1 Message Date
ADmad
d466e00644 Merge branch 'master' into 2.5
Conflicts:
	lib/Cake/Model/Datasource/DboSource.php
	lib/Cake/Test/Case/Model/Datasource/Database/MysqlTest.php
	lib/Cake/Utility/Folder.php
	lib/Cake/VERSION.txt
2014-05-04 14:35:36 +05:30
euromark
7a287a6942 More coding standard corrections. 2014-04-29 14:19:33 +02:00
Jose Lorenzo Rodriguez
343d3279b9 Merge branch 'master' into 2.5
Conflicts:
	lib/Cake/Test/Case/Utility/FileTest.php
	lib/Cake/VERSION.txt
2014-04-06 21:50:41 +02:00
euromark
0d09a54033 more missing doc block tags added 2014-04-02 03:02:37 +02:00
mark_story
8acb75425d Merge branch 'master' into 2.5
Conflicts:
	CONTRIBUTING.md
	lib/Cake/Model/Datasource/DboSource.php
2014-03-21 22:55:28 -04:00
mark_story
af68f61e7a Make assertTags() run much faster.
Generating the various permutations a priori is incredibly expensive
with sets of attributes. Using nested loops that look for matches is
more efficient.

Add replacments for `.*` and `.+` in preg:/ prefixed attribute matchers
so they do not greedily eat all content. This also requires that preg:/
based attribute matchers *must* be quoted.

Fixes #3072
2014-03-21 22:52:52 -04:00
mark_story
75dd2ff1fb Merge branch 'master' into 2.5 2014-01-16 15:20:40 -05:00
euromark
ecfd64c082 adding test 2014-01-06 21:07:00 +01:00
Stephen Young
8645e05ab1 Removed leading underscores from ReflectionProperty variables in test case 2013-12-07 12:10:03 -05:00
Stephen Young
f0036b3ebc CakeFixtureManager::load now calls CakeTestFixture::truncate 2013-12-07 09:47:06 -05: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
mark_story
53d265cfba Merge branch 'master' into 2.4 2013-08-23 12:56:43 -04:00
euromark
036954b52d remove duplicate newlines according to CS 2013-08-20 20:27:06 +02: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
José Lorenzo Rodríguez
a54c92fc0f Merge pull request #1475 from cakephp/feature/2.4-mock-app-model
Make mocking random models easier
2013-08-05 00:22:53 -07:00
AD7six
ff856b7ebb bark if the model doesn't exist
Getting the following warning:

    ReflectionException: Class Mock_Foo_e187b1d1 does not have a
constructor, so you cannot pass any constructor arguments

Is a much less obvious way of saying "the class you're trying to mock
doesn't exist". Be more explicit
2013-08-03 16:00:34 +00:00
AD7six
35b4ac0286 make it possible to run this test on its own
Without setting up paths to the test_app - two of the tests will fail

Verify/demonstrate how to mock a model without a model existing
2013-08-03 16:00:04 +00:00
Marc Würth
1cac1846a3 Added missing calls to setUp & tearDown in tests 2013-07-29 01:52:39 +02:00
euromark
a643295e4c remove @access and unnecessary $name 2013-07-08 15:50:50 +02:00
Marc Würth
2609016dfe Changed http links to lighthouse, groups.google and github to https
Because they get redirected anyway and we should follow good practices.
Also in many cases similar URLs were already using https
2013-06-25 22:58:30 +02:00
mark_story
be2a252345 Fix coding standards. 2013-05-31 10:37:20 -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
Marc Würth
2bbd391972 Synced PHP version annotations
CakePHP seems to be just "PHP 5" as opposed to the PEAR header comment standard "PHP version 5"
http://pear.php.net/manual/en/standards.header.php
2013-05-29 20:19:14 +02:00
mark_story
a7708c914f Remove test case that is no longer useful.
It is impossible for the current test to ever fail in the test suite, as
PHPUnit will always be loaded.
2013-03-22 21:36:11 -04:00
Ceeram
99fba8c601 more coding standards fixes, minor rectaoring of testcase 2013-03-18 11:38:50 +01:00
Ceeram
89100f9476 fix coding standards 2013-03-18 11:12:28 +01:00
Mark Story
6d301394f4 Merge pull request #1183 from cincodenada/patch-1
Fix bug where differing key-ordering in fixtures causes errors.

When a fixtures first and last records differed data should be
inserted correctly.
2013-03-14 17:52:06 -07:00
Joel Bradshaw
9d7148e16f Restructuring Strings test so that it is compatible with this change 2013-03-14 14:51:54 -07:00
pjskeptic
9b9cf3d165 Fixed code formatting. 2013-03-13 12:18:32 -04:00
pjskeptic
294dff7a26 Added test for CakeTestSuiteDispatcher::loadTestFramework. 2013-03-13 10:13:48 -04:00
pjskeptic
b17d8c9124 Added test for CakeTestSuiteDispatcher::loadTestFramework. 2013-03-12 23:34:30 -04:00
Graham Weldon
26a08c6780 Updated copyright 2013-02-08 21:28:17 +09: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
Ceeram
16be9d4990 remove unused local vars 2013-01-23 17:22:06 +01:00
euromark
b811afbc44 double spaces to single ones 2012-12-22 23:48:15 +01:00
Ceeram
eadc3a75e5 fix coding standards 2012-11-21 15:39:03 +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
dogmatic69
4899b5b91b changing is_writeable() to is_writable() 2012-09-15 11:17:35 +01:00
euromark
3945c0e6a8 rtim files 2012-07-18 03:55:29 +02: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
mark_story
4ffca8457e Fix coding standards. 2012-04-24 20:09:39 -04:00
Till Claassen
3f7e2f536f CakeTestSuite::addTestDirectory() ignore non-php
CakeTestSuite::addTestDirectory() and addTestDirectoryRecursive()
now ignore any files that do not end in .php

This avoids any stray non-php files being parsed, especially
tilde-style backup files that end in .php~

Improves #2031

Signed-off-by: mark_story <mark@mark-story.com>
2012-04-23 12:15:29 -04:00
mark_story
c6d62884c1 Fix whitespace errors. 2012-04-08 20:40:30 -04:00
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
Kyle Robinson Young
90e7afbdc7 Correct parameter order of assertEquals and assertNotEquals 2012-03-22 23:37:12 -07:00
mark_story
7798914676 Fix most code standards errors in Case/TestSuite. 2012-03-18 17:31:53 -04:00