aboutsummaryrefslogtreecommitdiffstats
path: root/tests
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'EXreaction/ticket/11832' into developJoas Schilling2013-09-1613-28/+250
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * EXreaction/ticket/11832: [ticket/11832] Correct paths in tests [ticket/11832] Correct ROOT_PATH variable [ticket/11832] get_url() from phpbb_template_asset should return web path [ticket/11832] Fix INCLUDE(JS/CSS) [ticket/11832] Fix constructions of phpbb_filesystem [ticket/11832] Fix smiley paths [ticket/11832] Create phpbb_symfony_request to handle initiating symfony_request [ticket/11832] Fix build_url and the S_LOGIN_ACTION [ticket/11832] Changing comments to say app.php rather than index.php [ticket/11832] We must instantiate the $phpbb_filesystem in common [ticket/11832] Fix the web path corrections [ticket/11832] More extensive testing [ticket/11832] Use dirname(__FILE__) [ticket/11832] Use $phpbb_filesystem instead of the container in append_sid Revert "[ticket/11832] Make $phpbb_container a global initiated by the framework" [ticket/11832] Make $phpbb_container a global initiated by the framework [ticket/11832] Fix log tests [ticket/11832] update_web_root_path helper and tests [ticket/11832] Inject dependencies for phpbb_get_web_root_path (also moving)
| * [ticket/11832] Correct paths in testsNathan Guse2013-09-153-17/+19
| | | | | | | | PHPBB3-11832
| * [ticket/11832] Fix INCLUDE(JS/CSS)Nathan Guse2013-09-1311-16/+73
| | | | | | | | PHPBB3-11832
| * [ticket/11832] Fix constructions of phpbb_filesystemNathan Guse2013-09-136-8/+31
| | | | | | | | PHPBB3-11832
| * [ticket/11832] Create phpbb_symfony_request to handle initiating symfony_requestNathan Guse2013-09-132-20/+42
| | | | | | | | | | | | | | | | | | | | | | Now symfony_request is also a service (removed the function phpbb_create_symfony_request). Inject symfony request into filesystem Cleanup for the tests PHPBB3-11832
| * Merge branch 'develop' of github.com:phpbb/phpbb3 into ticket/11832Nathan Guse2013-09-139-256/+412
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # By Nathan Guse (22) and others # Via Nathan Guse (10) and others * 'develop' of github.com:phpbb/phpbb3: (39 commits) [ticket/11843] Added newlines and included numbers in the DEFINE vars test [ticket/11843] Add checking DEFINE variables with underscores to template_test [ticket/11843] The twig lexer fixes DEFINE variables with underscores again [ticket/11727] Fix indentation [ticket/11727] Fix indentation [ticket/11745] Correct language, coding guidelines [ticket/11828] Fix greedy operators in lexer [ticket/11833] Prevent Twig errors from invalid template loops using BEGINELSE [ticket/11833] Fix bad template loop [ticket/11816] !$DOESNT_EXIST test [ticket/9550] Add the core.viewtopic_post_rowset_data event to viewtopic.php [ticket/11829] Use report_closed to determine status in MCP report_details [ticket/11816] Test !$DEFINITION [ticket/11822] Use namespace lookup order for asset loading [ticket/11727] Template loader support for safe directories to load files from [ticket/11816] Fix define/loop checks in IF statements containing parenthesis [ticket/11373] Use inheritdoc [ticket/11637] generate_text_for_display on search.php [ticket/11744] Cast to int [ticket/11744] Inheritdoc ...
| * \ Merge remote-tracking branch 'remotes/imkingdavid/ticket/11824' into ↵Nathan Guse2013-09-121-6/+50
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ticket/11832 * remotes/imkingdavid/ticket/11824: [ticket/11824] Revert changes in functions.php [ticket/11824] Reorganize test file [ticket/11824] Update language string for board settings [ticket/11824] Revert changes to functions_content.php [ticket/11824] Add tests for urls with mod_rewrite enabled [ticket/11824] Correct a comment [ticket/11824] Change copyright year in migration file [ticket/11824] Remove unused globals [ticket/11824] Fix smilies [ticket/11824] Fix logic [ticket/11824] Add option for mod_rewrite
| * \ \ Merge branch 'develop' of github.com:phpbb/phpbb3 into ticket/11832Nathan Guse2013-09-123-0/+222
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # By Joseph Warner (187) and others # Via Andreas Fischer (2) and others * 'develop' of github.com:phpbb/phpbb3: (189 commits) [ticket/11835] Fix ucp_auth_link adding in migration [prep-release-3.0.12] Remove changelog entry for ticket that was not resolved. [feature/oauth] Fix tabindex [feature/oauth] Fix bug on ucp_auth_link related to error display [feature/oauth] More small fixes [feature/oauth] More minor changes from review [feature/oauth] Fix small bug introduced by update in OAuth library [feature/oauth] Fix small issues on ucp pages [feature/oauth] Fix typo in OAuth logout method [feature/oauth] Make token storage service ignorant [feature/oauth] Update oauth::logout() to use clearAllTokens() [feature/oauth] Update storage implementation due to inteface change [feature/oauth] Update lusitanian/oauth to stable branch [feature/oauth] Update comment on oauth service exception [feature/oauth] Forgot to remove placeholder comment [feature/oauth] OAuth service exception [feature/oauth] A few more minor changes [feature/oauth] Changes due to code review [feature/oauth] Fix redirects [feature/oauth] Fix issues on ucp_login_link from review ...
| * | | | [ticket/11832] Fix the web path correctionsNathan Guse2013-09-121-2/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add some real life examples to test PHPBB3-11832
| * | | | [ticket/11832] More extensive testingNathan Guse2013-09-101-7/+42
| | | | | | | | | | | | | | | | | | | | PHPBB3-11832
| * | | | [ticket/11832] Use dirname(__FILE__)Nathan Guse2013-09-101-1/+1
| | | | | | | | | | | | | | | | | | | | PHPBB3-11832
| * | | | [ticket/11832] Use $phpbb_filesystem instead of the container in append_sidNathan Guse2013-09-101-1/+3
| | | | | | | | | | | | | | | | | | | | PHPBB3-11832
| * | | | Revert "[ticket/11832] Make $phpbb_container a global initiated by the ↵Nathan Guse2013-09-105-27/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | framework" This reverts commit 5e09afa0bc3ff9014812282fd4454f0df54b9dfd.
| * | | | [ticket/11832] Make $phpbb_container a global initiated by the frameworkNathan Guse2013-09-095-11/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Setup common items needed from the container (e.g. filesystem) PHPBB3-11832
| * | | | [ticket/11832] Fix log testsNathan Guse2013-09-091-1/+3
| | | | | | | | | | | | | | | | | | | | PHPBB3-11832
| * | | | [ticket/11832] update_web_root_path helper and testsNathan Guse2013-09-091-0/+70
| | | | | | | | | | | | | | | | | | | | PHPBB3-11832
| * | | | [ticket/11832] Inject dependencies for phpbb_get_web_root_path (also moving)Nathan Guse2013-09-096-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Function moved from phpbb_get_web_root_path to filesystem::get_web_root_path PHPBB3-11832
* | | | | Merge remote-tracking branch 'remotes/upstream/develop-olympus' into developNathan Guse2013-09-131-1/+1
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * remotes/upstream/develop-olympus: [ticket/11831] getAttribute was replaced with attr [ticket/11831] Update fabpot/goutte to 1.0.* Conflicts: phpBB/composer.lock
| * | | | | [ticket/11831] getAttribute was replaced with attrNathan2013-09-061-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11831
* | | | | | Merge remote-tracking branch 'imkingdavid/ticket/11824' into developJoas Schilling2013-09-131-6/+50
|\ \ \ \ \ \ | | |_|_|/ / | |/| | | / | |_|_|_|/ |/| | | |
| * | | | [ticket/11824] Reorganize test fileDavid King2013-09-121-18/+17
| | | | | | | | | | | | | | | | | | | | PHPBB3-11824
| * | | | [ticket/11824] Add tests for urls with mod_rewrite enabledDavid King2013-09-061-3/+48
| | | | | | | | | | | | | | | | | | | | PHPBB3-11824
| * | | | [ticket/11824] Add option for mod_rewriteDavid King2013-09-031-17/+17
| | |/ / | |/| | | | | | | | | | PHPBB3-11824
* | | | [ticket/11843] Added newlines and included numbers in the DEFINE vars testrechosen2013-09-132-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Per suggestion of nickvergessen, I added newlines in the DEFINE variables with underscores test. Now if the test fails, it's easier to spot which part is failing. Also added a test for DEFINE variables containing numbers. PHPBB3-11843
* | | | [ticket/11843] Add checking DEFINE variables with underscores to template_testrechosen2013-09-132-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | To prevent the underscore in DEFINE variables from being forgotten again, the template tests now test INCLUDEing a file based on the contents of a DEFINE variable with underscores in it. PHPBB3-11843
* | | | Merge pull request #1620 from EXreaction/ticket/11745David King2013-09-121-0/+29
|\ \ \ \ | | | | | | | | | | Group join approved notification
| * | | | [ticket/11745] Add test for group request approvedNathan Guse2013-07-271-0/+29
| | | | | | | | | | | | | | | | | | | | PHPBB3-11745
* | | | | Merge pull request #1617 from EXreaction/ticket/11744David King2013-09-126-254/+365
|\ \ \ \ \ | |/ / / / | | | | | [ticket/11744] Group join request notification
| * | | | [ticket/11744] Helper function to assert notifications in base testNathan Guse2013-07-273-168/+145
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This also fixes tests PHPBB3-11744
| * | | | [ticket/11744] Copyright yearNathan Guse2013-07-271-1/+1
| | | | | | | | | | | | | | | | | | | | PHPBB3-11744
| * | | | [ticket/11744] Fix tests for postgresqlNathaniel Guse2013-07-263-50/+31
| | | | | | | | | | | | | | | | | | | | PHPBB3-11744
| * | | | [ticket/11744] spellingNathaniel Guse2013-07-261-1/+1
| | | | | | | | | | | | | | | | | | | | PHPBB3-11744
| * | | | [ticket/11744] Empty notifications tables after testing themNathaniel Guse2013-07-261-0/+9
| | | | | | | | | | | | | | | | | | | | PHPBB3-11744
| * | | | [ticket/11744] Tables are not truncated in some dbms during testsNathaniel Guse2013-07-262-11/+8
| | | | | | | | | | | | | | | | | | | | PHPBB3-11744
| * | | | [ticket/11744] Fix functional test case that's failingNathaniel Guse2013-07-261-6/+3
| | | | | | | | | | | | | | | | | | | | PHPBB3-11744
| * | | | [ticket/11744] Include onceNathaniel Guse2013-07-261-3/+3
| | | | | | | | | | | | | | | | | | | | PHPBB3-11744
| * | | | [ticket/11744] CleanupNathaniel Guse2013-07-261-3/+2
| | | | | | | | | | | | | | | | | | | | PHPBB3-11744
| * | | | [ticket/11744] Group request testNathaniel Guse2013-07-262-0/+127
| | | | | | | | | | | | | | | | | | | | PHPBB3-11744
| * | | | [ticket/11744] Create base notification test class for setupNathaniel Guse2013-07-262-83/+107
| | | | | | | | | | | | | | | | | | | | PHPBB3-11744
* | | | | Merge branch 'develop' of github.com:phpbb/phpbb3 into ticket/11816Nathan Guse2013-09-125-1/+224
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # By Joseph Warner (187) and others # Via Nathan Guse (6) and others * 'develop' of github.com:phpbb/phpbb3: (195 commits) [ticket/11828] Fix greedy operators in lexer [ticket/11835] Fix ucp_auth_link adding in migration [prep-release-3.0.12] Remove changelog entry for ticket that was not resolved. [ticket/develop/11832] Fix path detection [feature/oauth] Fix tabindex [ticket/9550] Add the core.viewtopic_post_rowset_data event to viewtopic.php [ticket/11829] Use report_closed to determine status in MCP report_details [feature/oauth] Fix bug on ucp_auth_link related to error display [feature/oauth] More small fixes [feature/oauth] More minor changes from review [feature/oauth] Fix small bug introduced by update in OAuth library [feature/oauth] Fix small issues on ucp pages [feature/oauth] Fix typo in OAuth logout method [feature/oauth] Make token storage service ignorant [feature/oauth] Update oauth::logout() to use clearAllTokens() [feature/oauth] Update storage implementation due to inteface change [feature/oauth] Update lusitanian/oauth to stable branch [ticket/11822] Use namespace lookup order for asset loading [feature/oauth] Update comment on oauth service exception [feature/oauth] Forgot to remove placeholder comment ... Conflicts: phpBB/phpbb/template/twig/lexer.php tests/template/template_test.php
| * | | | | [ticket/11828] Fix greedy operators in lexerNathan Guse2013-09-122-1/+2
| | |_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | Use lazy operators and use stricter validation PHPBB3-11828
| * | | | [feature/oauth] Merge branch 'develop' of git://github.com/phpbb/phpbb3 into ↵Joseph Warner2013-09-0667-385/+1757
| |\ \ \ \ | | | |/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | feature/oauth Conflicts: phpBB/composer.json phpBB/composer.lock phpBB/develop/create_schema_files.php phpBB/includes/ucp/ucp_register.php PHPBB3-11673
| * | | | [feature/oauth] More small fixesJoseph Warner2013-09-021-1/+1
| | | | | | | | | | | | | | | | | | | | PHPBB3-11673
| * | | | [feature/oauth] Make token storage service ignorantJoseph Warner2013-09-021-22/+22
| | | | | | | | | | | | | | | | | | | | PHPBB3-11673
| * | | | [feature/oauth] Fix remaining issues with token storageJoseph Warner2013-08-151-10/+15
| | | | | | | | | | | | | | | | | | | | PHPBB3-11673
| * | | | [feature/oauth] Refactor test to provide for easier to read testsJoseph Warner2013-08-141-12/+17
| | | | | | | | | | | | | | | | | | | | PHPBB3-11673
| * | | | [feature/oauth] Forgot new line characterJoseph Warner2013-08-011-1/+2
| | | | | | | | | | | | | | | | | | | | PHPBB3-11673
| * | | | [feature/oauth] Add tests for the new token methodsJoseph Warner2013-07-291-0/+40
| | | | | | | | | | | | | | | | | | | | PHPBB3-11673
| * | | | [feature/oauth] Refactor clear token test to get more useful output firstJoseph Warner2013-07-241-3/+6
| | | | | | | | | | | | | | | | | | | | PHPBB3-11673
| * | | | [feature/oauth] Fixes for problems found by testsJoseph Warner2013-07-241-1/+1
| | | | | | | | | | | | | | | | | | | | PHPBB3-11673