Commit graph

3719 commits

Author SHA1 Message Date
Joas Schilling
1743e4282b Merge branch 'ticket/11543' into ticket/develop/11543
* ticket/11543:
  [ticket/11543] Add more users so #hidden <> #normal

Conflicts:
	tests/functions/obtain_online_test.php
2013-06-07 14:55:56 +02:00
Joas Schilling
d39ed5afc1 [ticket/11543] Add more users so #hidden <> #normal
PHPBB3-11543
2013-06-07 14:48:50 +02:00
Nathaniel Guse
f1d00fa647 Merge remote-tracking branch 'remotes/upstream/develop-olympus' into develop
# By Joas Schilling
# Via Joas Schilling (1) and Nils Adermann (1)
* remotes/upstream/develop-olympus:
  [ticket/11590] Close database connections when tearDown() is called
2013-06-06 19:32:59 -05:00
Joas Schilling
228c1075b7 [ticket/11590] Close database connections when tearDown() is called
PHPBB3-11590
2013-06-07 01:31:20 +02:00
Joas Schilling
1d7c80b912 Merge branch 'develop' of https://github.com/phpbb/phpbb3 into 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
2013-06-07 00:15:28 +02:00
Joas Schilling
d406dd99d8 [ticket/develop/11543] Use plurals in develop
PHPBB3-11543
2013-06-06 23:29:50 +02:00
Joas Schilling
74aec79551 Merge branch 'ticket/11543' into ticket/develop/11543
* ticket/11543:
  [ticket/11543] Use correct IP addresses and inject time for correct values
  [ticket/11543] Add unit tests for obtain_users_online_string()
  [ticket/11543] Add unit tests for obtain_users_online() with empty forum
  [ticket/11543] Add unit tests for obtain_users_online()
  [ticket/11543] Add unit tests for obtain_guest_count()
2013-06-06 22:58:26 +02:00
Joas Schilling
ba665412ea [ticket/11543] Use correct IP addresses and inject time for correct values
PHPBB3-11543
2013-06-06 22:54:18 +02:00
Joas Schilling
766be31f95 [ticket/11543] Add unit tests for obtain_users_online_string()
PHPBB3-11543
2013-06-06 22:54:17 +02:00
Joas Schilling
3301b01f4c [ticket/11543] Add unit tests for obtain_users_online() with empty forum
PHPBB3-11543
2013-06-06 22:54:17 +02:00
Joas Schilling
6b3758edd0 [ticket/11543] Add unit tests for obtain_users_online()
PHPBB3-11543
2013-06-06 22:54:17 +02:00
Joas Schilling
057bbfa240 [ticket/11543] Add unit tests for obtain_guest_count()
PHPBB3-11543
2013-06-06 22:54:17 +02:00
Marc Alexander
c6ba894acd [ticket/11579] Add method for validating emails for valid MX and mark as slow
A method for setting up the prerequisities also has been added in order to
reduce the amount of necessary code.

PHPBB3-11579
2013-06-05 17:40:45 +02:00
Marc Alexander
6a77ee1f30 [ticket/11579] Do not extend validate_data_helper
PHPBB3-11579
2013-06-05 17:05:10 +02:00
Dhruv
db5bff8715 [ticket/10820] Add test cases
More test cases to check against different versions

PHPBB3-10820
2013-06-05 02:22:51 +05:30
Dhruv
a8bb033095 [ticket/10820] Rename function
PHPBB3-10820
2013-06-05 00:57:25 +05:30
Dhruv
a8a1c75a70 [ticket/10820] Fix copyright
PHPBB3-10820
2013-06-05 00:40:19 +05:30
Dhruv
7abc85ceda [ticket/10820] Change function call in tests
PHPBB3-10820
2013-06-05 00:40:01 +05:30
Marc Alexander
495b22632c [ticket/11587] Add functional tests for group teampage settings
The group_legend and group_teampage settings, which are needed for the
teampage, are tested with these newly added functional tests.
Duplicate code has been reduced as much as possible.

PHPBB3-11587
2013-06-04 20:35:55 +02:00
Marc Alexander
71deb4dde7 [ticket/11538] Add admin as admins leader and moderator in memberlist_test
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
2013-06-04 17:16:22 +02:00
Marc Alexander
af8c4b2900 Merge branch 'develop' of https://github.com/phpbb/phpbb3 into ticket/11531 2013-06-03 22:42:49 +02:00
Marc Alexander
b288bd4414 [ticket/11579] Add missing commas to validate_username_test
PHPBB3-11579
2013-06-03 21:33:02 +02:00
Marc Alexander
11678678b8 [ticket/11579] Rework calls to validate_data_helper
PHPBB3-11579
2013-06-03 21:30:13 +02:00
Marc Alexander
c2bc82ebfd [ticket/11579] Move simple tests into seperate files
PHPBB3-11579
2013-06-03 16:15:08 +02:00
Marc Alexander
3487b70cc0 [ticket/11579] Use test case helper class and use assert prefix for method
PHPBB3-11579
2013-06-03 16:06:11 +02:00
Joas Schilling
8c4670eeb1 Merge branch 'ticket/11568' into ticket/11568-develop
* 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
2013-05-31 16:45:06 +02:00
Joas Schilling
6af5262fcc [ticket/11568] Split status code and html debug assertion into two methods
PHPBB3-11568
2013-05-31 16:27:52 +02:00
Joas Schilling
09a3877ae4 [ticket/11568] Add comma at end of array key-value couple
PHPBB3-11568
2013-05-31 16:20:20 +02:00
Joas Schilling
b2be82cd57 [ticket/11568] Invert logic for asserting the response
PHPBB3-11568
2013-05-31 16:19:19 +02:00
Joas Schilling
b7b81f6431 [ticket/11568] Use static calls for static methods
PHPBB3-11568
2013-05-31 16:16:41 +02:00
Joas Schilling
48036c6eda [ticket/11549] Add functional test for ACP Extension Module with Template
PHPBB3-11549
2013-05-31 14:25:47 +02:00
Marc Alexander
33a0859f4a [ticket/11579] Move tests into seperate files depending on needed fixture
PHPBB3-11579
2013-05-30 20:34:21 +02:00
Joas Schilling
5c046b9493 [ticket/develop/11568] Remove unneccessary second call with wrong arguments
PHPBB3-11568
2013-05-30 16:16:49 +02:00
Marc Alexander
3f657bc63e [ticket/11579] Add remaining unit tests for validate_data functions
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
2013-05-30 16:05:19 +02:00
Joas Schilling
9e438bd266 Merge branch 'ticket/11568' into ticket/11568-develop
* ticket/11568:
  [ticket/11568] Remove unused method
  [ticket/11568] Only assert string when doctype is there at all
2013-05-30 14:17:22 +02:00
Joas Schilling
b4d23fa551 [ticket/11568] Remove unused method
PHPBB3-11568
2013-05-30 14:16:31 +02:00
Joas Schilling
45c91be970 [ticket/11568] Only assert string when doctype is there at all
PHPBB3-11568
2013-05-30 14:12:08 +02:00
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
Marc Alexander
3d625ab0cf [ticket/11579] Add basic set of unit tests for validate_data()
This currently includes tests for the string, num, date, match, and
language iso validation functions.

PHPBB3-11579
2013-05-29 18:24:54 +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
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