Commit graph

2856 commits

Author SHA1 Message Date
Nathaniel Guse
881bc60fbc [feature/twig] Delete invalid constructs template test
Invalid tags is no longer a valid test (invalid tags are ignored)

Twig contains tests for loading files, so we should not need to test this

PHPBB3-11598
2013-06-24 21:55:45 -05:00
Marc Alexander
79dd44061b [ticket/11531] Add changes for supporting modified testing framework
Additionally, the groups avatar is deleted after the avatar tests in the
ucp groups page in order to prevent issues with other tests that expect
that no avatar has been set for the admin group.

PHPBB3-11531
2013-06-25 00:17:51 +02:00
Nathan Guse
a1f957af84 [feature/twig] Working on fixing tests
PHPBB3-11598
2013-06-24 15:28:54 -05:00
Nathan Guse
ff84aed0b2 Merge branch 'develop' of github.com:phpbb/phpbb3 into feature/twig
# By Dhruv (35) and others
# Via Andreas Fischer (15) and others
* 'develop' of github.com:phpbb/phpbb3: (75 commits)
  [ticket/10776] update min php version 5.3.3 in readme
  [ticket/11503] similar implementation for mssql_native and odbc
  [ticket/11603] Fix out dated comment
  [ticket/11603] Fix usage note
  [ticket/11604] Skip installer step where config.php is created.
  [ticket/11603] Throw RuntimeExceptions instead of using exit()
  [ticket/11603] Avoid using cURL
  [ticket/11604] Fix case where config.php is not generated by phpBB.
  [ticket/11604] Use variables for config.php filesnames.
  [ticket/11561] Specify used tables in notification fixture, so they are emptied
  [ticket/11094] Add textbox for jabber while memberlist search
  [ticket/10820] fix if condition to check for IE
  [ticket/11603] Split api_request into two functions (query only vs. full url)
  [ticket/11603] Fix spacing and add some comments
  [ticket/10820] Add additional check for IE in condition
  [ticket/11603] Fix github API calls
  [ticket/11603] Rename network to forks and fix handling
  [ticket/11603] Fix github api url and use curl with valid user agent
  [ticket/10820] Fix function docblock
  [ticket/10820] Inject IE version in function
  ...
2013-06-24 13:49:29 -05:00
Nathan Guse
2dd58413e2 [feature/twig] Fix controller/helper_url_test (missing globals)
PHPBB3-11598
2013-06-24 13:45:48 -05:00
Joseph Warner
80e2d65399 [feature/auth-refactor] Initial auth unit test provider_db
Initial work on a unit test for the provider_db login function.
Does not work currently.

PHPBB3-9734
2013-06-24 12:07:28 -04:00
Joas Schilling
bb59875236 Merge branch 'develop-olympus' into develop
Conflicts:
	tests/test_framework/phpbb_functional_test_case.php
2013-06-20 12:03:50 +02:00
Andreas Fischer
1af6dc22e2 [ticket/11604] Skip installer step where config.php is created.
PHPBB3-11604
2013-06-19 17:03:41 +02:00
Dhruv
d72b5aaf1b Merge remote-tracking branch 'nickvergessen/ticket/11561' into develop
# By Joas Schilling
# Via Joas Schilling
* nickvergessen/ticket/11561:
  [ticket/11561] Specify used tables in notification fixture, so they are emptied
2013-06-18 21:42:07 +05:30
Marc Alexander
2996120e97 Merge branch 'develop' of https://github.com/phpbb/phpbb3 into ticket/11531 2013-06-18 18:08:44 +02:00
Andreas Fischer
21f839494d [ticket/11604] Fix case where config.php is not generated by phpBB.
PHPBB3-11604
2013-06-18 16:02:33 +02:00
Andreas Fischer
516581c41e [ticket/11604] Use variables for config.php filesnames.
PHPBB3-11604
2013-06-18 15:04:48 +02:00
Joas Schilling
b8678f4678 [ticket/11561] Specify used tables in notification fixture, so they are emptied
PHPBB3-11561
2013-06-18 10:41:52 +02:00
Dhruv
773bcc1c9b Merge branch 'develop' into ticket/10820-develop
# By Marc Alexander (10) and Joas Schilling (2)
# Via Andreas Fischer (3) and Joas Schilling (1)
* develop:
  [ticket/11605] Remove unused copied_files property
  [ticket/11605] Use empty_dir to better delete files and dirs of extensions
  [ticket/11579] Add method for validating emails for valid MX and mark as slow
  [ticket/11579] Do not extend validate_data_helper
  [ticket/11579] Add missing commas to validate_username_test
  [ticket/11579] Rework calls to validate_data_helper
  [ticket/11579] Move simple tests into seperate files
  [ticket/11579] Use test case helper class and use assert prefix for method
  [ticket/11579] Move tests into seperate files depending on needed fixture
  [ticket/11579] Remove unnecessary globals from validate_password()
  [ticket/11579] Add remaining unit tests for validate_data functions
  [ticket/11579] Add basic set of unit tests for validate_data()
2013-06-13 22:05:01 +05:30
Dhruv
e8b535bf9b Merge branch 'develop' into ticket/10820-develop
# By Joas Schilling (146) and others
# Via Andreas Fischer (50) and others
* develop: (356 commits)
  [ticket/11599] Copy the forums into a static array for later reuse
  [ticket/11602] Do not call localize_errors() if avatars are disabled
  [ticket/11601] Add protected method for database sync and call it
  [ticket/11601] Split post_setup_synchronisation logic from xml parsing
  [ticket/11550] Specify a valid path so it's clearer that it must be a path
  [ticket/11550] Move comments to correct function
  [ticket/11550] We use a different fixture set for extension_acp_test.php
  [ticket/11550] Fixtures should only be directories not files
  [ticket/11550] Use new functionality from the test case helpers
  [ticket/11550] Move functionality for copying/restoring to test case helpers
  [ticket/11550] Fix copying the fixtures in extension_permission_lang_test.php
  [ticket/11543] Add more users so #hidden <> #normal
  [ticket/11590] Close database connections when tearDown() is called
  [ticket/develop/11543] Use plurals in develop
  [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()
  [ticket/11481] Move prepended slash from calls into function
  ...
2013-06-13 22:00:12 +05:30
Nathan Guse
38d8025f12 [feature/twig] Use phpbb_template_twig in tests
Replace all new phpbb_template( with new phpbb_template_twig(

PHPBB3-11598
2013-06-12 13:29:57 -05:00
Andreas Fischer
b4183eda0c Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/11579] Add method for validating emails for valid MX and mark as slow
  [ticket/11579] Do not extend validate_data_helper
  [ticket/11579] Add missing commas to validate_username_test
  [ticket/11579] Rework calls to validate_data_helper
  [ticket/11579] Move simple tests into seperate files
  [ticket/11579] Use test case helper class and use assert prefix for method
  [ticket/11579] Move tests into seperate files depending on needed fixture
  [ticket/11579] Remove unnecessary globals from validate_password()
  [ticket/11579] Add remaining unit tests for validate_data functions
  [ticket/11579] Add basic set of unit tests for validate_data()

Conflicts:
	tests/mock/cache.php
2013-06-11 18:46:30 +02:00
Andreas Fischer
30801e1f0a Merge remote-tracking branch 'marc1706/ticket/11579' into develop-olympus
* marc1706/ticket/11579:
  [ticket/11579] Add method for validating emails for valid MX and mark as slow
  [ticket/11579] Do not extend validate_data_helper
  [ticket/11579] Add missing commas to validate_username_test
  [ticket/11579] Rework calls to validate_data_helper
  [ticket/11579] Move simple tests into seperate files
  [ticket/11579] Use test case helper class and use assert prefix for method
  [ticket/11579] Move tests into seperate files depending on needed fixture
  [ticket/11579] Remove unnecessary globals from validate_password()
  [ticket/11579] Add remaining unit tests for validate_data functions
  [ticket/11579] Add basic set of unit tests for validate_data()
2013-06-11 18:34:36 +02:00
Andreas Fischer
97c29c3876 Merge remote-tracking branch 'nickvergessen/ticket/11605' into develop
* nickvergessen/ticket/11605:
  [ticket/11605] Remove unused copied_files property
  [ticket/11605] Use empty_dir to better delete files and dirs of extensions
2013-06-11 17:13:29 +02:00
Joas Schilling
d5f651c514 [ticket/11599] Copy the forums into a static array for later reuse
PHPBB3-11599
2013-06-11 16:16:17 +02:00
Joas Schilling
fa8d5c7d20 [ticket/11605] Remove unused copied_files property
PHPBB3-11605
2013-06-11 16:04:23 +02:00
Joas Schilling
d02f98c635 [ticket/11605] Use empty_dir to better delete files and dirs of extensions
PHPBB3-11605
2013-06-11 16:03:34 +02:00
Andreas Fischer
b74b84dbec Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/11601] Add protected method for database sync and call it
  [ticket/11601] Split post_setup_synchronisation logic from xml parsing
2013-06-11 14:39:50 +02:00
Andreas Fischer
949a443bfe Merge remote-tracking branch 'nickvergessen/ticket/11601' into develop-olympus
* nickvergessen/ticket/11601:
  [ticket/11601] Add protected method for database sync and call it
  [ticket/11601] Split post_setup_synchronisation logic from xml parsing
2013-06-11 14:39:43 +02:00
Andreas Fischer
fba093de05 Merge remote-tracking branch 'nickvergessen/ticket/11550' into develop
* nickvergessen/ticket/11550:
  [ticket/11550] Specify a valid path so it's clearer that it must be a path
  [ticket/11550] Move comments to correct function
  [ticket/11550] We use a different fixture set for extension_acp_test.php
  [ticket/11550] Fixtures should only be directories not files
  [ticket/11550] Use new functionality from the test case helpers
  [ticket/11550] Move functionality for copying/restoring to test case helpers
  [ticket/11550] Fix copying the fixtures in extension_permission_lang_test.php
2013-06-11 14:35:54 +02:00
Joas Schilling
33bce3fac6 [ticket/11601] Add protected method for database sync and call it
PHPBB3-11601
2013-06-11 13:26:17 +02:00
Joas Schilling
5e8054f045 [ticket/11601] Split post_setup_synchronisation logic from xml parsing
PHPBB3-11601
2013-06-11 13:24:55 +02:00
Joas Schilling
007cd61776 [ticket/11550] Specify a valid path so it's clearer that it must be a path
PHPBB3-11550
2013-06-11 11:37:28 +02:00
Joas Schilling
68d15f0f14 [ticket/11550] Move comments to correct function
PHPBB3-11550
2013-06-11 11:14:24 +02:00
Marc Alexander
3703de63dd [ticket/11600] Increase code test coverage of avatar manager
Currently, not all methods and their possible behaviors are tested with unit tests.
Add them for better code coverage.

PHPBB3-11600
2013-06-10 16:45:27 +02:00
Joas Schilling
0b3f182083 [ticket/11550] We use a different fixture set for extension_acp_test.php
PHPBB3-11550
2013-06-09 17:40:33 +02:00
Joas Schilling
7546c3a7a7 [ticket/11550] Fixtures should only be directories not files
PHPBB3-11550
2013-06-08 17:14:20 +02:00
Joas Schilling
a61ab1e5e4 [ticket/11550] Use new functionality from the test case helpers
Instead of duplicating the extension copy code, it is now in the helpers.
So we remove the code from existing tests.

PHPBB3-11550
2013-06-08 17:07:35 +02:00
Joas Schilling
c8ee6cb0c2 [ticket/11550] Move functionality for copying/restoring to test case helpers
PHPBB3-11550
2013-06-08 17:03:08 +02:00
Joas Schilling
3506408637 [ticket/11550] Fix copying the fixtures in extension_permission_lang_test.php
PHPBB3-11550
2013-06-08 17:03:08 +02:00
Nathaniel Guse
f0af81fb76 Merge remote-tracking branch 'remotes/nickv/ticket/develop/11543' into develop
# By Joas Schilling
# Via Joas Schilling
* remotes/nickv/ticket/develop/11543:
  [ticket/11543] Add more users so #hidden <> #normal
  [ticket/develop/11543] Use plurals in develop
  [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-07 09:08:54 -05:00
Nathaniel Guse
2dcf703493 Merge remote-tracking branch 'remotes/nickv/ticket/11543' into develop-olympus
# By Joas Schilling
# Via Joas Schilling
* remotes/nickv/ticket/11543:
  [ticket/11543] Add more users so #hidden <> #normal
  [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-07 09:07:48 -05:00
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