aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* [ticket/11579] Move tests into seperate files depending on needed fixtureMarc Alexander2013-05-308-499/+594
| | | | PHPBB3-11579
* [ticket/11579] Remove unnecessary globals from validate_password()Marc Alexander2013-05-301-1/+1
| | | | | | The globals $db and $user are not used in that function. PHPBB3-11579
* [ticket/11579] Add remaining unit tests for validate_data functionsMarc Alexander2013-05-304-62/+375
| | | | | | | | This now includes tests for usernames, passwords, emails, and jabber addresses. A few small changes had to be applied to phpbb_mock_cache and phpbb_mock_user in order to incorporate needed methods. PHPBB3-11579
* [ticket/11579] Add basic set of unit tests for validate_data()Marc Alexander2013-05-291-0/+252
| | | | | | | This currently includes tests for the string, num, date, match, and language iso validation functions. PHPBB3-11579
* Merge remote-tracking branch 'nickvergessen/ticket/11580' into develop-olympusAndreas Fischer2013-05-281-1/+1
|\ | | | | | | | | | | * nickvergessen/ticket/11580: [ticket/11580] Enable prefer-source option (should error way less) [ticket/11580] Enable --no-interaction option on composer for travis
| * [ticket/11580] Enable prefer-source option (should error way less)Joas Schilling2013-05-271-1/+1
| | | | | | | | PHPBB3-11580
| * [ticket/11580] Enable --no-interaction option on composer for travisJoas Schilling2013-05-271-1/+1
|/ | | | | | There is no interaction available on travis ;) PHPBB3-11580
* Merge remote-tracking branch 'marc1706/ticket/11578' into develop-olympusJoas Schilling2013-05-271-1/+1
|\ | | | | | | | | * marc1706/ticket/11578: [ticket/11578] Add missing underscore after 'validate' function prefix
| * [ticket/11578] Add missing underscore after 'validate' function prefixmarc17062013-05-271-1/+1
|/ | | | | | | | The underscore after the 'validate' function prefix for the older functions was dropped by accident in PR #1407. This patch will add it back. PHPBB3-11578
* Merge remote-tracking branch 'bantu/ticket/11576' into develop-olympusJoas Schilling2013-05-271-0/+14
|\ | | | | | | | | * bantu/ticket/11576: [ticket/11576] MySQL unit tests: Enable STRICT_TRANS_TABLES and others.
| * [ticket/11576] MySQL unit tests: Enable STRICT_TRANS_TABLES and others.Andreas Fischer2013-05-271-0/+14
| | | | | | | | PHPBB3-11576
* | Merge remote-tracking branch 'bantu/ticket/11575' into develop-olympusJoas Schilling2013-05-271-1/+1
|\ \ | |/ |/| | | | | * bantu/ticket/11575: [ticket/11575] Correct test_cross_join() to test_order_lower().
| * [ticket/11575] Correct test_cross_join() to test_order_lower().Andreas Fischer2013-05-271-1/+1
| | | | | | | | | | | | This test does not do any cross joining, it only tests ORDER BY LOWER(...). PHPBB3-11575
* | Merge remote-tracking branch 'remotes/bantu/ticket/11538' into develop-olympusJoas Schilling2013-05-273-15/+126
|\ \ | |/ |/| | | | | | | | | * remotes/bantu/ticket/11538: [ticket/11538] Cut functional tests down a bit as these are more expensive. [ticket/11538] Compare to '' instead of using empty(), so '0' does not pass. [ticket/11538] Add unit tests for phpbb_validate_hex_colour().
| * [ticket/11538] Cut functional tests down a bit as these are more expensive.Andreas Fischer2013-05-261-14/+4
| | | | | | | | PHPBB3-11538
| * [ticket/11538] Compare to '' instead of using empty(), so '0' does not pass.Andreas Fischer2013-05-261-1/+1
| | | | | | | | PHPBB3-11538
| * [ticket/11538] Add unit tests for phpbb_validate_hex_colour().Andreas Fischer2013-05-261-0/+121
|/ | | | PHPBB3-11538
* Merge remote-tracking branch 'marc1706/ticket/11538' into develop-olympusAndreas Fischer2013-05-268-7/+145
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * marc1706/ticket/11538: [ticket/11538] Add optional switch as argument to hex colour validation [ticket/11538] Modify test colour values [ticket/11538] Limit comment in acp_groups to 80 characters per line [ticket/11538] Move group ID into abstract test class and add more test cases [ticket/11538] Merge calls to validate_data() in acp_groups [ticket/11538] Rename phpbb_validate_colour to phpbb_validate_hex_colour [ticket/11538] Use abstract class for functional test cases for group colour [ticket/11538] Add function phpbb_validate_colour for validating colours [ticket/11538] Make sure regex doesn't allow multiple color values [ticket/11538] Add tests for acp group manage page [ticket/11538] Simplify colour value check and remove support for '#' [ticket/11538] Fix incorrect regex and test for duplicate # in color string [ticket/11538] Use regex for testing color value and improve tests [ticket/11538] Make sure group color can't exceed maximum of 6 characters
| * [ticket/11538] Add optional switch as argument to hex colour validationMarc Alexander2013-05-193-5/+7
| | | | | | | | | | | | | | | | | | The value of $optional will decide whether an empty string will be treated as incorrect input or if it is allowed. The optional argument will default to false and therefore treat an empty string as incorrect unless explicitly told to not do so. PHPBB3-11538
| * [ticket/11538] Modify test colour valuesMarc Alexander2013-05-191-2/+3
| | | | | | | | PHPBB3-11538
| * [ticket/11538] Limit comment in acp_groups to 80 characters per lineMarc Alexander2013-05-191-4/+4
| | | | | | | | PHPBB3-11538
| * [ticket/11538] Move group ID into abstract test class and add more test casesMarc Alexander2013-05-193-3/+7
| | | | | | | | | | | | | | The group ID is defined in the abstract class now and additional test cases for hex colour values have been added. PHPBB3-11538
| * [ticket/11538] Merge calls to validate_data() in acp_groupsMarc Alexander2013-05-191-11/+12
| | | | | | | | PHPBB3-11538
| * [ticket/11538] Rename phpbb_validate_colour to phpbb_validate_hex_colourMarc Alexander2013-05-193-4/+5
| | | | | | | | PHPBB3-11538
| * [ticket/11538] Use abstract class for functional test cases for group colourMarc Alexander2013-05-173-63/+60
| | | | | | | | PHPBB3-11538
| * Merge branch 'develop-olympus' of https://github.com/phpbb/phpbb3 into ↵Marc Alexander2013-05-179-3/+235
| |\ | | | | | | | | | ticket/11538
| * | [ticket/11538] Add function phpbb_validate_colour for validating coloursMarc Alexander2013-05-163-3/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | It will be possible to use this function via the validate_data() function interface that has already been used previously. Thus, this new function will extend the capabilities of validate_data() to checking hex color values. PHPBB3-11538
| * | [ticket/11538] Make sure regex doesn't allow multiple color valuesMarc Alexander2013-05-154-2/+8
| | | | | | | | | | | | | | | | | | | | | This will now make sure that 'AAFF00' will be matched but strings like 'AAFF00 AABB00' will not. PHPBB3-11538
| * | [ticket/11538] Add tests for acp group manage pageMarc Alexander2013-05-141-0/+45
| | | | | | | | | | | | | | | | | | This will currently test if the colour check properly works. PHPBB3-11538
| * | [ticket/11538] Simplify colour value check and remove support for '#'Marc Alexander2013-05-145-21/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The input length for the hex color is now limited to 6 characters and the support for colors starting with a '#' has been dropped. The allowed input length of 7 in prosilver seems to have been a relict from old ages of phpBB3. In order to have proper support for correct checking of the colour value, the new code was also ported to the ACP groups manage page. The tests have been modified to reflect the changes to the behavior of the color check. Tests for the ACP will follow. PHPBB3-11538
| * | [ticket/11538] Fix incorrect regex and test for duplicate # in color stringMarc Alexander2013-05-142-1/+2
| | | | | | | | | | | | PHPBB3-11538
| * | [ticket/11538] Use regex for testing color value and improve testsMarc Alexander2013-05-143-42/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | | We are now using a regex with preg_match() in order to properly check if the entered color value is in hex color format or not. A proper error message is triggered if an incorrect color value is entered and the prepended '#' is removed if necessary. PHPBB3-11538
| * | [ticket/11538] Make sure group color can't exceed maximum of 6 charactersMarc Alexander2013-05-142-0/+71
| | | | | | | | | | | | | | | | | | | | | In order to prevent future issues with this, a basic set of functional tests for the UCP groups manage page have been added. PHPBB3-11538
* | | Merge remote-tracking branch 'remotes/imkingdavid/ticket/11551' into ↵Nathan Guse2013-05-202-2/+2
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | develop-olympus # By David King # Via David King * remotes/imkingdavid/ticket/11551: [ticket/11551] Fix error in system tab if get_remote_file returns empty string
| * | | [ticket/11551] Fix error in system tab if get_remote_file returns empty stringDavid King2013-05-202-2/+2
|/ / / | | | | | | | | | | | | | | | | | | | | | Currently a debug error is thrown. With this patch, it fails without keeping the admin from being able to access the rest of the System modules by showing a nicer error "Failed to obtain latest version information." PHPBB3-11551
* | | Merge remote-tracking branch 'marc1706/ticket/11537' into develop-olympusAndreas Fischer2013-05-191-9/+8
|\ \ \ | |_|/ |/| | | | | | | | * marc1706/ticket/11537: [ticket/11537] Adjust error message on ucp group manage to fit rest of ucp
| * | [ticket/11537] Adjust error message on ucp group manage to fit rest of ucpMarc Alexander2013-05-141-9/+8
| |/ | | | | | | | | | | | | The current look highly differed from the rest of the UCP. Additionally, this caused the error message to be hardly noticeable at all. PHPBB3-11537
* | Merge remote-tracking branch 'bantu/ticket/11547' into develop-olympusAndreas Fischer2013-05-171-0/+8
|\ \ | | | | | | | | | | | | * bantu/ticket/11547: [ticket/11547] Set MySQL charset to UTF8 in database_test_connection_manager.
| * | [ticket/11547] Set MySQL charset to UTF8 in database_test_connection_manager.Andreas Fischer2013-05-171-0/+8
| | | | | | | | | | | | PHPBB3-11547
* | | Merge remote-tracking branch 'nickvergessen/ticket/11542-2' into develop-olympusAndreas Fischer2013-05-172-7/+7
|\ \ \ | | | | | | | | | | | | | | | | * nickvergessen/ticket/11542-2: [ticket/11542] Use Czech as example as it contains non-latin characters
| * | | [ticket/11542] Use Czech as example as it contains non-latin charactersJoas Schilling2013-05-172-7/+7
|/ / / | | | | | | | | | PHPBB3-11542
* | | Merge remote-tracking branch 'marc1706/ticket/11544' into develop-olympusAndreas Fischer2013-05-171-0/+44
|\ \ \ | |/ / |/| | | | | | | | * marc1706/ticket/11544: [ticket/11544] Add admin_login() method to 3.0 functional test case
| * | [ticket/11544] Add admin_login() method to 3.0 functional test caseMarc Alexander2013-05-141-0/+44
| |/ | | | | | | | | | | This method is needed in order to be able to properly test acp functions. PHPBB3-11544
* | Merge remote-tracking branch 'nickvergessen/ticket/11542' into develop-olympusAndreas Fischer2013-05-172-0/+60
|\ \ | | | | | | | | | | | | | | | | | | * nickvergessen/ticket/11542: [ticket/11542] Add non-existing default value for language select [ticket/11542] Add lang_english_name to fixture [ticket/11542] Add unit tests for language_select()
| * | [ticket/11542] Add non-existing default value for language selectJoas Schilling2013-05-161-0/+1
| | | | | | | | | | | | PHPBB3-11542
| * | [ticket/11542] Add lang_english_name to fixtureJoas Schilling2013-05-151-0/+3
| | | | | | | | | | | | PHPBB3-11542
| * | [ticket/11542] Add unit tests for language_select()Joas Schilling2013-05-142-0/+56
| | | | | | | | | | | | PHPBB3-11542
* | | Merge remote-tracking branch 'galaxyAbstractor/ticket/11536' into ↵Andreas Fischer2013-05-161-2/+2
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | develop-olympus * galaxyAbstractor/ticket/11536: [ticket/11536] Fixed incorrect removal of "install" in script_path
| * | | [ticket/11536] Fixed incorrect removal of "install" in script_pathVictor Nagy2013-05-151-2/+2
| | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Earlier the script would incorrectly remove the word "install" from the script_path when trying to remove the last folder in the path named "/install". This would lead to issues when the path you are installing phpBB contained "install". For example "/install_test/install" would become "/_test". This change gets the parent folder instead of replacing all "install". $name contains /install_test/install/index.php from start and running dirname() gives /install_test/install. Running dirname once more gives the parent folder of install, /install_test. PHPBB3-11536
* | | Merge remote-tracking branch 'nickvergessen/ticket/11545' into develop-olympusAndreas Fischer2013-05-162-5/+26
|\ \ \ | | | | | | | | | | | | | | | | * nickvergessen/ticket/11545: [ticket/11545] Remove DIRECTORY_SEPARATOR dependency from is_absolute