aboutsummaryrefslogtreecommitdiffstats
path: root/tests
Commit message (Collapse)AuthorAgeFilesLines
* [feature/class-prefix] Rename user and session to phpbb_*Igor Wiedler2012-03-315-12/+7
| | | | PHPBB-10609
* [feature/merging-style-components] Fix for unit testsVjacheslav Trushkin2012-03-312-2/+2
| | | | | | Fixing typo in template unit tests PHPBB3-10632
* [feature/merging-style-components] Moving template initialization out of styleVjacheslav Trushkin2012-03-312-4/+4
| | | | | | Moving template initialization out of style constructor PHPBB3-10632
* [feature/merging-style-components] Initializing locator and provider separatelyVjacheslav Trushkin2012-03-312-2/+8
| | | | | | Moving locator and path provider initialization out of style class PHPBB3-10632
* Merge branch 'develop' into feature/merging-style-componentsVjacheslav Trushkin2012-03-316-23/+38
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * develop: (175 commits) [feature/ajax] Remove strange non-breaking spaces from approve button [feature/ajax] Add entirely unrelated but nice newlines [feature/ajax] Unify phpbb_json_response instantiation [feature/ajax] Fix acp_styles activate_deactivate ajax callback name [feature/ajax] Send correct activate/deactivate JSON response in acp_profile [ticket/10270] Alter background colors for posts [feature/ajax] Remove not working module enable/disable ajax code [feature/ajax] Replace static call to phpbb_request with OO [feature/ajax] Remove quick-reply AJAX handling until we have something good [ticket/10270] Changing close button for ajax popups [ticket/10270] Disabling links in disappearing content [ticket/10291] Fixed an AJAX bug on quick reply form submit. [ticket/10273] Fixed accepting / denying posts AJAX. [ticket/10272] Removed code that was prevent event propogation in AJAX. [ticket/10291] Fixed a bug in the quick reply AJAX. [feature/ajax] Handle acp_modules error cases with JSON response [feature/ajax] Fix filter check, quick mod tools data-attribute [feature/ajax] Use the error handler [feature/ajax] Generic error handling with a phpbb.alert box [feature/ajax] Change filter semantics, some minor adjustments ... Conflicts: phpBB/adm/style/acp_styles.html phpBB/includes/acp/acp_styles.php
| * Merge pull request #662 from imkingdavid/ticket/10586Igor Wiedler2012-03-305-23/+9
| |\ | | | | | | [ticket/10586] Use an abstract class that implements the interface
| | * [ticket/10586] Removed incorrect method callDavid King2012-03-285-11/+1
| | | | | | | | | | | | PHPBB3-10586
| | * [ticket/10586] Moved some loading stuff below extension controller, updated ↵David King2012-03-284-16/+12
| | | | | | | | | | | | | | | | | | tests PHPBB3-10586
| * | [feature/event-dispatcher] Fix copyright yearsIgor Wiedler2012-03-301-1/+1
| | | | | | | | | | | | PHPBB3-9550
| * | Merge remote-tracking branch 'upstream/develop' into feature/event-dispatcherIgor Wiedler2012-03-3014-0/+336
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * upstream/develop: (35 commits) [ticket/10730] Added label tag around "select" text in post splitting UI [ticket/10732] Add config_dev.php and config_test.php to .gitignore [ticket/10586] Added space in if statement [ticket/10586] Tidy up comments [task/php5.3] Updated range of tested PHP versions [task/php5.3] Looks like I missed a few places that needed PHP 5.2 changed to PHP 5.3.2 [task/php5.3] Changed minimum PHP requirement for Ascraeus to 5.3.2 [ticket/10129] Remove apostrophes and plurals in ACP user management -> permissions language file as per ticket. [ticket/10703] Added a condition to check if ext directory exists [ticket/10708] Check converted passwords for multi-byte characters [ticket/10586] Tests finally work (thanks naderman) [ticket/10586] Correctly purge board cache and don't rename install directory [ticket/10586] trying to get tests to work [ticket/10586] more work on getting tests to pass [ticket/10586] Tests are coming along, just a little more to go [ticket/10586] Rename install directory back to install/ after tests [ticket/10586] browse tests now work, but mine dont. at least we are making progress [ticket/10586] initial work on copying fixtures. Note that this depends on 10706 [ticket/10586] Adding the extensions used by the tests [ticket/10586] Now tests run, but fail. But here is what I have. ...
| * | | [feature/event-dispatcher] Change phpbb_event_dispatcher to inheritance, testsIgor Wiedler2012-03-241-0/+29
| | | | | | | | | | | | | | | | PHPBB3-9550
* | | | Merge remote-tracking branch 'upstream/develop' into ↵Vjacheslav Trushkin2012-03-2915-5/+337
|\ \ \ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | feature/merging-style-components * upstream/develop: (65 commits) [ticket/10730] Added label tag around "select" text in post splitting UI [ticket/10732] Add config_dev.php and config_test.php to .gitignore [ticket/10586] Added space in if statement [ticket/10586] Tidy up comments [task/php5.3] Updated range of tested PHP versions [task/php5.3] Looks like I missed a few places that needed PHP 5.2 changed to PHP 5.3.2 [task/php5.3] Changed minimum PHP requirement for Ascraeus to 5.3.2 [ticket/10723] Stop Travis running all tests on sqlite [ticket/10703] Added a condition to check if ext directory exists [task/travis] Refactor php version check for dbunit install [task/travis] Exclude functional and slow tests [ticket/10719] Revert "Skip functional tests on PHP 5.2" [task/travis-develop2] Update version from 5.3 to 5.3.2 [task/travis] Dropping support for 5.2 in develop branch [task/travis] Some more small travis fixes [task/travis] Rename travis phpunit config files [task/travis] Fixing some travis issues [ticket/10684] Adjust function and parameter name, minor changes. [task/travis] Add automated testing to readme [task/travis] Removing development information ... Conflicts: phpBB/install/database_update.php
| * | | Merge remote-tracking branch 'imkingdavid/ticket/10586' into developIgor Wiedler2012-03-2814-0/+336
| |\ \ \ | | |/ / | |/| / | | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * imkingdavid/ticket/10586: [ticket/10586] Added space in if statement [ticket/10586] Tidy up comments [ticket/10586] Tests finally work (thanks naderman) [ticket/10586] Correctly purge board cache and don't rename install directory [ticket/10586] trying to get tests to work [ticket/10586] more work on getting tests to pass [ticket/10586] Tests are coming along, just a little more to go [ticket/10586] Rename install directory back to install/ after tests [ticket/10586] browse tests now work, but mine dont. at least we are making progress [ticket/10586] initial work on copying fixtures. Note that this depends on 10706 [ticket/10586] Adding the extensions used by the tests [ticket/10586] Now tests run, but fail. But here is what I have. [ticket/10586] some bootstrap additions and test changes to try and make it work [ticket/10586] test stuff. does not work yet, still need to put phpBB objects in bootstrap.php [ticket/10586] Copy/paste fail fixed [ticket/10586] Sanitize periods from class names, use manager to get path. [ticket/10586] Removed file_exists() check because class_exists() covers that. [ticket/10586] Extension front controller
| | * [ticket/10586] Added space in if statementDavid King2012-03-281-1/+1
| | | | | | | | | | | | PHPBB3-10586
| | * [ticket/10586] Tests finally work (thanks naderman)David King2012-03-192-23/+12
| | | | | | | | | | | | PHPBB3-10586
| | * [ticket/10586] Correctly purge board cache and don't rename install directoryNils Adermann2012-03-194-20/+40
| | | | | | | | | | | | PHPBB3-10586
| | * [ticket/10586] trying to get tests to workDavid King2012-03-192-14/+19
| | | | | | | | | | | | PHPBB3-10586
| | * [ticket/10586] more work on getting tests to passDavid King2012-03-193-17/+9
| | | | | | | | | | | | PHPBB3-10586
| | * [ticket/10586] Tests are coming along, just a little more to goDavid King2012-03-195-32/+28
| | | | | | | | | | | | PHPBB3-10586
| | * [ticket/10586] Rename install directory back to install/ after testsDavid King2012-03-191-0/+11
| | | | | | | | | | | | PHPBB3-10586
| | * [ticket/10586] browse tests now work, but mine dont. at least we are making ↵David King2012-03-193-1/+44
| | | | | | | | | | | | | | | | | | progress PHPBB3-10586
| | * [ticket/10586] initial work on copying fixtures. Note that this depends on 10706David King2012-03-191-0/+33
| | | | | | | | | | | | PHPBB3-10586
| | * [ticket/10586] Adding the extensions used by the testsDavid King2012-03-1913-6/+137
| | | | | | | | | | | | PHPBB3-10586
| | * [ticket/10586] Now tests run, but fail. But here is what I have.David King2012-03-193-38/+24
| | | | | | | | | | | | PHPBB3-10586
| | * [ticket/10586] some bootstrap additions and test changes to try and make it workDavid King2012-03-192-4/+38
| | | | | | | | | | | | PHPBB3-10586
| | * [ticket/10586] test stuff. does not work yet, still need to put phpBB ↵David King2012-03-191-0/+96
| | | | | | | | | | | | objects in bootstrap.php
| * | [ticket/10719] Revert "Skip functional tests on PHP 5.2"Michael Cullum2012-03-221-5/+1
| |/ | | | | | | | | | | This reverts commit 9c861a0350ae67f06a38ee6efc890412a32751f4. PHPBB3-10719
* | [feature/merging-style-components] Updating test casesVjacheslav Trushkin2012-03-154-5/+5
| | | | | | | | | | | | Updating code in test cases for new template classes. PHPBB3-10632
* | [feature/merging-style-components] Creating style classVjacheslav Trushkin2012-03-152-8/+5
| | | | | | | | | | | | Creating phpbb_style class, changing template initialization to style initialization PHPBB3-10632
* | [feature/merging-style-components] Adjusting unit testsVjacheslav Trushkin2012-03-142-14/+28
| | | | | | | | | | | | Adjusting unit tests for new styles table structure PHPBB3-10632
* | [feature/merging-style-components] Renaming template classesVjacheslav Trushkin2012-03-144-9/+9
|/ | | | | | Changing template classes prefixes from phpbb_template to phpbb_style (for classes that will work with styles) or phpbb_style_template (for classes that are specific to templates) PHPBB3-10632
* Merge branch 'develop-olympus' into developOleg Pudeyev2012-03-081-0/+25
|\ | | | | | | | | | | | | | | | | | | | | | | * develop-olympus: [ticket/10653] Call get_row_count of base class in mysql get_estimated_row_count [ticket/9813] Only get posts table row count if we detected a fulltext index. [ticket/9813] Also use estimated row count of posts table for fulltext mysql. [ticket/10653] Fix parameter to substr() in unit tests. Should be 1, not -1. [ticket/10653] Unit tests for get_row_count() and get_estimated_row_count(). [ticket/10653] Add ability to count table rows to database abstraction layer. [ticket/9813] Use table status row count only if greater than 100000 or exact. [ticket/9813] Use SHOW TABLE STATUS to get search stats for native on MySQL.
| * [ticket/10653] Fix parameter to substr() in unit tests. Should be 1, not -1.Andreas Fischer2012-03-041-1/+1
| | | | | | | | PHPBB3-10653
| * [ticket/10653] Unit tests for get_row_count() and get_estimated_row_count().Andreas Fischer2012-03-041-0/+25
| | | | | | | | PHPBB3-10653
* | Merge remote-tracking branch 'cyberalien/feature/append_var' into developOleg Pudeyev2012-03-071-0/+36
|\ \ | | | | | | | | | | | | | | | * cyberalien/feature/append_var: [feature/append_var] Adding test case [feature/append_var] Adding append_var template class function
| * | [feature/append_var] Adding test caseVjacheslav Trushkin2012-03-081-0/+36
| | | | | | | | | | | | | | | | | | Adding test case for append_var PHPBB3-10666
* | | [ticket/10685] Refactor template test defaults for php 5.4 compatibility.Oleg Pudeyev2012-03-062-5/+13
|/ / | | | | | | PHPBB3-10685
* | Merge remote-tracking branch 'naderman/ticket/10663' into developAndreas Fischer2012-02-241-0/+0
|\ \ | | | | | | | | | | | | | | | * naderman/ticket/10663: [ticket/10663] Extension finder should not find subdirs with directory filter [ticket/10663] Adding nested directory to finder test
| * | [ticket/10663] Adding nested directory to finder testVjacheslav Trushkin2012-02-211-0/+0
| | | | | | | | | | | | | | | | | | Adding nested directory to finder test, triggering finder bug PHPBB3-10663
* | | Merge remote-tracking branch 'github-igorw/extensions-tests-mysq55' into developNils Adermann2012-02-212-0/+7
|\ \ \ | | | | | | | | | | | | | | | | * github-igorw/extensions-tests-mysq55: [ticket/10667] Fix tests under MySQL 5.5 strict mode
| * | | [ticket/10667] Fix tests under MySQL 5.5 strict modeIgor Wiedler2012-02-212-0/+7
| | | | | | | | | | | | | | | | PHPBB3-10667
* | | | [ticket/10655] Error in template inheritance testVjacheslav Trushkin2012-02-181-1/+1
| |/ / |/| | | | | | | | | | | | | | Fixing error in template inheritance test PHPBB3-10655
* | | Merge branch 'develop-olympus' into developOleg Pudeyev2012-02-101-18/+2
|\ \ \ | |/ / |/| / | |/ | | * develop-olympus: [ticket/10512] Call startup.php from tests/bootstrap.php
| * [ticket/10512] Call startup.php from tests/bootstrap.phpAndreas Fischer2012-02-041-18/+2
| | | | | | | | PHPBB3-10512
* | Merge remote-tracking branch 'imkingdavid/ticket/10535' into developOleg Pudeyev2012-02-031-2/+1
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | * imkingdavid/ticket/10535: [ticket/10535] Delete no longer needed email confirm language entries. [ticket/10535] Delete email confirm from installer [ticket/10535] Removed email confirm field from acp_users module [ticket/10535] Forgot a subsilver2 change. *doh* [ticket/10535] Removed email confirm from UCP, removed unused language entries [ticket/10535] Remove email confirm check on registration form
| * | [ticket/10535] Delete email confirm from installerp2011-12-281-2/+1
| | | | | | | | | | | | PHPBB3-10535
* | | [ticket/9916] Updating license in non-distributed filesUnknown2012-01-0237-37/+37
| | | | | | | | | | | | PHPBB3-9916
* | | Merge branch 'develop-olympus' into developAndreas Fischer2012-01-0245-45/+45
|\ \ \ | | |/ | |/| | | | | | | | | | | | | | | | | | | | | | * develop-olympus: [ticket/9916] Changing header in non-distributed files [ticket/9916] Changing coding guidelines license [ticket/9916] Updating License in the header Conflicts: tests/mock/cache.php
| * | [ticket/9916] Updating License in the headerUnknown2012-01-0245-45/+45
| | | | | | | | | | | | PHPBB3-9916
* | | [ticket/10507] develop does not have imagesets, fix lower test.Oleg Pudeyev2011-12-242-7/+0
| | | | | | | | | | | | PHPBB3-10507