aboutsummaryrefslogtreecommitdiffstats
path: root/tests
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'develop-olympus' into developAndreas Fischer2012-05-132-2/+18
|\ | | | | | | | | * develop-olympus: [ticket/10891] Allow specifying test_config.php path via environment.
| * Merge remote-tracking branch 'p/ticket/10891' into develop-olympusAndreas Fischer2012-05-132-2/+18
| |\ | | | | | | | | | | | | | | | | | | | | | * p/ticket/10891: [ticket/10891] Allow specifying test_config.php path via environment. Conflicts: tests/RUNNING_TESTS.txt
| | * [ticket/10891] Allow specifying test_config.php path via environment.Oleg Pudeyev2012-05-112-2/+18
| | | | | | | | | | | | PHPBB3-10891
* | | Merge branch 'develop-olympus' into developAndreas Fischer2012-05-131-9/+13
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | * develop-olympus: [ticket/10892] Update wiki link to mediawiki. [ticket/10892] Add empty lines for consistency. [ticket/10892] Reformat RUNNING_TESTS.txt to 79 char lines. [ticket/10892] Reformat RUNNING_TESTS.txt to 80 char lines.
| * | Merge remote-tracking branch 'p/ticket/10892' into develop-olympusAndreas Fischer2012-05-131-9/+13
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | * p/ticket/10892: [ticket/10892] Update wiki link to mediawiki. [ticket/10892] Add empty lines for consistency. [ticket/10892] Reformat RUNNING_TESTS.txt to 79 char lines. [ticket/10892] Reformat RUNNING_TESTS.txt to 80 char lines.
| | * | [ticket/10892] Update wiki link to mediawiki.Oleg Pudeyev2012-05-111-1/+1
| | | | | | | | | | | | | | | | PHPBB3-10892
| | * | [ticket/10892] Add empty lines for consistency.Oleg Pudeyev2012-05-111-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Some headings had empty lines after them, some did not. Add missing empty lines. PHPBB3-10892
| | * | [ticket/10892] Reformat RUNNING_TESTS.txt to 79 char lines.Oleg Pudeyev2012-05-111-3/+3
| | | | | | | | | | | | | | | | PHPBB3-10892
| | * | [ticket/10892] Reformat RUNNING_TESTS.txt to 80 char lines.Patrick Webster2012-05-111-5/+7
| | |/ | | | | | | | | | PHPBB3-10892
* | | Merge branch 'develop-olympus' into developNils Adermann2012-05-111-1/+1
|\ \ \ | |/ / | | | | | | | | | * develop-olympus: [ticket/10889] Make default value for c_char_size a CHAR(4) as defined.
| * | [ticket/10889] Make default value for c_char_size a CHAR(4) as defined.Andreas Fischer2012-05-111-1/+1
| | | | | | | | | | | | PHPBB3-10889
* | | Merge branch 'develop-olympus' into developAndreas Fischer2012-05-112-45/+100
|\ \ \ | |/ / | | | | | | | | | | | | * develop-olympus: [ticket/10887] Add spaces. [ticket/10887] Split auto increment test from db tools test.
| * | [ticket/10887] Add spaces.Oleg Pudeyev2012-05-111-1/+1
| | | | | | | | | | | | PHPBB3-10887
| * | [ticket/10887] Split auto increment test from db tools test.Oleg Pudeyev2012-05-102-45/+100
| |/ | | | | | | | | | | | | | | | | | | | | Auto increment test does not need any particular columns and should not depend, in particular, on correct handling of binary data. This commit moves auto increment test into its own file and gives it its own table with a simple schema. PHPBB3-10887
* | Merge branch 'develop-olympus' into developAndreas Fischer2012-05-091-1/+27
|\ \ | |/ | | | | | | | | | | | | | | | | * develop-olympus: [ticket/10858] Move generic row seeking to DBAL [ticket/10858] Tests for row seeking with fetchfield() [ticket/10858] Fix MSSQL Native's row seeking behavior Conflicts: tests/dbal/select_test.php
| * [ticket/10858] Tests for row seeking with fetchfield()Patrick Webster2012-05-081-0/+26
| | | | | | | | PHPBB3-10858
| * [ticket/10492] Fix line endingsPatrick Webster2012-04-211-26/+26
| | | | | | | | PHPBB3-10492
| * [ticket/10492] Backporting functional testsPatrick Webster2012-04-214-0/+207
| | | | | | | | PHPBB3-10492
| * [ticket/10492] Separate config generation from the installerPatrick Webster2012-04-202-37/+50
| | | | | | | | PHPBB3-10492
* | [ticket/10756] Renaming phpbb_style_template to phpbb_templateVjacheslav Trushkin2012-04-192-2/+2
| | | | | | | | | | | | Renaming phpbb_style_template to phpbb_template PHPBB3-10756
* | [ticket/10756] Removing path provider from template classVjacheslav Trushkin2012-04-192-2/+2
| | | | | | | | | | | | Removing path provider from template class because it is not used by template class PHPBB3-10756
* | [ticket/10756] Renaming template classesVjacheslav Trushkin2012-04-192-3/+3
| | | | | | | | | | | | Renaming template classes from phpbb_style_template_ to phpbb_template_ PHPBB3-10756
* | [ticket/10783] Correctly add assets_version config var to includejs urlsNils Adermann2012-04-131-4/+4
| | | | | | | | PHPBB3-10783
* | Merge branch 'develop-olympus' into developNils Adermann2012-04-101-0/+11
|\ \ | |/ | | | | | | | | * develop-olympus: [ticket/10774] Correctly specify index name when creating unique index on MySQL. [ticket/10774] Add unit tests for UNIQUE index existence and creation.
| * [ticket/10774] Add unit tests for UNIQUE index existence and creation.Andreas Fischer2012-04-101-0/+11
| | | | | | | | PHPBB3-10774
* | [ticket/10665] New test class for templates with treeVjacheslav Trushkin2012-04-014-55/+35
| | | | | | | | | | | | New parent template test class for tests that use styles tree PHPBB3-10665
* | Merge remote-tracking branch 'upstream/develop' into ticket/10665Vjacheslav Trushkin2012-04-0111-33/+33
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * upstream/develop: [ticket/10733] Fixing test [ticket/10733] Removing static from data providers [ticket/10731] Fixed addquote() to work on opera browser. [ticket/10731] Fixed addquote() to work on opera browser. [Ticket/10675] Correct language string ATTACH_DISK_FULL [feature/event-dispatcher] Adding composer.phar to .gitignore for olympus [ticket/10705] Change WARNINGS_ZERO_TOTAL in subsilver2 [ticket/10705] Change WARNINGS_ZERO_TOTAL in prosilver [ticket/10705] Change WARNINGS_ZERO_TOTAL in en language [ticket/10675] Add disk full language string when posting attachments
| * | [ticket/10733] Fixing testVjacheslav Trushkin2012-04-011-7/+7
| | | | | | | | | | | | | | | | | | Changing expected and result in locator test PHPBB3-10733
| * | [ticket/10733] Removing static from data providersVjacheslav Trushkin2012-04-0111-26/+26
| | | | | | | | | | | | | | | | | | Removing static from data provider functions PHPBB3-10733
* | | [ticket/10665] INCLUDEJS unit testVjacheslav Trushkin2012-04-012-0/+53
| | | | | | | | | | | | | | | | | | Adding INLCUDEJS test PHPBB3-10665
* | | [ticket/10665] Changing template compiler testVjacheslav Trushkin2012-04-011-1/+1
|/ / | | | | | | | | | | Adding new constructor parameters to template compiler test PHPBB3-10665
* | [ticket/10733] Adding test for locatorVjacheslav Trushkin2012-04-011-0/+84
| | | | | | | | | | | | Adding test for $template->locate PHPBB3-10733
* | [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