Commit graph

3890 commits

Author SHA1 Message Date
Andreas Fischer
f2b174c8b5 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/11618] Replace glob() with scandir() and string matching

Conflicts:
	tests/template/template_test.php
2013-06-27 02:23:57 +02:00
Andreas Fischer
960b20e45b Merge remote-tracking branch 'Hardolaf/ticket/11618' into develop-olympus
* Hardolaf/ticket/11618:
  [ticket/11618] Replace glob() with scandir() and string matching
2013-06-27 02:08:48 +02:00
Joseph Warner
8e575487ff [ticket/11618] Replace glob() with scandir() and string matching
Removes glob from template tests as glob() does not work on all
systems according to PHP documentation as has been noticed by users.

PHPBB3-11618
2013-06-26 19:51:52 -04:00
Andreas Fischer
e0c572d1d8 Merge remote-tracking branch 'asperous/ticket/11615/creation_test' into develop-olympus
* asperous/ticket/11615/creation_test:
  [ticket/11615] Fix typo in creation_test
  [ticket/11615] Remove magic number in creation_test
  [ticket/11615] Rename class in file to match
  [ticket/11615] Rename init_test to creation_test for clarity
2013-06-27 01:21:28 +02:00
Andreas Fischer
d0f0704515 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/11615] Fix typo in creation_test
  [ticket/11615] Remove magic number in creation_test
  [ticket/11615] Rename class in file to match
  [ticket/11615] Rename init_test to creation_test for clarity
2013-06-27 01:12:34 +02:00
Andreas Fischer
95730c1ff1 Merge remote-tracking branch 'asperous/ticket/11615/creation_test' into develop-olympus
* asperous/ticket/11615/creation_test:
  [ticket/11615] Fix typo in creation_test
  [ticket/11615] Remove magic number in creation_test
  [ticket/11615] Rename class in file to match
  [ticket/11615] Rename init_test to creation_test for clarity
2013-06-27 01:09:52 +02:00
Dhruv
fe4bfd02a3 [ticket/10838] Updated RUNNING_TESTS.md
PHPBB3-10838
2013-06-27 01:52:22 +05:30
Dhruv
bd9ece7ab6 [ticket/9341] Add tests for checking Next and Previous template vars
PHPBB3-9341
2013-06-27 00:59:37 +05:30
Dhruv
1f989c6be7 [ticket/9341] Move create_topic and post into functional test case
create_topic and create_post are moved into functional test case
so that they can be used by other tests as well

PHPBB3-9341
2013-06-27 00:57:34 +05:30
Andy Chase
7ba81a293f [ticket/11615] Fix typo in creation_test
PHPBB3-11615
2013-06-26 11:49:37 -07:00
Andy Chase
4c432fecc7 [ticket/11615] Remove magic number in creation_test
Removing this magic number to its own variable
with clean multiplication makes it clear
what the number represents.

PHPBB3-11615
2013-06-26 11:49:36 -07:00
Andy Chase
c29cca1a75 [ticket/11615] Rename class in file to match
PHPBB3-11615
2013-06-26 11:49:35 -07:00
Andy Chase
a105a6d7a7 [ticket/11615] Rename init_test to creation_test for clarity
PHPBB3-11615
2013-06-26 11:49:34 -07:00
Joseph Warner
19bbf7b7de [feature/auth-refactor] Fix two session tests broken by changes
PHPBB3-9734
2013-06-26 11:33:17 -04:00
Nathaniel Guse
6c771a38de [feature/twig] Going back to Twig's handling of cache file names for now
My method was not working correctly, will work on it more later.

PHPBB3-11598
2013-06-25 19:24:32 -05:00
Nathaniel Guse
25f0ee9fb6 [feature/twig] Fixing template events test (and behavior)
According to the test, template event behavior was never correct.

Only ONE template event file is supposed to be included from EACH
extension. As it was before, EVERY matching template event file from
each extension was included (this was how it was designed).

E.g.
Event call in prosilver "foo"
Extension has template "foo" in prosilver AND all

foo from all would be included, then foo from prosilver would be included

This was clearly not designed correctly as only the most specific event
file from each extension should be loaded, otherwise events could only
ever be put in a single style tree (either only all, or only prosilver
and subsilver2 and any style that inherits from neither of those).
Otherwise the events would be duplicated on output (which is clearly not
desirable).

The Twig behavior already was correct as I designed it, so only the one
most specific template event file found would be included from each
extension. The tests had to be updated for the correct expected output.

PHPBB3-11598
2013-06-25 19:22:23 -05:00
Nathaniel Guse
1c8c03c4db [feature/twig] INCLUDEPHP token abs paths & fix test
PHPBB3-11598
2013-06-25 16:51:50 -05:00
Joseph Warner
5f3ed197e7 [feature/auth-refactor] Fix auth tests to use mock objects correctly
PHPBB3-9734
2013-06-25 16:26:20 -04:00
Joseph Warner
5444e5b683 [feature/auth-refactor] Test validate_session on provider_apache
Provides a test for the validate_session() method of
provider_apache.

PHPBB3-9734
2013-06-25 14:37:22 -04:00
Joseph Warner
9e04328545 [feature/auth-refactor] Test autologin() on provider_apache
Provides a test for the autologin() method of provider_apache
that assumes the user already exists in the database.

PHPBB3-9734
2013-06-25 14:25:45 -04:00
Joseph Warner
307dd9777b [feature/auth-refactor] Test login() for provider_apache
Provides a test for the login() method for provider_apache.
Appears to be failing due to an issue with the mock phpBB request
class.

PHPBB3-9734
2013-06-25 14:13:36 -04:00
Joseph Warner
e5de05d8db [feature/auth-refactor] Test for init on provider_apache
Provides a test for the init() method of provider_apache.
Appears to be failing due to an error with the mock request class.

PHPBB3-9734
2013-06-25 14:05:40 -04:00
Joseph Warner
91c80dfc8e [feature/auth-refactor] Skeleton of provider_apache_test
Creates a skeleton of the tests for provider_apache.

PHPBB3-9734
2013-06-25 13:38:01 -04:00
Joseph Warner
8e1a503f44 [feature/auth-refactor] Finish provider_db unit test for login
Finishes the provider_db unit test for login. The test currently
passes.

PHPBB3-9734
2013-06-25 13:23:57 -04:00
Marc Alexander
6fc997924c [ticket/11600] Use lowercase null and remove duplicate test cases
PHPBB3-11600
2013-06-25 11:44:37 +02:00
Marc Alexander
72377075f4 [ticket/11600] Use local variable for $user in test_localize_errors
PHPBB3-11600
2013-06-25 11:35:04 +02:00
Marc Alexander
25acf3f74c [ŧicket/11600] Split get driver tests into tests for all and only enabled ones
PHPBB3-11600
2013-06-25 11:31:15 +02:00
Nathaniel Guse
fe61527c52 [feature/twig] Remove duplicate test calls
PHPBB3-11598
2013-06-24 23:29:22 -05:00
Nathaniel Guse
dabc0edea2 [feature/twig] Delete template_spacing_test.php
No longer needed

PHPBB3-11598
2013-06-24 22:50:09 -05:00
Nathaniel Guse
1d6a51f51a [feature/twig] Delete template_locate_test.php
No longer needed

PHPBB3-11598
2013-06-24 22:44:57 -05:00
Nathaniel Guse
92391d2f4f [feature/twig] Correct template_inheritance_test.php
PHPBB3-11598
2013-06-24 22:44:12 -05:00
Nathaniel Guse
8bda356dab [feature/twig] Correct includejs test
PHPBB3-11598
2013-06-24 22:40:17 -05:00
Nathaniel Guse
814d57d201 [feature/twig] Delete template_compile_test.php
No longer necessary

PHPBB3-11598
2013-06-24 21:58:09 -05:00
Nathaniel Guse
d986e124fe [feature/twig] Delete renderer_eval_test.php
No longer necessary

PHPBB3-11598
2013-06-24 21:57:01 -05:00
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