aboutsummaryrefslogtreecommitdiffstats
path: root/tests
Commit message (Collapse)AuthorAgeFilesLines
...
* | | [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
| * | Merge remote-tracking branch 'p/ticket/10309' into develop-olympusAndreas Fischer2011-08-211-0/+0
| |\ \ | | | | | | | | | | | | | | | | * p/ticket/10309: [ticket/10309] Update .gitignore and move .gitkeep.
| | * | [ticket/10309] Update .gitignore and move .gitkeep.Oleg Pudeyev2011-08-201-0/+0
| | | | | | | | | | | | | | | | PHPBB3-10309
| * | | Merge remote-tracking branch 'p/ticket/10309' into develop-olympusAndreas Fischer2011-08-161-4/+7
| |\ \ \ | | |/ / | | | / | | |/ | |/| | | | * p/ticket/10309: [ticket/10309] Coding guidelines fix. [ticket/10309] Write unicode data to tests/tmp.
| | * [ticket/10309] Coding guidelines fix.Oleg Pudeyev2011-08-091-1/+1
| | | | | | | | | | | | PHPBB3-10309
| | * [ticket/10309] Write unicode data to tests/tmp.Oleg Pudeyev2011-08-071-4/+7
| | | | | | | | | | | | | | | | | | | | | When the tests are run by a different user than the one which owns phpbb source tree, writes will go into a single, known directory. PHPBB3-10309
* | | [feature/request-class] Fix session_testable_factoryIgor Wiedler2011-08-191-3/+2
| | | | | | | | | | | | PHPBB3-9716
* | | [feature/request-class] Remove $html_encode arg, force manual decodingIgor Wiedler2011-08-183-17/+5
| | | | | | | | | | | | PHPBB3-9716
* | | Merge branch 'develop' into feature/request-classIgor Wiedler2011-08-1828-182/+727
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * develop: (157 commits) [ticket/10316] Resolve inconsistent move topic behavior [ticket/9297] Add network to class name of unit tests. [ticket/9297] Fix typo in localhost. [ticket/9297] Rename test class to reflect its contents. [ticket/9297] Adjust comment - IPv6 is needed for IPv6 connections to work. [ticket/9297] Fix markTestSkipped call in setUpBeforeClass. [ticket/9608] Remove use of references in topic_review [ticket/9297] Skip FTP PASV/EPSV test if FTP connection fails. [ticket/9297] Separate ipv4 and ipv6 tests into separate functions. [ticket/9297] Update copyright year of unit test file. [feature/template-engine] Delete _get_locator function. [feature/template-engine] Clean up template locator usage in bbcode. [ticket/9297] Make EPSV unit tests work without IPv6. [ticket/9297] Unit tests for ftp_fsock PASV and EPSV. [ticket/9297] Add support for Extended Passive Mode (EPSV) in ftp_fsock class. [ticket/10312] Un-check the shadow option while moving. [feature/template-engine] Need to call set_template on template. [feature/template-engine] Update installer for template engine changes. [feature/template-engine] Dependency inject locator into template. [feature/template-engine] Delete useless code from set_template. ... Conflicts: phpBB/includes/functions.php
| * \ \ Merge branch 'develop-olympus' into developOleg Pudeyev2011-08-141-0/+63
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * develop-olympus: [ticket/9297] Add network to class name of unit tests. [ticket/9297] Fix typo in localhost. [ticket/9297] Rename test class to reflect its contents. [ticket/9297] Adjust comment - IPv6 is needed for IPv6 connections to work. [ticket/9297] Fix markTestSkipped call in setUpBeforeClass. [ticket/9297] Skip FTP PASV/EPSV test if FTP connection fails. [ticket/9297] Separate ipv4 and ipv6 tests into separate functions. [ticket/9297] Update copyright year of unit test file. [ticket/9297] Make EPSV unit tests work without IPv6. [ticket/9297] Unit tests for ftp_fsock PASV and EPSV. [ticket/9297] Add support for Extended Passive Mode (EPSV) in ftp_fsock class.
| | * | [ticket/9297] Add network to class name of unit tests.Andreas Fischer2011-08-141-1/+1
| | | | | | | | | | | | | | | | PHPBB3-9297
| | * | [ticket/9297] Fix typo in localhost.Andreas Fischer2011-08-141-1/+1
| | | | | | | | | | | | | | | | PHPBB3-9297
| | * | [ticket/9297] Rename test class to reflect its contents.Oleg Pudeyev2011-08-141-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | setUpBeforeClass logic makes this test specific to PASV/EPSV tests. PHPBB3-9297
| | * | [ticket/9297] Adjust comment - IPv6 is needed for IPv6 connections to work.Oleg Pudeyev2011-08-141-5/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Looks like IPv6-encapsulated IPv4 addresses do not actually work if the host has no IPv6 connectivity. PHPBB3-9297
| | * | [ticket/9297] Fix markTestSkipped call in setUpBeforeClass.Oleg Pudeyev2011-08-141-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Need to use the static version here. PHPBB3-9297
| | * | [ticket/9297] Skip FTP PASV/EPSV test if FTP connection fails.Oleg Pudeyev2011-08-141-1/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It is possible to configure PHP without IPv6, in which case IPv6-encapsulated IPv4 addresses won't be accepted by PHP. Instead of failing the test suite on such setups, skip the offending test. PHPBB3-9297
| | * | [ticket/9297] Separate ipv4 and ipv6 tests into separate functions.Oleg Pudeyev2011-08-141-4/+13
| | | | | | | | | | | | | | | | PHPBB3-9297
| | * | [ticket/9297] Update copyright year of unit test file.Andreas Fischer2011-08-141-1/+1
| | | | | | | | | | | | | | | | PHPBB3-9297
| | * | [ticket/9297] Make EPSV unit tests work without IPv6.Andreas Fischer2011-08-111-10/+9
| | | | | | | | | | | | | | | | PHPBB3-9297
| | * | [ticket/9297] Unit tests for ftp_fsock PASV and EPSV.Andreas Fischer2011-08-111-0/+48
| | |/ | | | | | | | | | PHPBB3-9297
| | * Merge remote-tracking branch 'github-bantu/ticket/10265' into develop-olympusNils Adermann2011-07-161-1/+1
| | |\ | | | | | | | | | | | | | | | | * github-bantu/ticket/10265: [ticket/10265] Move mt_rand.php to wrapper folder and add _test suffix.
| * | \ Merge remote-tracking branch 'github-p/feature/template-engine' into developNils Adermann2011-08-1324-181/+484
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * github-p/feature/template-engine: (87 commits) [feature/template-engine] Delete _get_locator function. [feature/template-engine] Clean up template locator usage in bbcode. [feature/template-engine] Need to call set_template on template. [feature/template-engine] Update installer for template engine changes. [feature/template-engine] Dependency inject locator into template. [feature/template-engine] Delete useless code from set_template. [feature/template-engine] Delete no longer used $template_filename property. [feature/template-engine] Delete useless $template globalization. [feature/template-engine] Use template engine class in bbcode class. [feature/template-engine] Corrected an error message in template locator. [feature/template-engine] Remaining documentation. [feature/template-engine] More documentation for template class. [feature/template-engine] Create load_and_render to reduce code duplication. [feature/template-engine] Get rid of orig_tpl_* in template engine. [feature/template-engine] Delete $style_name param from locator's set_custom_template. [feature/template-engine] Add constructor to template locator. [feature/template-engine] Factor template locator out of template class. [feature/template-engine] Delete $files_template property. [feature/template-engine] Rename is_absolute to phpbb_is_absolute. [feature/template-engine] Test template DEFINE statements across files ... Conflicts: .gitignore phpBB/includes/template.php
| | * | | [feature/template-engine] Dependency inject locator into template.Oleg Pudeyev2011-08-092-2/+5
| | | | | | | | | | | | | | | | | | | | PHPBB3-9726
| | * | | [feature/template-engine] Factor template locator out of template class.Oleg Pudeyev2011-07-301-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Template locator is responsible for maintaining mapping from template handles to filenames and paths, and provides resolution services using these mappings. Template locator is aware of template inheritance and is capable of checking template file existence on the filesystem. PHPBB3-9726
| | * | | [feature/template-engine] Rename is_absolute to phpbb_is_absolute.Oleg Pudeyev2011-07-241-1/+1
| | | | | | | | | | | | | | | | | | | | PHPBB3-9726
| | * | | [feature/template-engine] Test template DEFINE statements across filesNils Adermann2011-07-173-1/+7
| | | | | | | | | | | | | | | | | | | | PHPBB3-9726
| | * | | [feature/template-engine] Remove $include_once argument of display()Igor Wiedler2011-07-101-1/+1
| | | | | | | | | | | | | | | | | | | | PHPBB3-9726
| | * | | [feature/template-engine] Refactor $config dependency out of the filterIgor Wiedler2011-07-105-19/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The template stream filter no longer depends on the $config global. Instead it uses a 'allow_php' param that is passed via stream_bucket_append's last argument. Tests also adjusted. PHPBB3-9726