aboutsummaryrefslogtreecommitdiffstats
path: root/tests/test_framework
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'develop-olympus' into developNils Adermann2013-07-131-0/+1
|\ | | | | | | | | * develop-olympus: [ticket/11686] Not checking for phpBB Debug errors on functional tests
| * [ticket/11686] Not checking for phpBB Debug errors on functional testsNathaniel Guse2013-07-131-0/+1
| | | | | | | | PHPBB3-11686
| * [ticket/10772] Remove 3.1 codeVjacheslav Trushkin2013-07-111-70/+51
| | | | | | | | PHPBB3-10772
* | Merge pull request #1541 from nickvergessen/ticket/11684Nathan Guse2013-07-131-2/+2
|\ \ | | | | | | [ticket/11684] Remove useless confirmation page after login and admin login
| * | [ticket/11684] Remove useless confirmation page after login and admin loginJoas Schilling2013-07-131-2/+2
| | | | | | | | | | | | PHPBB3-11684
* | | Merge pull request #1543 from nickvergessen/ticket/11685Nathan Guse2013-07-131-1/+1
|\ \ \ | | | | | | | | [ticket/11685] Remove logout confirmation page
| * | | [ticket/11685] Remove logout confirmation pageJoas Schilling2013-07-131-1/+1
| |/ / | | | | | | | | | PHPBB3-11685
* | | Merge remote-tracking branch 'phpbb/develop' into ticket/9657Joas Schilling2013-07-132-0/+106
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * phpbb/develop: (216 commits) [ticket/11626] Remove last reference to template in ldap [ticket/11626] Remove LDAP dependency on template [develop-olympus] Increment version number to 3.0.13-dev. [develop-olympus] Add changelog for 3.0.12 release. [develop-olympus] Bump version numbers for 3.0.12-RC1 release. [develop-olympus] Bumping version numbers to final for 3.0.12 releases. [ticket/11669] Fix PHP bug #55124 (recursive mkdir on /./) [ticket/11668] Run lint test at the end of the test suite [ticket/11548] Fix test errors in groups test on develop [ticket/11548] Check upload avatar URL the same way as in phpBB 3.0 [ticket/11548] Fix incorrect usage of array_map on acp groups page [ticket/11665] Fix test class name [ticket/11664] Stop creating php.html file in root path in tests [ticket/11665] Can't change file names already sent to set_filenames [ticket/11662] Typos: occured -> occurred [ticket/11662] Typos: occured -> occurred [ticket/11660] Fix bugs from bugs in #11651 (missing vars, db->sql_connect) [feature/auth-refactor] Add parent::setUp() in setUp() [feature/auth-refactor] Changes [feature/auth-refactor] DataProvider for acp_board test ...
| * | [ticket/11669] Fix PHP bug #55124 (recursive mkdir on /./)Nathaniel Guse2013-07-121-0/+3
| | | | | | | | | | | | PHPBB3-11669
| * | Merge branch 'develop-olympus' into developNathaniel Guse2013-07-111-0/+103
| |\ \ | | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | # By Vjacheslav Trushkin # Via Nathaniel Guse (1) and Vjacheslav Trushkin (1) * develop-olympus: [ticket/10772] Remove unnecessary comment [ticket/10772] Functional tests for forum style Conflicts: tests/functional/forum_style_test.php
| | * Merge remote-tracking branch 'remotes/cyberalien/ticket/10772' into ↵Nathaniel Guse2013-07-111-0/+103
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | develop-olympus # By Vjacheslav Trushkin # Via Vjacheslav Trushkin * remotes/cyberalien/ticket/10772: [ticket/10772] Remove unnecessary comment [ticket/10772] Functional tests for forum style [ticket/10772] Use forum specific style for trigger_error
| | | * [ticket/10772] Functional tests for forum styleVjacheslav Trushkin2013-05-161-0/+103
| | | | | | | | | | | | | | | | PHPBB3-10772
* | | | [ticket/9657] Add unit tests for softdeleting and moving posts/topicsJoas Schilling2013-07-121-9/+39
|/ / / | | | | | | | | | PHPBB3-9657
* | | Merge remote-tracking branch 'dhruvgoel92/ticket/9341' into developJoas Schilling2013-06-291-0/+101
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * dhruvgoel92/ticket/9341: [ticket/9341] Assert that page doesnt contain next or prev page posts [ticket/9341] Follow the Next/Prev link in tests follow the next/prev link and then assert if the page contains its last post or not [ticket/9341] remove PREV_PAGE tpl var used for backward compatability [ticket/9341] Add tests for checking Next and Previous template vars [ticket/9341] Move create_topic and post into functional test case [ticket/9341] Use U_PREVIOUS and U_NEXT in template files [ticket/9341] Correctly named template vars
| * | | [ticket/9341] Move create_topic and post into functional test caseDhruv2013-06-271-0/+101
| | | | | | | | | | | | | | | | | | | | | | | | | | | | create_topic and create_post are moved into functional test case so that they can be used by other tests as well PHPBB3-9341
* | | | Merge branch 'develop-olympus' into developJoas Schilling2013-06-201-10/+43
|\ \ \ \ | |/ / / |/| / / | |/ / | | | Conflicts: tests/test_framework/phpbb_functional_test_case.php
| * | [ticket/11604] Skip installer step where config.php is created.Andreas Fischer2013-06-191-20/+27
| | | | | | | | | | | | PHPBB3-11604
| * | [ticket/11604] Fix case where config.php is not generated by phpBB.Andreas Fischer2013-06-181-1/+23
| | | | | | | | | | | | PHPBB3-11604
| * | [ticket/11604] Use variables for config.php filesnames.Andreas Fischer2013-06-181-6/+10
| | | | | | | | | | | | PHPBB3-11604
* | | [ticket/11605] Remove unused copied_files propertyJoas Schilling2013-06-111-8/+2
| | | | | | | | | | | | PHPBB3-11605
* | | [ticket/11605] Use empty_dir to better delete files and dirs of extensionsJoas Schilling2013-06-111-23/+6
| | | | | | | | | | | | PHPBB3-11605
* | | Merge branch 'develop-olympus' into developAndreas Fischer2013-06-112-3/+39
|\ \ \ | |/ / | | | | | | | | | | | | * develop-olympus: [ticket/11601] Add protected method for database sync and call it [ticket/11601] Split post_setup_synchronisation logic from xml parsing
| * | [ticket/11601] Add protected method for database sync and call itJoas Schilling2013-06-111-0/+15
| | | | | | | | | | | | PHPBB3-11601
| * | [ticket/11601] Split post_setup_synchronisation logic from xml parsingJoas Schilling2013-06-111-3/+24
| | | | | | | | | | | | PHPBB3-11601
* | | [ticket/11550] Move comments to correct functionJoas Schilling2013-06-111-0/+8
| | | | | | | | | | | | PHPBB3-11550
* | | [ticket/11550] Use new functionality from the test case helpersJoas Schilling2013-06-081-1/+1
| | | | | | | | | | | | | | | | | | | | | Instead of duplicating the extension copy code, it is now in the helpers. So we remove the code from existing tests. PHPBB3-11550
* | | [ticket/11550] Move functionality for copying/restoring to test case helpersJoas Schilling2013-06-081-0/+44
| | | | | | | | | | | | PHPBB3-11550
* | | Merge remote-tracking branch 'remotes/upstream/develop-olympus' into developNathaniel Guse2013-06-061-0/+20
|\ \ \ | |/ / | | | | | | | | | | | | | | | # By Joas Schilling # Via Joas Schilling (1) and Nils Adermann (1) * remotes/upstream/develop-olympus: [ticket/11590] Close database connections when tearDown() is called
| * | [ticket/11590] Close database connections when tearDown() is calledJoas Schilling2013-06-071-0/+20
| | | | | | | | | | | | PHPBB3-11590
* | | Merge branch 'develop' of https://github.com/phpbb/phpbb3 into ↵Joas Schilling2013-06-071-2/+2
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ticket/11568-develop * 'develop' of https://github.com/phpbb/phpbb3: (29 commits) [ticket/11588] Also use version.phpbb.com in install_update.php. [ticket/11587] Add functional tests for group teampage settings [ticket/11538] Add admin as admins leader and moderator in memberlist_test [ticket/11587] Pass legend and teampage settings to group_create() [ticket/11586] Move $filedata['thumbnail'] to where it might be returned. [ticket/11586] Combine $filedata['post_attach'] assign into a single statement. [ticket/11586] Use a variable for $cat_id == ATTACHMENT_CATEGORY_IMAGE. [ticket/11586] Combine administrator/moderator checks together. [ticket/11583] Use a new lang key instead of giving the old one a new meaning. [ticket/11122] Add dhruv to active authors [ticket/11122] Remove Oleg and igorw from active authors [ticket/10840] Add check_form_key to acp_groups.php [ticket/11583] Allow FULLTEXT indexes on InnoDB when on MySQL 5.6.4 or higher. [ticket/11409] Add success message after updating group position settings [ticket/11549] Add functional test for ACP Extension Module with Template [ticket/11570] Fix link and make the notice more conspiciuous [ticket/11549] Do not set extension dir path for style in adm/index.php [ticket/11570] Add link back to update process [ticket/11569] Add type parameter and fix language variable [ticket/11569] Add parameter to URL and remove comment ... Conflicts: tests/functional/common_groups_test.php
| * | | [ticket/11538] Add admin as admins leader and moderator in memberlist_testMarc Alexander2013-06-041-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Removing the admin user from the admin and moderator group in memberlist_test potentially breaks other tests, i.e. the ucp groups test. PHPBB3-11538
* | | | Merge branch 'ticket/11568' into ticket/11568-developJoas Schilling2013-05-311-25/+36
|\ \ \ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * ticket/11568: [ticket/11568] Split status code and html debug assertion into two methods [ticket/11568] Add comma at end of array key-value couple [ticket/11568] Invert logic for asserting the response [ticket/11568] Use static calls for static methods Conflicts: tests/test_framework/phpbb_functional_test_case.php
| * | | [ticket/11568] Split status code and html debug assertion into two methodsJoas Schilling2013-05-311-18/+30
| | | | | | | | | | | | | | | | PHPBB3-11568
| * | | [ticket/11568] Add comma at end of array key-value coupleJoas Schilling2013-05-311-1/+1
| | | | | | | | | | | | | | | | PHPBB3-11568
| * | | [ticket/11568] Invert logic for asserting the responseJoas Schilling2013-05-311-4/+4
| | | | | | | | | | | | | | | | PHPBB3-11568
| * | | [ticket/11568] Use static calls for static methodsJoas Schilling2013-05-311-4/+4
| | | | | | | | | | | | | | | | PHPBB3-11568
* | | | Merge branch 'ticket/11568' into ticket/11568-developJoas Schilling2013-05-301-20/+4
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | * ticket/11568: [ticket/11568] Remove unused method [ticket/11568] Only assert string when doctype is there at all
| * | | [ticket/11568] Remove unused methodJoas Schilling2013-05-301-19/+0
| | | | | | | | | | | | | | | | PHPBB3-11568
| * | | [ticket/11568] Only assert string when doctype is there at allJoas Schilling2013-05-301-1/+4
| | | | | | | | | | | | | | | | PHPBB3-11568
* | | | [ticket/develop/11568] Remove php extension parameterJoas Schilling2013-05-301-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | We don't support that in 3.1 anymore PHPBB3-11568
* | | | Merge branch 'ticket/11568' into ticket/11568-developJoas Schilling2013-05-281-51/+131
|\ \ \ \ | |/ / / | | / / | |/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * ticket/11568: [ticket/11568] Add method to get page content [ticket/11568] Allow different status codes [ticket/11568] Trim the output to allow Tabs before INCLUDE overall_header [ticket/11568] Fix common_groups_test.php form handling [ticket/11568] Make CookieJar static aswell [ticket/11568] Remove manual calls to assert_response_success() [ticket/11568] Only use a static version of the client [ticket/11568] Any output before the doc type means there was an error [ticket/11568] Set client manually so we can increase the cURL timeout [ticket/11568] Use Goutte Client to install the board for functional tests Conflicts: tests/test_framework/phpbb_functional_test_case.php
| * | [ticket/11568] Add method to get page contentJoas Schilling2013-05-281-0/+10
| | | | | | | | | | | | PHPBB3-11568
| * | [ticket/11568] Allow different status codesJoas Schilling2013-05-281-2/+2
| | | | | | | | | | | | PHPBB3-11568
| * | [ticket/11568] Trim the output to allow Tabs before INCLUDE overall_headerJoas Schilling2013-05-281-1/+1
| | | | | | | | | | | | PHPBB3-11568
| * | [ticket/11568] Make CookieJar static aswellJoas Schilling2013-05-271-6/+7
| | | | | | | | | | | | PHPBB3-11568
| * | [ticket/11568] Only use a static version of the clientJoas Schilling2013-05-271-59/+60
| | | | | | | | | | | | PHPBB3-11568
| * | [ticket/11568] Any output before the doc type means there was an errorJoas Schilling2013-05-271-8/+6
| | | | | | | | | | | | | | | | | | Change is needed to allow "Warning:" in the HTML body PHPBB3-11568
| * | [ticket/11568] Set client manually so we can increase the cURL timeoutJoas Schilling2013-05-271-0/+7
| | | | | | | | | | | | PHPBB3-11568
| * | [ticket/11568] Use Goutte Client to install the board for functional testsJoas Schilling2013-05-271-39/+105
| | | | | | | | | | | | PHPBB3-11568
* | | Merge branch 'develop-olympus' into developJoas Schilling2013-05-271-0/+14
|\ \ \ | |/ / | | | | | | | | | * develop-olympus: [ticket/11576] MySQL unit tests: Enable STRICT_TRANS_TABLES and others.