aboutsummaryrefslogtreecommitdiffstats
path: root/tests
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'EXreaction/ticket/11669' into developAndreas Fischer2013-07-121-0/+3
|\ | | | | | | | | * EXreaction/ticket/11669: [ticket/11669] Fix PHP bug #55124 (recursive mkdir on /./)
| * [ticket/11669] Fix PHP bug #55124 (recursive mkdir on /./)Nathaniel Guse2013-07-121-0/+3
| | | | | | | | PHPBB3-11669
* | Merge branch 'develop-olympus' into developAndreas Fischer2013-07-122-49/+49
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | * develop-olympus: [ticket/11548] Fix incorrect usage of array_map on acp groups page Conflicts: tests/functional/common_groups_test.php tests/functional/ucp_groups_test.php
| * | [ticket/11548] Fix incorrect usage of array_map on acp groups pageMarc Alexander2013-07-122-49/+49
| | | | | | | | | | | | | | | | | | | | | | | | The array_map was only ran on small parts of the actual error array instead of the whole one. This resulted in the output of the language variables' names rather than their actual value. PHPBB3-11548
| * | [ticket/11662] Typos: occured -> occurredAndreas Fischer2013-07-121-1/+1
| | | | | | | | | | | | PHPBB3-11662
* | | Merge remote-tracking branch 'EXreaction/ticket/11665' into developAndreas Fischer2013-07-121-0/+29
|\ \ \ | | | | | | | | | | | | | | | | | | | | * EXreaction/ticket/11665: [ticket/11665] Fix test class name [ticket/11665] Can't change file names already sent to set_filenames
| * | | [ticket/11665] Fix test class nameNathaniel Guse2013-07-121-1/+1
| | | | | | | | | | | | | | | | PHPBB3-11665
| * | | [ticket/11665] Can't change file names already sent to set_filenamesNathaniel Guse2013-07-121-0/+29
| | |/ | |/| | | | | | | PHPBB3-11665
* | | [ticket/11664] Stop creating php.html file in root path in testsNathaniel Guse2013-07-122-2/+2
|/ / | | | | | | | | | | Also includephp_absolute.html PHPBB3-11664
* | [ticket/11662] Typos: occured -> occurredAndreas Fischer2013-07-121-1/+1
| | | | | | | | PHPBB3-11662
* | Merge pull request #1522 from igorw/feature/bootstrap-dicNils Adermann2013-07-112-2/+6
|\ \ | | | | | | [feature/bootstrap-dic] Bootstrap container from config.php
| * | [feature/bootstrap-dic] Bootstrap container from config.phpIgor Wiedler2013-07-112-2/+6
| | | | | | | | | | | | PHPBB3-11651
* | | Merge branch 'develop-olympus' into developAndreas Fischer2013-07-121-0/+49
|\ \ \ | |/ / |/| / | |/ | | | | | | | | | | * develop-olympus: [ticket/11548] Use new static methods for request and submit [ticket/11548] Run array_map on complete error array and not just colour_error Conflicts: tests/functional/ucp_groups_test.php
| * [ticket/11548] Use new static methods for request and submitMarc Alexander2013-07-111-5/+4
| | | | | | | | PHPBB3-11548
| * Merge branch 'develop-olympus' of https://github.com/phpbb/phpbb3 into ↵Marc Alexander2013-07-1130-122/+1868
| |\ | | | | | | | | | ticket/11548
| | * [ticket/10772] Updating testsVjacheslav Trushkin2013-07-111-12/+6
| | | | | | | | | | | | PHPBB3-10772
| | * [ticket/10772] Remove 3.1 codeVjacheslav Trushkin2013-07-111-70/+51
| | | | | | | | | | | | PHPBB3-10772
| * | [ticket/11548] Run array_map on complete error array and not just colour_errorMarc Alexander2013-07-111-0/+50
| | | | | | | | | | | | | | | | | | | | | | | | Up to now the array_map() that turns error messages into the localized output was only ran if the group's color was set. With this patch it'll run the array_map() on the complete error array if it's not empty. PHPBB3-11548
* | | [ticket/11388] Add newlines at EOFNathaniel Guse2013-07-112-2/+2
| | | | | | | | | | | | PHPBB3-11388
* | | [ticket/11388] INCLUDECSSNathaniel Guse2013-07-114-0/+31
| | | | | | | | | | | | PHPBB3-11388
* | | Merge pull request #1470 from EXreaction/feature/twigNils Adermann2013-07-1127-502/+288
|\ \ \ | | | | | | | | Feature/twig
| * | | [ticket/11388] Do not append assets_version if using remote path (e.g. http)Nathaniel Guse2013-07-111-3/+3
| | | | | | | | | | | | | | | | PHPBB3-11388
| * | | [ticket/11388] INCLUDEJS test for //(url)Nathaniel Guse2013-07-112-0/+6
| | | | | | | | | | | | | | | | PHPBB3-11388
| * | | [ticket/11388] Fixing includejs testNathaniel Guse2013-07-102-44/+118
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Changed expected output to file?(any supplied argument string)&asset_version =($config['asset_version'])#(any supplied anchor string) Testing lines one at a time to make checking them easier. PHPBB3-11388
| * | | Merge remote-tracking branch ↵Nathaniel Guse2013-07-102-7/+32
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'remotes/cyberalien/feature/twig/includejs_tests' into feature/twig # By Vjacheslav Trushkin # Via Vjacheslav Trushkin * remotes/cyberalien/feature/twig/includejs_tests: [feature/twig] Unit tests for includejs
| | * | | [feature/twig] Unit tests for includejsVjacheslav Trushkin2013-07-102-7/+32
| | | | | | | | | | | | | | | | | | | | PHPBB3-11598
| * | | | [feature/twig] Add simple test to make sure Twig filters/tags are workingNathan Guse2013-07-083-0/+20
| |/ / / | | | | | | | | | | | | PHPBB3-11598
| * | | [feature/twig] Add template tests for S_NUM_ROWS and S_BLOCK_NAMENathan Guse2013-07-052-3/+34
| | | | | | | | | | | | | | | | PHPBB3-11598
| * | | [feature/twig] Remove style dependency for controller helperNathan Guse2013-07-051-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | If a controller wants to use set_style, it can just use phpbb_style PHPBB3-11598
| * | | [feature/twig] Add template test for ===, !==Nathan Guse2013-07-052-4/+26
| | | | | | | | | | | | | | | | PHPBB3-11598
| * | | [feature/twig] Remove debug codeNathaniel Guse2013-07-041-5/+0
| | | | | | | | | | | | | | | | PHPBB3-11598
| * | | [feature/twig] Trying some new debug code for this mkdir errorNathaniel Guse2013-07-041-8/+4
| | | | | | | | | | | | | | | | PHPBB3-11598
| * | | [feature/twig] Fix helper URL testNathaniel Guse2013-07-041-1/+4
| | | | | | | | | | | | | | | | PHPBB3-11598
| * | | Merge branch 'develop' of https://github.com/phpbb/phpbb3 into feature/twigNathaniel Guse2013-07-046-0/+376
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # By Joseph Warner (44) and others # Via Joas Schilling (4) and others * 'develop' of https://github.com/phpbb/phpbb3: (63 commits) [ticket/11617] Remove spaces and tabs from empty lines [ticket/11617] Missing U_ACTION in acp_captcha.php [feature/auth-refactor] Fix code style issue [feature/auth-refactor] Fix comment grammar [feature/auth-refactor] Fix the actual cause of test failures [feature/auth-refactor] A possible fix for the functional test failures [ticket/11566] Subsilver template error displayed after table headers [ticket/11566] Remove extra pair of brackets from conditional statement [ticket/11566] Check that guest doesn't have reporting permission by default [ticket/11566] Add captcha to report post template in subsilver [ticket/11566] Use the new constant CONFIRM_REPORT for captcha init [ticket/11566] Rename var to $visual_confirmation_response [ticket/11566] Revert forum permission changes [ticket/11566] Use language variable instead of hardcode [ticket/11566] add tests for reporting post [ticket/11566] add captcha reset and hidden fields [ticket/11566] display error instead of trigger_error [ticket/11566] add error in template [ticket/11566] add error functionality [ticket/11566] add interface for captcha ...
| * | | | Revert "[feature/twig] Call set_style in the foo/bar controller for ↵Nathaniel Guse2013-07-041-2/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | functional tests" This reverts commit 5c39f26cd27d5e4a1debfa24407825906f42d346.
| * | | | [feature/twig] Add test to make sure nested loops get the correct S_ROW_COUNTNathaniel Guse2013-07-042-0/+13
| | | | | | | | | | | | | | | | | | | | PHPBB3-11598
| * | | | [feature/twig] Call set_style in the foo/bar controller for functional testsNathaniel Guse2013-07-041-0/+2
| | | | | | | | | | | | | | | | | | | | PHPBB3-11598
| * | | | [feature/twig] Debugging test failuresNathaniel Guse2013-07-031-0/+6
| | | | | | | | | | | | | | | | | | | | PHPBB3-11598
| * | | | [feature/twig] Prevent errors from mkdir if the dir already existsNathaniel Guse2013-07-021-1/+4
| | | | | | | | | | | | | | | | | | | | PHPBB3-11598
| * | | | [feature/twig] template->cachepath is now private, missed checking testsNathaniel Guse2013-07-022-2/+6
| | | | | | | | | | | | | | | | | | | | PHPBB3-11598
| * | | | [feature/twig] Move test_php back to template_testNathaniel Guse2013-07-022-30/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Was originally moved because I thought that a new test file might mean a new instance and the memory would be cleared, fixing the original problem, but that isn't true and it was fixed another way. PHPBB3-11598
| * | | | [feature/twig] Should compare to $this->test_path rather than hardcoded pathNathaniel Guse2013-07-021-6/+6
| | | | | | | | | | | | | | | | | | | | PHPBB3-11598
| * | | | [feature/twig] Fix includejs testNathaniel Guse2013-07-022-7/+7
| | | | | | | | | | | | | | | | | | | | PHPBB3-11598
| * | | | [feature/twig] Fix template test caseNathaniel Guse2013-07-021-1/+1
| | | | | | | | | | | | | | | | | | | | PHPBB3-11598
| * | | | Merge branch 'develop' of https://github.com/phpbb/phpbb3 into feature/twigNathaniel Guse2013-07-011-4/+34
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # By Dhruv # Via Andreas Fischer (3) and Dhruv (1) * 'develop' of https://github.com/phpbb/phpbb3: [ticket/10838] Fix URL for wiki and remove irrelevant line [ticket/10838] Remove php 5.4 and builtin server references [ticket/10838] Fix missing data [ticket/10838] separate database used mentioned in unit tests [ticket/11585] Make $auth_admin class property [ticket/10838] Updated RUNNING_TESTS.md
| * | | | | [feature/twig] Remove resource locator dependency from templateNathaniel Guse2013-07-015-6/+4
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11598
| * | | | | [feature/twig] Fix template/template_php_test.phpNathaniel Guse2013-07-011-1/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Must create a template file in the cache to load as this causes errors otherwise. The problem was that Twig builds template files into classes, which are always stored in PHP memory after being loaded. Because of this, Twig would never recompile a template that was already compiled on the same page load (so switching enable PHP on/off in two tests would not work). PHPBB3-11598
| * | | | | [feature/twig] Fix includephp_from_subdir_test.phpNathaniel Guse2013-07-012-5/+7
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11598
| * | | | | [feature/twig] Changing INCLUDEJS behavior slightlyNathaniel Guse2013-07-011-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Automatically parsing inline variables the same way it is done for INCLUDE, INCLUDEPHP PHPBB3-11598
| * | | | | [feature/twig] PHP test moved to a separate fileNathaniel Guse2013-07-011-0/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This had to be done because cached template files are available in memory, so Twig doesn't ever reparse a template on the same page load PHPBB3-11598