1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-05-20 14:29:48 +02:00

16659 Commits

Author SHA1 Message Date
Joas Schilling
a36defb10f [ticket/develop/11568] Fix some more tests in 3.1
PHPBB3-11568
2013-05-30 13:26:16 +02:00
Joas Schilling
4f6b12ae1d [ticket/develop/11568] Remove php extension parameter
We don't support that in 3.1 anymore

PHPBB3-11568
2013-05-30 10:49:13 +02:00
Joas Schilling
f1523944a0 [ticket/develop/11568] Remove unneccessary calls to assert_response_success()
PHPBB3-11568
2013-05-28 14:58:40 +02:00
Joas Schilling
467c4d62c4 [ticket/develop/11568] Do not directly access $client from tests
PHPBB3-11568
2013-05-28 14:55:04 +02:00
Joas Schilling
6d9888be65 Merge branch 'ticket/11568' into ticket/11568-develop
* 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
2013-05-28 14:51:06 +02:00
Joas Schilling
e84fb0c6ca [ticket/11568] Add method to get page content
PHPBB3-11568
2013-05-28 14:47:24 +02:00
Joas Schilling
0dd1bbf084 [ticket/11568] Allow different status codes
PHPBB3-11568
2013-05-28 14:38:28 +02:00
Joas Schilling
3d6620f0db [ticket/11568] Trim the output to allow Tabs before INCLUDE overall_header
PHPBB3-11568
2013-05-28 14:10:27 +02:00
Andreas Fischer
fc1c7211ab Merge remote-tracking branch 'nickvergessen/ticket/encryptedmind/11516' into develop
* nickvergessen/ticket/encryptedmind/11516:
  [ticket/11516] Upgrading the .live jquery function because it is deprecated.
2013-05-28 12:49:46 +02:00
Jesús Rafael Cova Huerta
7f82a95cb0 [ticket/11516] Upgrading the .live jquery function because it is deprecated.
I changed the .live function of jQuery for .on function because a user
reported that he had an error because of that, it showed that .live function
was deprecated, so I changed for .on that it's same but it work with new
jQuery versions.

PHPBB3-11516
2013-05-28 01:48:25 +02:00
Andreas Fischer
147d01f7ee Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/11580] Enable prefer-source option (should error way less)
  [ticket/11580] Enable --no-interaction option on composer for travis

Conflicts:
	.travis.yml
2013-05-28 01:17:32 +02:00
Andreas Fischer
a997768627 Merge remote-tracking branch 'nickvergessen/ticket/11580' into develop-olympus
* nickvergessen/ticket/11580:
  [ticket/11580] Enable prefer-source option (should error way less)
  [ticket/11580] Enable --no-interaction option on composer for travis
2013-05-28 01:15:02 +02:00
Joas Schilling
65307f1382 [ticket/11580] Enable prefer-source option (should error way less)
PHPBB3-11580
2013-05-27 23:48:04 +02:00
Joas Schilling
2d0fb52eaa [ticket/11580] Enable --no-interaction option on composer for travis
There is no interaction available on travis ;)

PHPBB3-11580
2013-05-27 23:35:57 +02:00
Joas Schilling
9be57ec076 [ticket/11568] Fix common_groups_test.php form handling
PHPBB3-11568
2013-05-27 23:10:08 +02:00
Joas Schilling
da98866c24 [ticket/11568] Make CookieJar static aswell
PHPBB3-11568
2013-05-27 23:10:08 +02:00
Joas Schilling
e77c8ee4ef [ticket/11568] Remove manual calls to assert_response_success()
PHPBB3-11568
2013-05-27 23:10:07 +02:00
Joas Schilling
135139aca9 [ticket/11568] Only use a static version of the client
PHPBB3-11568
2013-05-27 23:10:07 +02:00
Joas Schilling
f25389f94a [ticket/11568] Any output before the doc type means there was an error
Change is needed to allow "Warning:" in the HTML body

PHPBB3-11568
2013-05-27 23:10:07 +02:00
Joas Schilling
a3e5efc634 [ticket/11568] Set client manually so we can increase the cURL timeout
PHPBB3-11568
2013-05-27 23:10:06 +02:00
Joas Schilling
5dcf028cf0 [ticket/11568] Use Goutte Client to install the board for functional tests
PHPBB3-11568
2013-05-27 23:10:06 +02:00
Joas Schilling
a3c5809f94 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/11578] Add missing underscore after 'validate' function prefix
2013-05-27 23:07:06 +02:00
Joas Schilling
96b4066368 Merge remote-tracking branch 'marc1706/ticket/11578' into develop-olympus
* marc1706/ticket/11578:
  [ticket/11578] Add missing underscore after 'validate' function prefix
2013-05-27 23:07:00 +02:00
marc1706
b75f67231f [ticket/11578] Add missing underscore after 'validate' function prefix
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
2013-05-27 22:56:49 +02:00
Joas Schilling
8870d0701f Merge remote-tracking branch 'bantu/ticket/11573' into develop
* bantu/ticket/11573:
  [ticket/11573] Honor MySQL STRICT_TRANS_TABLES in phpbb_user_loader_test.
  [ticket/11573] Honor MySQL STRICT_TRANS_TABLES in test_style_select.
2013-05-27 18:20:44 +02:00
Joas Schilling
f0d8168e81 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/11576] MySQL unit tests: Enable STRICT_TRANS_TABLES and others.
2013-05-27 18:17:15 +02:00
Joas Schilling
cc68ea5f6f Merge remote-tracking branch 'bantu/ticket/11576' into develop-olympus
* bantu/ticket/11576:
  [ticket/11576] MySQL unit tests: Enable STRICT_TRANS_TABLES and others.
2013-05-27 18:17:07 +02:00
Joas Schilling
caf61700f9 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/11575] Correct test_cross_join() to test_order_lower().
2013-05-27 17:43:46 +02:00
Joas Schilling
49149c0d41 Merge remote-tracking branch 'bantu/ticket/11575' into develop-olympus
* bantu/ticket/11575:
  [ticket/11575] Correct test_cross_join() to test_order_lower().
2013-05-27 17:43:40 +02:00
Andreas Fischer
555f0529f2 [ticket/11573] Honor MySQL STRICT_TRANS_TABLES in phpbb_user_loader_test.
PHPBB3-11573
2013-05-27 15:47:19 +02:00
Andreas Fischer
c338dfcbf2 [ticket/11573] Honor MySQL STRICT_TRANS_TABLES in test_style_select.
PHPBB3-11573
2013-05-27 15:45:01 +02:00
Andreas Fischer
38022a6999 [ticket/11576] MySQL unit tests: Enable STRICT_TRANS_TABLES and others.
PHPBB3-11576
2013-05-27 15:34:05 +02:00
Andreas Fischer
8a13fff2aa [ticket/11575] Correct test_cross_join() to test_order_lower().
This test does not do any cross joining, it only tests ORDER BY LOWER(...).

PHPBB3-11575
2013-05-27 13:33:41 +02:00
Joas Schilling
0032651729 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [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().
2013-05-27 11:52:44 +02:00
Joas Schilling
f77111fe0e Merge remote-tracking branch 'remotes/bantu/ticket/11538' into develop-olympus
* 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().
2013-05-27 11:51:26 +02:00
Andreas Fischer
3faae5c98c [ticket/11538] Cut functional tests down a bit as these are more expensive.
PHPBB3-11538
2013-05-26 19:24:09 +02:00
Andreas Fischer
401e9466bf [ticket/11538] Compare to '' instead of using empty(), so '0' does not pass.
PHPBB3-11538
2013-05-26 19:24:09 +02:00
Andreas Fischer
e84f5db4f5 [ticket/11538] Add unit tests for phpbb_validate_hex_colour().
PHPBB3-11538
2013-05-26 19:24:09 +02:00
Andreas Fischer
06379aece8 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [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

Conflicts:
	phpBB/includes/functions_user.php
	phpBB/styles/prosilver/template/ucp_groups_manage.html
2013-05-26 19:19:08 +02:00
Andreas Fischer
2b356e766f Merge remote-tracking branch 'marc1706/ticket/11538' into develop-olympus
* 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
2013-05-26 18:24:29 +02:00
Andreas Fischer
62a751fa65 Merge remote-tracking branch 'Elsensee/ticket/11567' into develop
* Elsensee/ticket/11567:
  [ticket/11567] Renamed extension_manager variable to avoid fatal error
2013-05-26 15:30:32 +02:00
Oliver Schramm
bb67b07920 [ticket/11567] Renamed extension_manager variable to avoid fatal error
PHPBB3-11567
2013-05-26 13:12:13 +02:00
Andreas Fischer
64e2230d19 Merge remote-tracking branch 'cyberalien/ticket/11560' into develop
* cyberalien/ticket/11560:
  [ticket/11560] Fix jQuery link in installer
2013-05-24 22:00:10 +02:00
David King
4b0d51adea Merge remote-tracking branch 'EXreaction/ticket/11435-2' into develop
* EXreaction/ticket/11435-2:
  [ticket/11435] Enable spacing test as it should now pass
  [ticket/11435] Create new template filter option (cleanup)
2013-05-22 16:10:51 -04:00
Vjacheslav Trushkin
01fb9ea3e3 [ticket/11560] Fix jQuery link in installer
PHPBB3-11560
2013-05-22 21:05:25 +03:00
Nathaniel Guse
3ab222d1c7 Merge remote-tracking branch 'remotes/Senky/ticket/11010' into develop
# By Senky (19) and others
# Via Senky
* remotes/Senky/ticket/11010: (32 commits)
  [ticket/11010] properly tabifying 'max_autologin_time'
  [ticket/11010] resolving latest comments
  [ticket/11010] Fixes for number input in acp
  [ticket/11010] Fix input type for urls
  [ticket/11010] Fix email inputs
  [ticket/11010] updating tests
  [ticket/11010] dealing with dimensions problem, removing extra code
  [ticket/11010] Change input type to search for search forms
  [ticket/11010] Add all HTML5 input types to ACP
  [ticket/11010] Add HTML5 input types to installer
  [ticket/11010] validation to match type
  [ticket/11010] displaying min and max only if they are set
  [ticket/11010] fixing tests
  [ticket/11010] replacing maxlenght with max
  [ticket/11010] applying some of EXreaction notes
  [ticket/11010] Try to keep min < max.
  [ticket/11010] Mock user in order for the test to run standalone.
  [ticket/11010] Progress toward fixing the test suite.
  [ticket/11010] adding type="url" to 'site_home_url'
  [ticket/11010] fixing inputs types in memberlist_search.html
  ...
2013-05-21 09:49:53 -05:00
Senky
721bc03b2b [ticket/11010] properly tabifying 'max_autologin_time'
PHPBB3-11010
2013-05-21 11:57:33 +02:00
Senky
930f4c70ed [ticket/11010] resolving latest comments
PHPBB3-11010
2013-05-21 11:55:45 +02:00
Nathan Guse
fd4043526d Merge remote-tracking branch 'remotes/cyberalien/ticket/11279' into develop
# By Vjacheslav Trushkin
# Via Vjacheslav Trushkin
* remotes/cyberalien/ticket/11279:
  [ticket/11279] Log error in console
  [ticket/11279] Clearer AJAX errors
2013-05-20 14:51:05 -05:00
Vjacheslav Trushkin
67053d0b4e [ticket/11279] Log error in console
PHPBB-11279
2013-05-20 22:12:20 +03:00