aboutsummaryrefslogtreecommitdiffstats
path: root/tests
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'EXreaction/ticket/11701' into developJoas Schilling2013-08-0910-54/+68
|\ | | | | | | | | | | | | | | | | | | | | * EXreaction/ticket/11701: [ticket/11701] New line at EOF [ticket/11701] Test events in loops [ticket/11701] Refix regex for appending |length [ticket/11701] Fix regex for appending |length [ticket/11701] Fix loops var check [ticket/11701] Remove useless str_replace [ticket/11701] Loop variables are not passed correctly to events
| * [ticket/11701] New line at EOFNathaniel Guse2013-07-231-1/+1
| | | | | | | | PHPBB3-11701
| * [ticket/11701] Test events in loopsNathaniel Guse2013-07-233-0/+14
| | | | | | | | PHPBB3-11701
| * [ticket/11701] Fix loops var checkNathaniel Guse2013-07-237-54/+54
| | | | | | | | PHPBB3-11701
* | Merge remote-tracking branch 'nickvergessen/ticket/11574' into developDhruv2013-08-081-3/+3
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # By Joas Schilling (16) and Igor Wiedler (6) # Via Joas Schilling (5) and Igor Wiedler (2) * nickvergessen/ticket/11574: (22 commits) [ticket/11574] Remove install/udpate/new/ fallback from database_update.php [ticket/11574] Do not display incompatible package note after successful update [ticket/11574] Remove old "continue step"-message [ticket/11574] Change order of files and database update [ticket/11574] Fix more issues in the updater [ticket/11574] Add trailing slash for consistency [ticket/11574] Fix table prefix in database updater [ticket/11574] Fix various path issues in the updater [ticket/11574] Make install language filename less crazy [ticket/11574] Use alternate DI config file for updater [ticket/11574] Include normalizer so it loads form the correct directory [ticket/11574] Only fall back to install/update versions, when IN_INSTALL ;) [ticket/11574] Use log object instead of old function [ticket/11574] Include vendor into update packages [ticket/11574] Create phpbb_log object before using it. [ticket/11574] Add correct language parameter to return links [ticket/11574] Use request object rather then request_var function [ticket/11574] Load new language files whenever possible [ticket/11574] Require new files in install/index.php and add a class loader [ticket/11574] Require new files in database_update.php and add a class loader ...
| * \ Merge remote-tracking branch 'phpbb/develop' into ticket/11574Joas Schilling2013-07-3033-215/+1458
| |\ \ | | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * phpbb/develop: (130 commits) [ticket/11638] Changed the layout to match the other similar commits [ticket/11640] removed the space that I wonder what it was doing there. [ticket/11749] Move event after all template data has been defined [ticket/10917] Variable used only once so delete it [ticket/10917] Revert use of phpbb wrapper [ticket/11749] Template events for topic_list_row_pre/append [ticket/11749] PHP Events for viewforum.php [ticket/11749] PHP Events for search.php [ticket/11740] Update FAQ to include Ideas Centre [ticket/11062] If user's language is english there is no further work needed [ticket/11062] Load new strings from user's language file if provided [ticket/10917] Using phpbb wrapper [ticket/10917] Fixed notice that files are out of date when updating to an unreleased version [ticket/11741] Fix empty brackets and remove bullet [ticket/11638] Removed the unneeded reset. [ticket/11638] Use the $parse_flags like the other commits [ticket/11638] Reverted to use the $parse tags way as the other ones [ticket/11638] Updated: bitwise $parse_flags use optionset() [ticket/11656] Made the check for the bitfield just like other PR's [ticket/11667] Use @inheritdoc ...
| * | Merge remote-tracking branch 'upstream/develop' into ticket/11574Igor Wiedler2013-07-1494-673/+4040
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * upstream/develop: (575 commits) [ticket/11702] Fix forum_posts left over for link-click counts in viewforum.php [ticket/11696] Move file to new directory [ticket/11696] Rename constructor to __construct() [ticket/11696] Remove manual loading of db_tools in extension controller test [ticket/11696] Rename db_tools.php so it can be autoloaded [ticket/11698] Moving all autoloadable files to phpbb/ [ticket/11694] Do not locate assets with root path [ticket/11692] Don't update search_type in dev migration if already appended [ticket/11675] Fix template loop [ticket/11690] Old module class names may get autoloaded by class_exists [ticket/9649] Display information on index for moderators on unapproved posts [ticket/10999] Fix assets_version in ACP [prep-release-3.0.12] More changelog items for the 3.0.12 release. [ticket/11687] Add assets_version to phpbb_config [ticket/11686] Not checking for phpBB Debug errors on functional tests [ticket/11670] Consistency with logo: Replace "phpBB(tm)" with "phpBB(R)". [ticket/11674] Do not include vendor folder if there are no dependencies. [ticket/11685] Remove logout confirmation page [ticket/11684] Remove useless confirmation page after login and admin login [ticket/9657] Define user before injecting ... Conflicts: phpBB/includes/functions_container.php phpBB/install/database_update.php phpBB/install/index.php
| * | | [ticket/11574] Use alternate DI config file for updaterIgor Wiedler2013-07-131-3/+3
| | | | | | | | | | | | | | | | PHPBB3-11574
* | | | Merge remote-tracking branch 'asperous/ticket/11761' into developAndreas Fischer2013-08-061-3/+3
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | * asperous/ticket/11761: [ticket/11761] Serve blank file locally in functional test
| * | | | [ticket/11761] Serve blank file locally in functional testAndy Chase2013-08-061-3/+3
| | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Example.org no longer serves blank responses, failing functional tests. this patch creates a blank file and serve it locally during the test, instead of hitting the http://example.org servers kindly provided by IANA. PHPBB3-11761
* | | | Merge branch 'develop-olympus' into developJoas Schilling2013-08-031-0/+38
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | * develop-olympus: [ticket/11762] Added call to test class's parent::setUp(). [ticket/11762] Fixed test's filename [ticket/11762] Use the === operator to distinguish "0" from ""
| * | | [ticket/11762] Added call to test class's parent::setUp().s9e2013-08-031-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | Added call to test class's parent::setUp(). Updated copyright year. PHPBB3-11762
| * | | [ticket/11762] Fixed test's filenames9e2013-08-031-0/+0
| | | | | | | | | | | | | | | | PHPBB3-11762
| * | | [ticket/11762] Use the === operator to distinguish "0" from ""s9e2013-08-031-0/+36
| | | | | | | | | | | | | | | | PHPBB3-11762
* | | | Merge remote-tracking branch 'EXreaction/ticket/11718' into developAndreas Fischer2013-07-232-1/+6
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * EXreaction/ticket/11718: [ticket/11718] Quick test for fixes in ELSEIF [ticket/11718] Twig lexer only correcting statements in IF, not ELSEIF Conflicts: tests/template/template_test.php
| * | | | [ticket/11718] Quick test for fixes in ELSEIFNathaniel Guse2013-07-192-1/+6
| | |_|/ | |/| | | | | | | | | | PHPBB3-11718
* | | | Merge remote-tracking branch 'asperous/ticket/11620' into developAndreas Fischer2013-07-2320-204/+1014
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * asperous/ticket/11620: (46 commits) [ticket/11620] Whitespace and combine function into test_case [ticket/11620] Move check_ban_test functions to setUp/tearDown for clarity [ticket/11620] Changed incorrect global variable [ticket/11620] Minor indentation changes and comment clarity [ticket/11620] Expected and actual test conditions wrongly swapped [ticket/11620] Space between . in directory import concatenation [ticket/11620] Changes to match merge [ticket/11620] Changes for code guidelines consistency [ticket/11620] Fix a static calls to non-static for session captcha [ticket/11620] Cleanup creation_test that was renamed on a cherry-pick [ticket/11620] Update auth_provider for new interface [ticket/11620] Added garbage_collection_test [ticket/11620] Fixed check_ban_test errors with cache and ban warning message [ticket/11620] Fixed a typo on check_ban_test [ticket/11620] Refactored check_isvalid_test to use session_test_case [ticket/11615] Refactored isvalid test to be more imperative [ticket/11615] Rename continue -> check_isvalid for clarity [ticket/11620] Added a test for checking if users are banned [ticket/11620] Remove typo in beginning of session_key_test [ticket/11620] Typo in file name session_key_tests -> test ...
| * | | | [ticket/11620] Whitespace and combine function into test_caseAndy Chase2013-07-227-39/+30
| | | | | | | | | | | | | | | | | | | | PHPBB3-11620
| * | | | [ticket/11620] Move check_ban_test functions to setUp/tearDown for clarityAndy Chase2013-07-221-10/+26
| | | | | | | | | | | | | | | | | | | | PHPBB3-11620
| * | | | [ticket/11620] Changed incorrect global variableAndy Chase2013-07-221-2/+2
| | | | | | | | | | | | | | | | | | | | PHPBB3-11620
| * | | | [ticket/11620] Minor indentation changes and comment clarityAndy Chase2013-07-222-7/+5
| | | | | | | | | | | | | | | | | | | | PHPBB3-11620
| * | | | [ticket/11620] Expected and actual test conditions wrongly swappedAndy Chase2013-07-221-1/+1
| | | | | | | | | | | | | | | | | | | | PHPBB3-11620
| * | | | [ticket/11620] Space between . in directory import concatenationAndy Chase2013-07-229-9/+9
| | | | | | | | | | | | | | | | | | | | PHPBB3-11620
| * | | | [ticket/11620] Changes to match mergeAndy Chase2013-07-222-1/+4
| | | | | | | | | | | | | | | | | | | | PHPBB3-11620
| * | | | Merge branch 'develop' into ticket/11620Andy Chase2013-07-2295-586/+3863
| |\ \ \ \
| * | | | | [ticket/11620] Changes for code guidelines consistencyAndy Chase2013-07-223-13/+15
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11620
| * | | | | [ticket/11620] Cleanup creation_test that was renamed on a cherry-pickasperous2013-07-221-69/+0
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11620
| * | | | | [ticket/11620] Update auth_provider for new interfaceasperous2013-07-221-1/+6
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11620
| * | | | | [ticket/11620] Added garbage_collection_testasperous2013-07-222-0/+121
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11620
| * | | | | [ticket/11620] Fixed check_ban_test errors with cache and ban warning messageasperous2013-07-221-6/+18
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11620
| * | | | | [ticket/11620] Fixed a typo on check_ban_testasperous2013-07-221-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11620
| * | | | | [ticket/11620] Refactored check_isvalid_test to use session_test_caseasperous2013-07-221-20/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since the continue->isvalid refactoring is now in a branch with the session_test_case framework, this test can be refactored to use that framework. PHPBB3-11620
| * | | | | [ticket/11615] Refactored isvalid test to be more imperativeAndy Chase2013-07-222-85/+63
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Refactoring the continue/is_valid test to remove the confusing data provider work around, while still keeping redundancies down to a minimum. PHPBB3-11615
| * | | | | [ticket/11615] Rename continue -> check_isvalid for clarityAndy Chase2013-07-221-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11615
| * | | | | [ticket/11620] Added a test for checking if users are bannedasperous2013-07-223-0/+121
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11620
| * | | | | [ticket/11620] Remove typo in beginning of session_key_testasperous2013-07-221-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11620
| * | | | | [ticket/11620] Typo in file name session_key_tests -> testasperous2013-07-221-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11620
| * | | | | [ticket/11620] Added a session key reset testasperous2013-07-221-5/+28
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11620
| * | | | | [ticket/11620] Added manual key testasperous2013-07-222-0/+72
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11620
| * | | | | [ticket/11620] Cherry-Pick merge tests from session-storage-cacheAndy Chase2013-07-222-7/+57
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11620
| * | | | | [ticket/11620] Abstracted session setUp into a test_case classasperous2013-07-225-56/+35
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When defining a database test case with a setUp function, it is important to call the parent's setup function, because that is when the database is setup. PHPBB3-11620
| * | | | | [ticket/11620] Removed unnecessary lines and whitespaceAndy Chase2013-07-092-10/+4
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11620
| * | | | | [ticket/11620] Rename provider -> mock_auth_providerAndy Chase2013-07-082-3/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Rename the class and file name to better match what the class is mocking, as well as implement the interface of that class. PHPBB3-11620
| * | | | | [ticket/11620] Minor changes to tests for coding standardsAndy Chase2013-07-084-20/+28
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11620
| * | | | | [ticket/11620] More mock provider methodsAndy Chase2013-07-081-3/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The mock provider object now better matches the interface given for providers. PHPBB3-11620
| * | | | | [ticket/11620] Added validate_session to provider.Andy Chase2013-07-051-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11620
| * | | | | [ticket/11620] Implemented a provider mock object.Andy Chase2013-07-052-1/+34
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Due to an auth_refactor, there is a new dependency in session.php on phpbb_container and a provider. For purposes of testing, implemented a simple one. PHPBB3-11620
| * | | | | [ticket/11620] Reworked create_test without data providerAndy Chase2013-07-051-42/+11
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11620
| * | | | | [ticket/11620] Add create_test with test for bot detectionAndy Chase2013-07-052-10/+102
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added a test for the creation of a session with a simple test for detecting whether a bot is present. PHPBB3-11620
| * | | | | [ticket/11620] Fix typo and confusingly named testAndy Chase2013-07-051-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11620