aboutsummaryrefslogtreecommitdiffstats
path: root/tests
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'develop-olympus' into developAndreas Fischer2011-10-171-0/+5
|\ | | | | | | | | * develop-olympus: [ticket/10416] Pass dbport to PDO object in ...connection_manager::connect().
| * [ticket/10416] Pass dbport to PDO object in ...connection_manager::connect().Andreas Fischer2011-10-161-0/+5
| | | | | | | | PHPBB3-10416
* | [ticket/10414] Skip functional tests on PHP 5.2 - requires PHPUnit 3.6 on 5.2Nils Adermann2011-10-171-1/+5
| | | | | | | | | | | | | | | | | | | | Tests still execute correctly using PHPUnit 3.5 on PHP 5.3 and above. The php version limitation for a directory was added in PHPUnit 3.6. A separate test suite is required because the functional tests are in the whitelisted tests directory. The base test for functional testing is only included in bootstrap in versions 5.3 and above. PHPBB3-10414
* | [ticket/10417] Fix array_merge() on undefined $config variable.Andreas Fischer2011-10-161-2/+4
| | | | | | | | PHPBB3-10417
* | Merge branch 'develop-olympus' into developIgor Wiedler2011-10-141-10/+3
|\ \ | |/ | | | | | | | | * develop-olympus: [ticket/10327] Use $this->tools instead of creating a new instance of db_tools. [ticket/10327] Also change CREATE UNIQUE INDEX to use ALTER TABLE.
| * Merge remote-tracking branch 'bantu/ticket/10327' into develop-olympusIgor Wiedler2011-10-141-10/+3
| |\ | | | | | | | | | | | | | | | * bantu/ticket/10327: [ticket/10327] Use $this->tools instead of creating a new instance of db_tools. [ticket/10327] Also change CREATE UNIQUE INDEX to use ALTER TABLE.
| | * [ticket/10327] Use $this->tools instead of creating a new instance of db_tools.Andreas Fischer2011-10-141-10/+3
| | | | | | | | | | | | PHPBB3-10327
* | | Merge branch 'develop-olympus' into developNils Adermann2011-10-141-0/+15
|\ \ \ | |/ / | | | | | | | | | | | | * develop-olympus: [ticket/8240] Add ability to get a list of columns of a tables to db_tools. [ticket/8240] Add ability to get a list of tables to db_tools.
| * | [ticket/8240] Add ability to get a list of columns of a tables to db_tools.Andreas Fischer2011-10-141-0/+8
| | | | | | | | | | | | PHPBB3-8240
| * | [ticket/8240] Add ability to get a list of tables to db_tools.Andreas Fischer2011-10-141-0/+7
| |/ | | | | | | PHPBB3-8240
* | [feature/functional-tests] Don't add elements to backup list twiceNils Adermann2011-10-141-7/+0
| | | | | | | | PHPBB3-10414
* | [feature/functional-tests] Generate config correctly and install only onceNils Adermann2011-10-142-24/+48
| | | | | | | | PHPBB3-10414
* | [feature/functional-tests] Configure functional tests through config fileNils Adermann2011-10-143-61/+87
| | | | | | | | | | | | The functional tests now also use the test database PHPBB3-10414
* | [feature/functional-tests] Implementing functional test framework with goutteIgor Wiedler2011-10-143-0/+155
| | | | | | | | PHPBB3-10414
* | Merge branch 'develop-olympus' into developIgor Wiedler2011-10-141-0/+18
|\ \ | |/ | | | | | | * develop-olympus: [ticket/10327] Change CREATE INDEX to ALTER TABLE table ADD INDEX for MySQL.
| * [ticket/10327] Change CREATE INDEX to ALTER TABLE table ADD INDEX for MySQL.Andreas Fischer2011-10-141-0/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | * CREATE INDEX is internally mapped to an ALTER INDEX statement. * CREATE INDEX requires the INDEX permission. * ALTER TABLE requires the (more powerful) ALTER permission. * We require the ALTER permission anyway for operation. * Changing CREATE INDEX to ALTER TABLE thus removes dependency on the INDEX permission which is good because some management software does not give out the INDEX permission by default. http://dev.mysql.com/doc/refman/5.0/en/create-index.html PHPBB3-10327
* | Merge branch 'develop-olympus' into developAndreas Fischer2011-10-131-1/+17
|\ \ | |/ | | | | | | | | * develop-olympus: [ticket/10307] Add a test for PHPBB3-10307 [ticket/10307] Return false in mysqli sql_fetchrow on empty result
| * [ticket/10307] Add a test for PHPBB3-10307Igor Wiedler2011-10-131-1/+17
| | | | | | | | PHPBB3-10307
* | Merge branch 'develop-olympus' into developAndreas Fischer2011-09-271-2/+2
|\ \ | |/ | | | | | | * develop-olympus: [ticket/10394] Use call_user_func_array to pass a ref into a dynamic function
| * [ticket/10394] Use call_user_func_array to pass a ref into a dynamic functionNils Adermann2011-09-271-2/+2
| | | | | | | | PHPBB3-10394
* | Merge branch 'develop-olympus' into developAndreas Fischer2011-09-272-3/+3
|\ \ | |/ | | | | | | * develop-olympus: [ticket/10394] Remove call-time pass by reference from tests for PHP 5.4
| * [ticket/10394] Remove call-time pass by reference from tests for PHP 5.4Nils Adermann2011-09-272-3/+3
| | | | | | | | PHPBB3-10394
* | Merge branch 'develop' of git://github.com/phpbb/phpbb3 into developAndreas Fischer2011-09-272-2/+3
|\ \ | | | | | | | | | | | | | | | | | | | | | * 'develop' of git://github.com/phpbb/phpbb3: [ticket/10392] Alter parent namespace stripping. [ticket/10392] Test for magic loop variables with nested namespaces. [ticket/10392] Missed fix for S_BLOCK_NAME. [ticket/10392] Fix access to nested special block variables.
| * | [ticket/10392] Test for magic loop variables with nested namespaces.Chris Smith2011-09-272-2/+3
| | | | | | | | | | | | PHPBB3-10392
* | | [ticket/10384] Update unit tests to test for failing variable.Chris Smith2011-09-242-5/+7
|/ / | | | | | | PHPBB3-10384
* | Merge branch 'develop-olympus' into developNils Adermann2011-09-181-0/+35
|\ \ | |/ | | | | | | | | | | | | | | * develop-olympus: [ticket/10369] Replace root path with "[ROOT]" as per IRC. [ticket/10369] Add warning about paths outside of phpBB root not being filtered [ticket/10369] Rename filter_errfile() to filter_root_path(). [ticket/10369] DRY code to remove phpbb path from errfile. [ticket/10369] Always include errfile and errline in format_errors().
| * [ticket/10369] Always include errfile and errline in format_errors().Andreas Fischer2011-09-181-0/+35
| | | | | | | | | | | | | | We remove the phpBB root path from errfile. This is consistent with how msg_handler handles E_WARNING messages etc. PHPBB3-10369
* | [ticket/10322] Separate template varref resolution from output generationPatrick Webster2011-09-167-3/+24
| | | | | | | | | | | | | | | | | | Most template variables can now have their PHP variable name resolved instead of only compiling directly. This allows for the use of block vars in INCLUDE statements. This does not work for language variables since they require multiple checks. Added tests for the new types of allowed INCLUDEs. PHPBB3-10322
* | [ticket/10322] Dynamic template include testPatrick Webster2011-09-082-0/+10
| | | | | | | | PHPBB3-10322
* | Merge remote-tracking branch 'cyberalien/ticket/10350' into developOleg Pudeyev2011-09-051-0/+31
|\ \ | | | | | | | | | | | | | | | * cyberalien/ticket/10350: [ticket/10350] Script for testing eval renderer [ticket/10350] Fix for class phpbb_template_renderer_eval
| * | [ticket/10350] Script for testing eval rendererVjacheslav Trushkin2011-09-051-0/+31
| | | | | | | | | | | | | | | | | | Script for testing eval renderer (fixed) PHPBB3-10350
* | | Merge branch 'develop-olympus' into developIgor Wiedler2011-09-051-2/+3
|\ \ \ | | |/ | |/| | | | | | | | | | | | | | | | * develop-olympus: [ticket/10354] Include cache directory path in unwritable message. Conflicts: tests/template/template_test.php
| * | Merge remote-tracking branch 'p/ticket/10354' into develop-olympusIgor Wiedler2011-09-051-2/+3
| |\ \ | | | | | | | | | | | | | | | | * p/ticket/10354: [ticket/10354] Include cache directory path in unwritable message.
| | * | [ticket/10354] Include cache directory path in unwritable message.Oleg Pudeyev2011-09-051-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When template tests are skipped because cache directory is not writable, include path to the cache directory into the message saying it is not writable. PHPBB3-10354
* | | | Merge branch 'develop-olympus' into developIgor Wiedler2011-09-053-0/+123
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * develop-olympus: [ticket/10240] Added optionset to mock_user in the tests. [ticket/10240] Fixed copyright year in censor_text_test.php. [ticket/10240] Fixed censor_text test assetEquals param order. [ticket/10240] Added censor_text tests for special characters. [ticket/10240] Added censor_text tests. Conflicts: tests/mock/cache.php
| * | | Merge remote-tracking branch 'callumacrae/ticket/10240' into develop-olympusIgor Wiedler2011-09-053-0/+123
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * callumacrae/ticket/10240: [ticket/10240] Added optionset to mock_user in the tests. [ticket/10240] Fixed copyright year in censor_text_test.php. [ticket/10240] Fixed censor_text test assetEquals param order. [ticket/10240] Added censor_text tests for special characters. [ticket/10240] Added censor_text tests.
| | * | | [ticket/10240] Added optionset to mock_user in the tests.Callum Macrae2011-08-232-6/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also made optionset use the value set by optionset. We're not checking whether the option is set or not, because we would just throw an error if it wasn't set, and it throws an error anyway. PHPBB3-10240
| | * | | [ticket/10240] Fixed copyright year in censor_text_test.php.Callum Macrae2011-08-231-1/+1
| | | | | | | | | | | | | | | | | | | | PHPBB3-10240
| | * | | [ticket/10240] Fixed censor_text test assetEquals param order.Callum Macrae2011-08-231-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Before, expected and input were the wrong way round. PHPBB3-10240
| | * | | [ticket/10240] Added censor_text tests for special characters.Callum Macrae2011-08-231-0/+10
| | | | | | | | | | | | | | | | | | | | PHPBB3-10240
| | * | | [ticket/10240] Added censor_text tests.Callum Macrae2011-08-223-0/+107
| | |/ / | | | | | | | | | | | | PHPBB-10240
* | | | Merge remote-tracking branch 'p/ticket/10355' into developIgor Wiedler2011-09-051-2/+16
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | * p/ticket/10355: [ticket/10355] Correctly end output buffering in template tests.
| * | | | [ticket/10355] Correctly end output buffering in template tests.Oleg Pudeyev2011-09-051-2/+16
| | |_|/ | |/| | | | | | | | | | | | | | | | | | This code was copied verbatim from develop-olympus. PHPBB3-10355
* | | | Merge branch 'develop-olympus' into developOleg Pudeyev2011-09-051-0/+51
|\ \ \ \ | |/ / / |/| / / | |/ / | | | | | | * develop-olympus: [ticket/10321] Add descriptions to the unit tests [ticket/10321] Do not append the ? if the param-list is empty anyway.
| * | Merge remote-tracking branch 'nickvergessen/ticket/10321' into develop-olympusOleg Pudeyev2011-09-051-0/+51
| |\ \ | | | | | | | | | | | | | | | | | | | | * nickvergessen/ticket/10321: [ticket/10321] Add descriptions to the unit tests [ticket/10321] Do not append the ? if the param-list is empty anyway.
| | * | [ticket/10321] Add descriptions to the unit testsJoas Schilling2011-08-211-15/+15
| | | | | | | | | | | | | | | | PHPBB3-10321
| | * | [ticket/10321] Do not append the ? if the param-list is empty anyway.Joas Schilling2011-08-211-0/+51
| | | | | | | | | | | | | | | | PHPBB3-10321
* | | | Merge branch 'develop-olympus' into developJoas Schilling2011-08-291-0/+60
|\ \ \ \ | |/ / / | | | | | | | | | | | | * develop-olympus: [ticket/10346] Add drop_tables to perform_schema_changes and add tests
| * | | [ticket/10346] Add drop_tables to perform_schema_changes and add testsNils Adermann2011-08-291-0/+60
| | |/ | |/| | | | | | | PHPBB3-10346
* | | Merge branch 'develop-olympus' into developAndreas Fischer2011-08-212-4/+7
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | | | | * develop-olympus: [ticket/10309] Update .gitignore and move .gitkeep. [ticket/10309] Coding guidelines fix. [ticket/10309] Write unicode data to tests/tmp. Conflicts: .gitignore