Cauan Cabral
099ca310e2
Ensure $sources is Array before use
2013-01-11 10:14:05 -03:00
mark_story
d0d13acaf4
Merge branch 'master' into 2.3
2013-01-08 20:15:46 -05:00
mark_story
ac1f64abc9
Start and end transactions on the fixtures datasource.
...
Fixes #3490
2013-01-05 14:50:09 -05:00
mark_story
659715664d
Check for the methods that will be called.
...
Check the same methods that are called. Without this diffs are not
printed for failures.
Fixes #3503
2013-01-01 14:25:34 -05:00
Gregory Gaskill
b6b40b1196
Updating version number in test suite header.
2012-12-30 13:50:05 -08:00
Jose Lorenzo Rodriguez
f25f35353d
Making getMockForModel actually useful
2012-12-23 00:30:27 +01: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
euromark
881127ef4d
unify new lines at the end of the file
2012-12-05 15:00:24 +01:00
ADmad
72d6ca636f
Docblock fixes
2012-11-29 04:36:29 +05:30
Ceeram
eadc3a75e5
fix coding standards
2012-11-21 15:39:03 +01:00
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
e02eab05d5
Remove all todo from core, create tickets for them
2012-11-14 14:59:51 +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
e0aab77dab
Merge branch 'master' into 2.3
...
Conflicts:
app/Config/Schema/i18n.php
lib/Cake/I18n/Multibyte.php
lib/Cake/Test/Case/Log/CakeLogTest.php
lib/Cake/Test/Case/Routing/DispatcherTest.php
2012-11-10 21:33:26 -05:00
Ceeram
aaf2d2ef71
fix remaining cs errors
2012-11-04 13:56:13 +01:00
dogmatic69
641ba9f3e6
Merge branch '2.3' into type-checks
...
Conflicts:
lib/Cake/Error/ExceptionRenderer.php
lib/Cake/Routing/Dispatcher.php
2012-10-24 19:03:44 +01:00
mark_story
1aea9ac0c9
Merge branch 'master' into 2.3
...
Conflicts:
lib/Cake/Event/CakeEventManager.php
lib/Cake/VERSION.txt
lib/Cake/View/ViewBlock.php
2012-10-15 21:46:49 -04:00
Adam Taylor
4090c2e932
Remove trailing whitespace from comments
...
See http://groups.google.com/d/topic/cakephp-core/fuHTYMKVJno/discussion
2012-10-15 18:19:37 -06:00
mark_story
2a803ea412
Add missing import
...
Refs GH-877
2012-10-14 22:22:46 -04:00
Graham Weldon
41ae19b5bc
Removed spaces at the end of lines.
2012-10-15 11:44:31 +11:00
mark_story
9a66768aa4
Merge branch 'master' into 2.3
2012-10-08 13:08:58 -04:00
mark_story
972d5752bf
Improve error message.
...
Fixture datasources must begin with test so you don't accidentally use
a real datasource.
Fixes #3254
2012-10-04 20:41:02 -04:00
dogmatic69
408e619c9f
Merge branch '2.3' into type-checks
...
Conflicts:
lib/Cake/Console/Command/Task/ModelTask.php
lib/Cake/Controller/Component/RequestHandlerComponent.php
lib/Cake/Model/Datasource/Database/Mysql.php
lib/Cake/Utility/CakeNumber.php
2012-10-01 02:08:00 +01:00
mark_story
a1838a0c85
Implement missing bits for automatic sequence resetting.
...
Refs #3206
2012-09-18 14:12:23 -04:00
dogmatic69
22a2e1b51e
converting $foo == / $foo == 0 to !$foo (and a few $foo === 0)
2012-09-14 18:42:25 +01:00
dogmatic69
cf8fccae96
converting $foo == null / $foo == false to !$foo
2012-09-14 18:26:30 +01:00
mark_story
728300786b
Merge branch 'master' into 2.3
2012-08-30 19:43:11 +01:00
mark_story
988a847f49
Fix unescaped entities.
2012-08-27 14:48:07 -04:00
mark_story
d5333a2ff1
Merge branch 'master' into 2.3
2012-08-20 16:20:27 -04:00
mark_story
00f3e7e441
Fix silent failures.
...
Fixes #3133
2012-08-20 16:19:34 -04:00
mark_story
e59555a66f
Merge branch 'master' into 2.3
2012-08-03 22:45:56 -04:00
mark_story
4541510e26
Fix notice error when a missing action error is hit.
2012-07-29 22:37:41 -04:00
euromark
2a553dcfd1
unified doctype for browser related layout templates
2012-07-24 18:06:39 +02:00
euromark
6557e3bafe
only try to get comparison failure for the appropriate object
2012-07-21 15:23:54 +02:00
mark_story
3c6b50953b
Merge branch 'master' into 2.3
...
Conflicts:
lib/Cake/VERSION.txt
2012-07-18 22:12:51 -04:00
mark_story
3b46cd43f1
Add logging and error when fixture creation fails.
...
This helps people find and solve issues faster/easier.
Fixes #3044
2012-07-17 22:48:50 -04:00
euromark
3945c0e6a8
rtim files
2012-07-18 03:55:29 +02:00
mark_story
46f8de72a2
Fix web runner showing fails as passes when show_passes is on.
...
Fixes #3035
2012-07-13 22:58:07 -04:00
Jose Lorenzo Rodriguez
ec7ec73b66
Merge branch '2.1' into 2.2
2012-07-01 17:35:24 -04:30
mark_story
87677e4cdf
Fix possible notice errors.
2012-06-26 23:31:22 -04:00
Alberto Leal
7d93c57bd3
Use the diff style provided by PHPUnit in the webrunner.
...
Displaying actual vs expected messages when the result is an array or string.
Fixes #GH-699
2012-06-26 19:53:49 -04:00
mark_story
503bc06c70
Mark fixtures as created if they exist.
...
Fixes #2905
2012-06-24 12:57:54 -04:00
mark_story
81611956f5
Update doc blocks.
...
Add missing @throws
2012-06-18 23:29:28 -04:00
AD7six
a6954a7abc
Bark if a fixture file is missing
...
A missing fixture file would previously be silently ignored
2012-06-18 15:28:00 +02:00
mark_story
7ef83b89f5
Merge branch '2.1' into 2.2
...
h origin especially if it merges an updated upstream into a topic branch.
2012-06-17 20:54:59 -04:00
Nick Baker
ae990cc0c6
Code cleanup, break if found, no reason to go through entire vendor list overwriting if found on first try. No reason to create variables we don't need.
2012-06-11 12:40:53 -06:00
Nick Baker
42809512f0
No longer suppress the include path to PHPUnit/Autoload.php as Autoload.php require_once() on two files, if either of them aren't there the shell exits without message. Explanation of issue here: http://www.webtechnick.com/wtn/blogs/view/247/Fixing_PHPUnit_for_CakePHP_2_x_testing_on_Mac_OS_X
2012-06-11 12:22:26 -06:00
mark_story
6725a30fe2
Fix funny warning.
2012-05-23 22:46:18 -04:00
Jelle Henkens
f7ce5262b7
Updating mixed @param documentation to seperate list of accepted types
2012-05-21 21:55:10 +01:00
mark_story
ad31caeb0e
Merge branch '2.1' into 2.2
2012-05-20 14:53:41 -04:00
Kyle Robinson Young
3f7cbf561b
Update PHPUnit install instructions
2012-05-19 22:06:45 -07:00
Jelle Henkens
97ebbc8e23
Fixing coding conventions
2012-05-19 16:08:40 +01:00
AD7six
ef9c5bc004
ClassRegistry::getDataSource doesn't exist
2012-05-04 20:15:04 +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
Juan Basso
333ea29805
Renamed variable name from nested transaction
2012-04-26 20:58:25 -04:00
Juan Basso
12392b6285
Fixed variable name.
2012-04-24 20:03:43 -04:00
Juan Basso
4e480eaca5
Disabling nested transaction for fixtures.
2012-04-24 20:01:22 -04:00
Juan Basso
b95f367bef
Disabled nested transactions for fixtures.
2012-04-24 00:34:28 -04:00
mark_story
b6de177ffa
Merge branch '2.1' into 2.2
2012-04-23 21:50:36 -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
Ceeram
74ee75b0ef
Merge branch '2.1' into 2.2
2012-04-23 10:34:04 +02:00
Jose Lorenzo Rodriguez
8465538800
Merge branch '2.2-middleware' into 2.2
2012-04-22 17:17:36 -04:30
Ceeram
f0bd7386e2
created, modified and updated fields now use static timestamp in testcases
2012-04-21 17:38:49 +02:00
mark_story
dec67ef259
Add proper charset to web test runner.
...
Fixes #2804
2012-04-18 22:45:55 -04:00
mark_story
8639d5af84
Fix mistakes.
2012-04-15 22:54:13 -04:00
mark_story
72c3059d94
Add missing parent calls.
...
Fixes piles of failing tests.
2012-04-15 22:20:34 -04:00
Jose Lorenzo Rodriguez
f574e9644d
Fixed failing test case
2012-04-15 12:51:33 -04:30
mark_story
9fbd57331f
Clear configure at the end of each test.
...
Fixes #2767
2012-04-14 23:33:08 -04:00
mark_story
9f9feec222
Merge branch '2.2-hash' into 2.2
...
Conflicts:
lib/Cake/Test/Case/Model/Datasource/DboSourceTest.php
lib/Cake/View/Helper/FormHelper.php
2012-04-10 21:32:37 -04:00
mark_story
4eea72205b
Merge branch '2.1' into 2.2
2012-04-06 21:34:11 -04:00
mark_story
790d9beeb7
Always reconfigure global state.
...
Fixes issues wher the test suite with no fixtures could hit
a non test connection.
Fixes #2743
2012-04-06 20:27:56 -04:00
Kyle Robinson Young
c700fedbf8
Update test suite header version to 2.2
...
Conflicts:
lib/Cake/TestSuite/templates/header.php
2012-03-27 19:52:58 -04:00
mark_story
ed32e0b39b
Update another usage.
2012-03-26 22:32:56 -04:00
Jose Lorenzo Rodriguez
b373309ba9
Merge branch '2.1' into 2.2
...
Conflicts:
lib/Cake/VERSION.txt
2012-03-25 21:18:58 -04:30
Kyle Robinson Young
a905954484
Update test suite header version to 2.1
2012-03-25 10:36:30 -07: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
Thomas Ploch
b28b25f642
Added 'Fixed whitespace.
2012-03-18 11:12:19 +01:00
Thomas Ploch
7cfcef54ed
Added 'Enable Debug Output' link to CakeHtmlReporter.
2012-03-18 11:10:12 +01:00
Juan Basso
c754fb2dcb
Updated copyright to 2012.
2012-03-12 22:46:46 -04:00
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
euromark
e94d307ee1
code conventions
2012-02-25 19:46:05 -05:00
Mark Story
c2d753ffb4
Merge pull request #500 from shama/patch-visibility
...
Add missing visibility keywords
2012-02-21 17:36:36 -08:00
Kyle Robinson Young
45ec5d73c5
Add missing visibility keywords
2012-02-16 23:13:12 -08:00
euromark
77624552eb
added missing assertText methods to assert cross OS
2012-02-17 23:36:57 +01:00
Kyle Robinson Young
2d43f1873c
Fix docblock of CakeFixtureManager::loadSingle()
2012-02-16 21:45:37 -08:00
mark_story
bd0104d972
Add methods to CakeTestCase
...
Add assertTextEquals, and assertTextNotEquals for doing
platform independant text comparisons.
Refs #2148
2012-01-24 21:08:56 -05:00
Jose Lorenzo Rodriguez
b9ad469a65
Merge remote-tracking branch 'origin/2.0' into 2.1
2012-01-22 15:52:54 -04:30
mark_story
bc689151a4
Add note about PHP's include_path.
...
Refs #2497
2012-01-21 10:23:25 -05:00
ADmad
bcab3d0cb9
Made default value and behavior of param $exceptions
for Folder::tree() identical to same param in Folder::read()
2011-12-22 03:29:21 +05:30
ADmad
389072708a
Merge branch '2.0' into 2.1
...
Conflicts:
lib/Cake/Test/Case/Model/ModelReadTest.php
lib/Cake/Utility/Debugger.php
2011-12-22 03:15:04 +05:30
euromark
a41539dfa4
Indentation fix (tab instead of spaces)
...
Fixes #2398
Conflicts:
lib/Cake/Test/Case/Console/Command/ShellTest.php
Signed-off-by: mark_story <mark@mark-story.com>
2011-12-20 22:26:43 -05:00
mark_story
c8fd7c090b
Make App test cases the default.
...
Fixes #2372
2011-12-19 23:13:46 -05:00
mark_story
0607437abd
Fix various failing tests.
2011-12-17 23:50:41 -05:00
Kyle Robinson Young
51f9837db4
Code standards formatting
2011-12-15 22:52:07 -08:00
Mark Story
4ed2185876
Merge pull request #379 from shama/patch-code-formatting
...
Patch code formatting
2011-12-15 05:44:17 -08:00
Kyle Robinson Young
54ed278284
Code formatting
2011-12-14 22:54:03 -08:00
Kyle Robinson Young
b3396538b7
Add debug flag to flush output
2011-12-14 22:48:41 -08:00
mark_story
07a2a60468
Merge branch '2.0' into 2.1
2011-12-13 22:03:40 -05:00
Kyle Robinson Young
096ff76295
Fix overreaching Inflector when ControllerTestCase autoMocks
2011-12-12 10:29:33 -08:00
mark_story
2e8498e166
Merge branch '2.0' into 2.1
...
Conflicts:
lib/Cake/Model/Datasource/Database/Postgres.php
lib/Cake/Test/Case/Console/TaskCollectionTest.php
lib/Cake/Test/Case/Model/ModelIntegrationTest.php
lib/Cake/Test/Case/Utility/ClassRegistryTest.php
lib/Cake/Utility/ClassRegistry.php
2011-12-11 22:51:40 -05:00
Kyle Robinson Young
17fcd0534f
Fix spacing for coding standards
2011-12-10 09:06:59 -08:00
Kyle Robinson Young
7fa1984a43
Add tests for CakeTestSuite and dont include hidden folders when recursively addTestFile
2011-12-09 23:27:17 -08:00
Kyle Robinson Young
c836ba08a3
Add/move docblocks to make text available in the API docs
2011-12-08 07:35:02 -08:00
Kyle Robinson Young
1e1c7a036d
Code consistency formatting tweaks
2011-12-06 12:52:48 -08:00
m
73de68f5f4
Test suite should display current PHPUnit version.
...
Fixes #2316
2011-12-03 13:47:40 -05:00
mark_story
6d269ce25d
Merge branch '2.0' into 2.1
...
Conflicts:
lib/Cake/Config/config.php
lib/Cake/Console/Command/Task/ModelTask.php
lib/Cake/Console/Command/TestsuiteShell.php
lib/Cake/Model/CakeSchema.php
lib/Cake/Model/Datasource/Database/Sqlite.php
lib/Cake/Test/Case/Model/ModelTestBase.php
lib/Cake/Test/Case/Routing/DispatcherTest.php
lib/Cake/Test/Case/Utility/FileTest.php
lib/Cake/VERSION.txt
2011-12-03 13:45:28 -05:00
Kyle Robinson Young
4174ddff0f
Always set ControllerTestCase::testAction result variables
2011-12-02 06:19:15 -08:00
Kyle Robinson Young
8197f87dbc
Spelling and grammar fixes
2011-12-01 21:58:09 -08:00
Kyle Robinson Young
5876744709
Adhering to coding standards
2011-11-30 07:44:11 -08:00
Rachman Chavik
144b556d1f
Adding new property Model::schemaName
...
Just like physical table name, the schema name is an important information
that should be available in models. The property will be populated accordingly
by the model's datasource.
2011-11-25 22:29:23 +07:00
Ceeram
c12c853f10
moving order for finds from constructor to beforeFind
2011-11-24 22:12:39 +01:00
Ceeram
07d1621bc5
fixing CakeTestModel constructor of previous commit, cleaning up after schema() call
2011-11-23 01:32:27 +01:00
Ceeram
05940ae1ec
adding default order on id to CakeTestModel, to ensure correct order. Postgres can return results in any order it considers appropriate if none specified
2011-11-22 21:50:17 +01:00
Rachman Chavik
aab8e98531
Configure ClassRegistry in test mode
...
CR::config accepts 'testing' key to indicate a test run.
When this flag is set, CR::init() will use 'test' datasource,
or append 'test_' prefix to a model's useDbConfig value if
the datasource configured.
2011-11-17 11:31:36 +07:00
Rachman Chavik
a5ac328a71
Adding multidb fixture support
...
CakeTestFixture now has a $useDbConfig property, that is similar
to Model::useDbConfig. CakeFixtureManager now uses this property
to decide which connection to use. CakeTestFixture::$created
records datasources it was created on.
2011-11-17 11:24:45 +07:00
mark_story
5934a7a324
Fix html coverage reporting.
...
HTML coverage reports now work with PHPUnit 3.6
Fixes #2235
2011-11-11 22:13:20 -05:00
mark_story
493ce3a442
Fix issue where REST actions were not easily testable.
...
Fixes #2198
2011-11-11 21:28:33 -05:00
mark_story
3e54ffd8c1
Defaulting autoMock to true.
...
This fixes issues with mock controllers being discarded after use.
Not always mocking controllers causes issues with using redirect().
Fixes #2200
2011-11-06 09:36:35 -05:00
mark_story
c2eae6caf8
Nerfing coverage generation with PHPUnit3.6 for now.
...
PHPUnit3.6 totally changed how coverage data can be accessed, its going
to take some time to update things. This is a quick work around until
more time can be dedicated to fixing it.
2011-11-05 17:46:59 -04:00
mark_story
ad237ec681
Don't collect code coverage on every request.
2011-11-05 17:29:55 -04:00
mark_story
13900dc75c
Starting to fix issues with PHPUnit 3.6 compatibility.
2011-11-04 22:54:08 -04:00
Jose Lorenzo Rodriguez
3fc6d293fc
Fixing regression in ControllerTestCase after changes done in RequestHandlerComponent
2011-11-01 13:49:40 -04:30
Gun.io Whitespace Robot
4742168253
Remove whitespace [Gun.io WhitespaceBot]
2011-10-28 18:25:08 -04:00
m
010abd9e18
Inheritance fix for CakeTestCase
...
Fix overriden methods to be static like other methods in
PHPUnit_Framework_Assert.
Fixes #2170
Signed-off-by: mark_story <mark@mark-story.com>
2011-10-26 20:28:42 -04:00
m
dcc17f2091
ucfirst object names part two (Folder/File)
...
Signed-off-by: mark_story <mark@mark-story.com>
2011-10-24 21:36:48 -04:00
mark_story
c5ca10ca69
Remove controller reuse between testAction() calls.
...
Reusing controllers between various testAction calls would
mean that calls that needed to render views, would break on the
second call to testAction(). Controllers are rebuilt for each testAction()
call now.
Fixes #2142
2011-10-22 10:58:21 -04:00
Rachman Chavik
2bb93761cc
fixing typos
2011-10-19 12:19:28 +07:00
mark_story
1d8199b86d
Update the PHPUnit install instructions.
...
Fixes #2106
2011-10-17 09:36:47 -04:00
Renan Gonçalves
573a349209
Using plugin name on exception thrown and in templates files.
2011-10-16 13:40:36 +02:00
Renan Gonçalves
1cf67b1e55
Little cleanup in exceptions.
...
- Removed duplicated or non-used exceptions.
- Making the error messages more descriptive and stardard.
2011-10-15 20:08:02 +02:00
mark_story
b261024111
Make fixtures disable source caching.
...
Disabling source caching when using fixtures fixes
issues with test suites. Testsuites could previously have
test order errors caused by differences in cached and un-cached sources listings.
Fixes #1942
2011-10-11 22:10:09 -04:00
Jose Lorenzo Rodriguez
705593908b
Fixing some @package declarations
2011-09-30 13:17:12 -04:30
Jose Lorenzo Rodriguez
fff42e92ed
Adding a few class loading related changes to make the ApiGenerator plugin happy
2011-09-30 01:55:33 -04:30
mark_story
6e22f1d0a8
Excluding hidden files from test directory adding.
...
Fixes #2031
2011-09-27 20:43:47 -04:00
mark_story
9b8c280492
Updating doc blocks.
2011-09-12 23:00:56 -04:00
Jose Lorenzo Rodriguez
8897335af4
All tests passing on postgres
2011-09-03 18:58:53 -04:30
Mark Story mark@mark-story.com
6f8869631f
Fixing issue where divide by 0 errors would crop up on empty files.
2011-09-01 20:33:09 +01:00
Mark Story mark@mark-story.com
36eca679fe
Adding an isset so a non-existant view isn't accessed.
...
Fixes #1954
2011-09-01 17:55:42 +01:00
Mark Story mark@mark-story.com
3a8b344208
Fixing issue where CakeTestCase would erase custom bootstrapped paths in tearDown().
...
Adding App::paths() to simplify getting all the paths App knows about.
Fixes #1934
2011-08-29 22:14:18 -04:00
Jose Lorenzo Rodriguez
0e85170f28
Merge branch '2.0' of github.com:cakephp/cakephp into 2.0
2011-08-29 16:55:27 -04:30
Jose Lorenzo Rodriguez
40ba4005bd
Affecting the REQUEST_METHOD env variable in order to ease controller testing with different http verbs
2011-08-29 16:54:22 -04:30
mark_story
02a6883b22
Using Folder class in CakeTestSuite, this fixes issues where
...
hidden directories from VCS would be added as test cases.
Fixes #1933
2011-08-27 10:34:08 -04:00
Juan Basso
7d0250ff47
Merge branch '2.0-api-doc' into 2.0
2011-08-26 20:22:26 -04:00
Mark Story
7276f3357d
Fixing issues where ControllerTestCase couldn't properly hit plugin
...
controllers.
Fixing some formatting.
Fixes #1918
2011-08-20 09:58:35 -04:00
Mark Story
70f47378f9
Fixing options[data] always writing its data into $_POST['data'].
...
It now just overwrites $_POST.
Fixes #1917
2011-08-20 09:46:01 -04:00
Juan Basso
f5a54d00dd
Changed methods and attributes from private to protected.
2011-08-20 00:43:34 -04:00
Juan Basso
620a65b2fc
Merge branch '2.0' into 2.0-api-doc
...
Conflicts:
lib/Cake/Test/Case/View/Helper/CacheHelperTest.php
lib/Cake/Utility/Debugger.php
2011-08-14 21:12:05 -04:00
Mark Story
10c78c5420
Fixing bad include on text reporter.
...
Fixing bad includes and updating usage in text coverage reports.
2011-08-06 13:54:02 -04:00
Jose Lorenzo Rodriguez
eaa01634b1
Making ControllerTestCase abstract, that way PHP won't complain about empty test cases, closes #1868
2011-07-30 22:05:17 -04:30
Juan Basso
9bc3e567c1
Removed the @access and @static.
2011-07-30 20:56:48 -04:00
Jose Lorenzo Rodriguez
cfd2d9e00b
Updating all @package annotations in doc blocks
2011-07-26 01:46:14 -04:30
Jose Lorenzo Rodriguez
febf28f34b
Merge remote-tracking branch 'origin/1.3' into 2.0
...
Conflicts:
cake/console/templates/default/views/home.ctp
cake/libs/controller/controller.php
cake/libs/model/datasources/dbo/dbo_mysqli.php
cake/libs/view/pages/home.ctp
cake/tests/cases/libs/view/media.test.php
cake/tests/lib/cake_test_case.php
cake/tests/lib/code_coverage_manager.php
cake/tests/test_app/views/pages/home.ctp
lib/Cake/Cache/Engine/ApcEngine.php
lib/Cake/Model/Datasource/Database/Mysql.php
lib/Cake/View/Helper/FormHelper.php
2011-07-25 14:44:23 -04:30
Jose Lorenzo Rodriguez
d63dde0fde
Ensuring the correct HtmlReporter class is used in the web test runner
2011-07-24 14:01:44 -04:30
mark_story
65d28f4c73
Fixing failing tests for ControllerTestCase.
2011-07-22 20:29:44 -04:00
Mark Story
011d9b4d37
Updating compatibility assertions so they correctly reverse arguments
...
for SimpleTest wrappers.
Reformated doc blocks.
Fixes #1827
2011-07-18 23:17:20 -04:00
hiromi2424
9e79756b1f
fixed unassigned "show passes" parameter for test
2011-07-09 18:40:22 +09:00
Mark Story
0366d8f18a
Changing title CSS for web test runner.
...
Fixes #1752
2011-07-01 23:23:22 -04:00
Mark Story
91a1cf81f3
Merge branch '1.3' into merger
...
Conflicts:
app/Config/acl.ini.php
app/config/database.php.default
app/webroot/css.php
app/webroot/css/cake.generic.css
cake/basics.php
cake/bootstrap.php
cake/config/paths.php
cake/console/cake.php
cake/console/error.php
cake/console/libs/acl.php
cake/console/libs/bake.php
cake/console/libs/i18n.php
cake/console/libs/shell.php
cake/console/libs/tasks/extract.php
cake/console/libs/tasks/plugin.php
cake/console/libs/tasks/project.php
cake/console/libs/testsuite.php
cake/console/templates/default/classes/test.ctp
cake/console/templates/default/views/home.ctp
cake/console/templates/default/views/view.ctp
cake/console/templates/skel/config/database.php.default
cake/console/templates/skel/views/elements/email/text/default.ctp
cake/console/templates/skel/webroot/css.php
cake/dispatcher.php
cake/libs/cache.php
cake/libs/cake_session.php
cake/libs/configure.php
cake/libs/controller/component.php
cake/libs/controller/components/auth.php
cake/libs/controller/components/email.php
cake/libs/controller/components/request_handler.php
cake/libs/controller/components/security.php
cake/libs/controller/controller.php
cake/libs/controller/scaffold.php
cake/libs/error.php
cake/libs/magic_db.php
cake/libs/model/behaviors/acl.php
cake/libs/model/connection_manager.php
cake/libs/model/datasources/dbo/dbo_mysqli.php
cake/libs/model/model_behavior.php
cake/libs/overloadable.php
cake/libs/overloadable_php4.php
cake/libs/overloadable_php5.php
cake/libs/router.php
cake/libs/view/errors/missing_action.ctp
cake/libs/view/errors/missing_behavior_class.ctp
cake/libs/view/errors/missing_behavior_file.ctp
cake/libs/view/errors/missing_component_class.ctp
cake/libs/view/errors/missing_component_file.ctp
cake/libs/view/errors/missing_connection.ctp
cake/libs/view/errors/missing_controller.ctp
cake/libs/view/errors/missing_helper_class.ctp
cake/libs/view/errors/missing_helper_file.ctp
cake/libs/view/errors/missing_layout.ctp
cake/libs/view/errors/missing_model.ctp
cake/libs/view/errors/missing_scaffolddb.ctp
cake/libs/view/errors/missing_table.ctp
cake/libs/view/errors/missing_view.ctp
cake/libs/view/errors/private_action.ctp
cake/libs/view/errors/scaffold_error.ctp
cake/libs/view/helpers/ajax.php
cake/libs/view/helpers/javascript.php
cake/libs/view/helpers/js.php
cake/libs/view/helpers/session.php
cake/libs/view/helpers/xml.php
cake/libs/view/media.php
cake/libs/view/pages/home.ctp
cake/libs/view/scaffolds/edit.ctp
cake/libs/view/scaffolds/index.ctp
cake/libs/view/scaffolds/view.ctp
cake/libs/view/view.php
cake/libs/xml.php
cake/tests/cases/console/cake.test.php
cake/tests/cases/console/libs/acl.test.php
cake/tests/cases/console/libs/api.test.php
cake/tests/cases/console/libs/bake.test.php
cake/tests/cases/console/libs/shell.test.php
cake/tests/cases/console/libs/tasks/controller.test.php
cake/tests/cases/console/libs/tasks/db_config.test.php
cake/tests/cases/console/libs/tasks/fixture.test.php
cake/tests/cases/console/libs/tasks/model.test.php
cake/tests/cases/console/libs/tasks/plugin.test.php
cake/tests/cases/console/libs/tasks/project.test.php
cake/tests/cases/console/libs/tasks/test.test.php
cake/tests/cases/console/libs/tasks/view.test.php
cake/tests/cases/dispatcher.test.php
cake/tests/cases/libs/cache/apc.test.php
cake/tests/cases/libs/cake_session.test.php
cake/tests/cases/libs/cake_test_case.test.php
cake/tests/cases/libs/code_coverage_manager.test.php
cake/tests/cases/libs/configure.test.php
cake/tests/cases/libs/controller/component.test.php
cake/tests/cases/libs/controller/components/auth.test.php
cake/tests/cases/libs/controller/components/cookie.test.php
cake/tests/cases/libs/controller/components/request_handler.test.php
cake/tests/cases/libs/controller/components/session.test.php
cake/tests/cases/libs/controller/controller.test.php
cake/tests/cases/libs/controller/pages_controller.test.php
cake/tests/cases/libs/error.test.php
cake/tests/cases/libs/http_socket.test.php
cake/tests/cases/libs/magic_db.test.php
cake/tests/cases/libs/model/datasources/dbo/dbo_mssql.test.php
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
cake/tests/cases/libs/model/models.php
cake/tests/cases/libs/overloadable.test.php
cake/tests/cases/libs/test_manager.test.php
cake/tests/cases/libs/view/helpers/ajax.test.php
cake/tests/cases/libs/view/helpers/javascript.test.php
cake/tests/cases/libs/view/helpers/session.test.php
cake/tests/cases/libs/view/helpers/xml.test.php
cake/tests/cases/libs/view/media.test.php
cake/tests/cases/libs/view/theme.test.php
cake/tests/cases/libs/xml.test.php
cake/tests/fixtures/aco_fixture.php
cake/tests/fixtures/translate_fixture.php
cake/tests/groups/acl.group.php
cake/tests/groups/bake.group.php
cake/tests/groups/behaviors.group.php
cake/tests/groups/cache.group.php
cake/tests/groups/components.group.php
cake/tests/groups/configure.group.php
cake/tests/groups/console.group.php
cake/tests/groups/controller.group.php
cake/tests/groups/database.group.php
cake/tests/groups/helpers.group.php
cake/tests/groups/i18n.group.php
cake/tests/groups/javascript.group.php
cake/tests/groups/lib.group.php
cake/tests/groups/model.group.php
cake/tests/groups/no_cross_contamination.group.php
cake/tests/groups/routing_system.group.php
cake/tests/groups/socket.group.php
cake/tests/groups/test_suite.group.php
cake/tests/groups/view.group.php
cake/tests/groups/xml.group.php
cake/tests/lib/cake_test_case.php
cake/tests/lib/cake_test_model.php
cake/tests/lib/cake_test_suite_dispatcher.php
cake/tests/lib/cake_web_test_case.php
cake/tests/lib/code_coverage_manager.php
cake/tests/lib/reporter/cake_base_reporter.php
cake/tests/lib/reporter/cake_cli_reporter.php
cake/tests/lib/reporter/cake_text_reporter.php
cake/tests/lib/templates/menu.php
cake/tests/lib/templates/simpletest.php
cake/tests/lib/test_manager.php
cake/tests/test_app/controllers/tests_apps_controller.php
cake/tests/test_app/libs/cache/test_app_cache.php
cake/tests/test_app/libs/library.php
cake/tests/test_app/libs/log/test_app_log.php
cake/tests/test_app/plugins/test_plugin/config/load.php
cake/tests/test_app/plugins/test_plugin/config/more.load.php
cake/tests/test_app/plugins/test_plugin/controllers/components/other_component.php
cake/tests/test_app/plugins/test_plugin/controllers/components/plugins_component.php
cake/tests/test_app/plugins/test_plugin/controllers/components/test_plugin_component.php
cake/tests/test_app/plugins/test_plugin/controllers/components/test_plugin_other_component.php
cake/tests/test_app/plugins/test_plugin/controllers/test_plugin_controller.php
cake/tests/test_app/plugins/test_plugin/controllers/tests_controller.php
cake/tests/test_app/plugins/test_plugin/libs/cache/test_plugin_cache.php
cake/tests/test_app/plugins/test_plugin/libs/log/test_plugin_log.php
cake/tests/test_app/plugins/test_plugin/libs/test_plugin_library.php
cake/tests/test_app/plugins/test_plugin/test_plugin_app_controller.php
cake/tests/test_app/plugins/test_plugin/test_plugin_app_model.php
cake/tests/test_app/plugins/test_plugin/vendors/sample/sample_plugin.php
cake/tests/test_app/plugins/test_plugin/vendors/welcome.php
cake/tests/test_app/plugins/test_plugin/views/helpers/other_helper.php
cake/tests/test_app/plugins/test_plugin/views/helpers/plugged_helper.php
cake/tests/test_app/vendors/Test/MyTest.php
cake/tests/test_app/vendors/Test/hello.php
cake/tests/test_app/vendors/sample/configure_test_vendor_sample.php
cake/tests/test_app/vendors/shells/sample.php
cake/tests/test_app/vendors/somename/some.name.php
cake/tests/test_app/vendors/welcome.php
cake/tests/test_app/views/elements/email/text/default.ctp
cake/tests/test_app/views/layouts/default.ctp
cake/tests/test_app/views/posts/test_nocache_tags.ctp
lib/Cake/Cache/Engine/MemcacheEngine.php
lib/Cake/Config/config.php
lib/Cake/Console/Command/Task/ModelTask.php
lib/Cake/Console/Templates/skel/webroot/css/cake.generic.css
lib/Cake/Console/Templates/skel/webroot/test.php
lib/Cake/Console/cake.bat
lib/Cake/Controller/Component/CookieComponent.php
lib/Cake/Log/CakeLog.php
lib/Cake/Model/CakeSchema.php
lib/Cake/Test/Case/Log/Engine/FileLog.php
lib/Cake/Test/Case/View/Helper/FormHelperTest.php
lib/Cake/Test/test_app/View/Emails/html/custom.ctp
lib/Cake/Test/test_app/View/Emails/text/custom.ctp
lib/Cake/TestSuite/templates/header.php
lib/Cake/Utility/Sanitize.php
lib/Cake/Utility/Validation.php
lib/Cake/VERSION.txt
lib/Cake/View/Helper/FormHelper.php
2011-06-23 12:48:06 -07:00
hiromi2424
1e9af715cc
removed invalid access modifier from javascript in HtmlCoverageReport
2011-06-03 10:52:43 +09:00
hiromi2424
dcbf36c10a
fixed underscored plugin name for coverage, now it must be camel-cased.
2011-06-03 07:47:38 +09:00
Juan Basso
192812ee7f
Updating the copyright to 2011.
2011-05-30 22:32:43 -04:00
Renan Gonçalves
438050dcaa
Adding 'public' visibility to all public methods.
2011-05-30 22:02:32 +02:00
Renan Gonçalves
33d00380ed
Fixing cross database tests by making sure the fixture was created for the right database.
2011-05-24 19:32:38 +02:00
Jose Lorenzo Rodriguez
a2f725ff76
Fixing loading list of tests cases for plugins broken in recent commits
2011-05-22 22:58:52 -04:30
mark_story
ed68368201
Fixing HtmlCoverageReport so it properly enables the test subject class as best it can.
2011-05-21 13:34:24 -04:00
Jose Lorenzo Rodriguez
85c505fd4f
Fixing recently broken tests
2011-05-19 21:35:51 -04:30
Florian Krmer
585160300a
Fixing loading of plugin tests by adding Inflector::camelize()
2011-05-19 22:12:15 +02:00
Thomas Ploch
35a014045b
Moved check for CakePlugin::loaded() out of if statement in CakeTestLoader::_basePath(). Plugin will only be loaded when the plugin tests are requested.
2011-05-18 17:15:39 +02:00
Thomas Ploch
2b17988cb7
Fixed small typo in CakeTestLoader.php.
2011-05-18 16:14:36 +02:00
AD7six
245d678eda
Merge branch '2.0' of github.com:cakephp/cakephp into 2.0
...
Conflicts:
lib/Cake/TestSuite/Fixture/CakeFixtureManager.php
2011-05-18 01:01:31 +02:00
AD7six
b1d891bb49
path correction
2011-05-18 01:00:00 +02:00
Jose Lorenzo Rodriguez
27463da5ef
Fixing fixture loading in plugins
2011-05-17 17:11:34 -04:30
AD7six
7a430a921e
Merge branch 'feature/faster-tests' into 2.0
2011-05-16 16:41:12 +02:00
AD7six
afa8f6b441
remove LIBS constant
...
libs always means the Cake lib - so use the CAKE constant
2011-05-15 18:29:52 +02:00
AD7six
0508055ee9
remove CAKE_TEST_LIB constant
2011-05-15 17:36:39 +02:00
AD7six
95da598d99
also check for "binary"
2011-05-15 11:29:12 +02:00
AD7six
13488fe373
using memory db tables makes tests which use a db a lot faster.
...
a *lot* faster
2011-05-15 11:29:12 +02:00
Jose Lorenzo Rodriguez
d24aca34f1
Replacing more string to match new paths
2011-05-13 03:31:12 -04:30
Jose Lorenzo Rodriguez
900dfef2f7
Starting unification of casing in remaining folders
2011-05-13 01:53:49 -04:30
Jose Lorenzo Rodriguez
da6e0c0589
Updating the rest of the console tests to use the CakePlugin class
2011-05-12 00:28:39 -04:30
Jose Lorenzo Rodriguez
2c3132fa85
Fixing some TestSuite tests
2011-05-08 23:25:32 -04:30
Jose Lorenzo Rodriguez
d83555cc52
Merge remote-tracking branch 'origin/1.3' into merger
...
Conflicts:
cake/console/cake.php
cake/dispatcher.php
cake/libs/controller/components/auth.php
cake/libs/controller/controller.php
cake/libs/view/helpers/xml.php
cake/libs/view/pages/home.ctp
cake/libs/xml.php
cake/tests/cases/console/cake.test.php
cake/tests/cases/libs/controller/components/cookie.test.php
cake/tests/cases/libs/model/datasources/dbo/dbo_mysql.test.php
cake/tests/cases/libs/model/datasources/dbo_source.test.php
cake/tests/cases/libs/view/helpers/xml.test.php
cake/tests/cases/libs/xml.test.php
lib/Cake/Console/Command/SchemaShell.php
lib/Cake/Controller/Component/CookieComponent.php
lib/Cake/Network/Http/HttpSocket.php
lib/Cake/TestSuite/Fixture/CakeTestFixture.php
lib/Cake/VERSION.txt
lib/Cake/View/Helper/FormHelper.php
lib/Cake/View/Helper/TextHelper.php
lib/Cake/View/Helper/TimeHelper.php
lib/Cake/config/config.php
lib/Cake/tests/Case/Cache/CacheTest.php
lib/Cake/tests/Case/Model/CakeSchemaTest.php
lib/Cake/tests/Case/TestSuite/CakeTestFixtureTest.php
2011-05-04 01:10:23 -04:30
AD7six
658a1872ce
show testcases sorted alphabetically
2011-04-22 22:29:02 +02:00
Jose Lorenzo Rodriguez
8dc675335a
Small refactoring, and adding some App::uses() to avoid problems
2011-04-21 17:56:03 -04:30
Renan Gonçalves
4409ca0e28
Fixing typo on file name.
2011-04-20 23:50:54 +02:00
Jose Lorenzo Rodriguez
000e05b468
Merge remote-tracking branch 'origin/2.0' into 2.0-class-loading
...
Conflicts:
cake/libs/view/helpers/js.php
cake/tests/lib/templates/missing_conenction.php
cake/tests/lib/templates/missing_connection.php
lib/Cake/Model/ConnectionManager.php
lib/Cake/TestSuite/templates/missing_conenction.php
lib/Cake/View/Helper/FormHelper.php
lib/Cake/tests/Case/Core/ConfigureTest.php
2011-04-11 22:48:08 -04:30
Jose Lorenzo Rodriguez
0263ffc74e
Renaming tests folders and making tests runnable again
2011-04-10 20:08:24 -04:30
AD7six
32df3156a7
consolidate cake_error and cake_developer to simply "cake_dev"
...
it's a lot easier for adding new translations to think:
is it for the end user?
use 'cake' as the domain
is it for the developer
use 'cake_dev' as the domain
is it for the console
use 'cake_console' as the domain
also neatly avoids the "this message is an error, and it's in
cake_developer, why?" - question (because cake_error was intended for
anything which is used in trigger_error/exceptions, not a variable named
$error
2011-03-20 16:38:31 +01:00
AD7six
5725a23a56
use the domain cake_developer and cake_error as appropriate
2011-03-19 18:35:14 +01:00
AD7six
26038b13e1
translation changes in the TestSuite dir
2011-03-12 20:02:18 +01:00
Jose Lorenzo Rodriguez
6f232c4543
Fixing the loading of the HtmlCodeCoverageReport class
2011-03-12 02:06:50 -04:30
Jose Lorenzo Rodriguez
96fa5e79ba
Fixing fixture loading after recent changes in App::core()
2011-03-12 00:27:50 -04:30
Jose Lorenzo Rodriguez
e6b253ec0f
Starting to write a new App::import() that keeps where possible the backwards compatibility
2011-03-11 00:50:14 -04:30