Commit graph

113 commits

Author SHA1 Message Date
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
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
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
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
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
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
da98866c24 [ticket/11568] Make CookieJar static aswell
PHPBB3-11568
2013-05-27 23:10:08 +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
David King
d8ed228ddf Merge remote-tracking branch 'EXreaction/ticket/11415' into develop
* EXreaction/ticket/11415:
  [ticket/11415] Add test for find_from_extension()
  [ticket/11415] Send the extension base the finder rather than the manager
  [ticket/11415] Create function in finder find_from_extension
  [ticket/11415] Fix ext.manager constructor in tests
  [ticket/11415] Make migrator/ext.manager dependencies of the base ext class
  [ticket/11415] Remove migrator dependency from extension manager
  [ticket/11415] Move migrator to base extension class from ext.manager
  [ticket/11415] Move while loop from ext manager to acp_extensions.php
2013-05-18 11:20:47 -04:00
Marc Alexander
ac8e8a156a [ticket/11544] Add admin_login() method to 3.0 functional test case
This method is needed in order to be able to properly test acp functions.

PHPBB3-11544
2013-05-14 22:51:10 +02:00
Nathaniel Guse
1b34ddb330 [ticket/11415] Fix ext.manager constructor in tests
PHPBB3-11415
2013-05-03 09:10:54 -05:00
Nathaniel Guse
60e3272839 [ticket/11415] Remove migrator dependency from extension manager
PHPBB3-11415
2013-05-01 14:09:08 -05:00
Dhruv
2fa5f9591e [ticket/10325] add logout function in functional_test_case
PHPBB3-10325
2013-04-25 22:52:40 +05:30
Nathan Guse
f49993766e [ticket/11335] (more) Make php_ext 'php' not '.php'
PHPBB3-11335
2013-04-24 17:46:00 -05:00
Nils Adermann
3e32655c7f Merge pull request #1290 from nickvergessen/ticket/11362
Correctly sanitise the directory path in finder
2013-04-24 09:45:34 -07:00
Joas Schilling
423b310e2a [ticket/11362] Extension manager depends on filesystem
PHPBB3-11362
2013-04-17 18:43:19 +02:00
Andreas Fischer
fbe115b434 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/11493] add checks for Notice and Warning
  [ticket/11493] add check for phpBB Debug in functional tests
2013-04-15 14:27:52 -04:00
Dhruv
14071e6085 [ticket/11493] add checks for Notice and Warning
PHPBB3-11493
2013-04-15 22:02:21 +05:30
Dhruv
82a630cd64 [ticket/11493] add check for phpBB Debug in functional tests
PHPBB3-11493
2013-04-15 20:41:05 +05:30
Joas Schilling
7f527e8012 [ticket/11492] Fix issues with log object
PHPBB3-11492
2013-04-11 16:05:04 +02:00
Joas Schilling
59ad90b25c [ticket/11492] Add tests for removing/adding users
PHPBB3-11492
2013-04-11 15:20:14 +02:00
Joas Schilling
60713c8a20 [ticket/11492] Add functional test for empty teampage
PHPBB3-11492
2013-04-11 15:00:22 +02:00
Andreas Fischer
02817158fc [ticket/11460] Configure functional test board email using dummy SMTP data.
PHPBB3-11460
2013-03-22 22:42:05 +01:00
Andreas Fischer
15aec0bbb2 [ticket/11460] Add methods for checkbox handling to phpbb_functional_test_case.
PHPBB3-11460
2013-03-21 03:07:50 +01:00
Nathaniel Guse
e4f7828199 [ticket/11386] Send list of migrations instead of using load_migrations
Remove dependency of extension manager for migrator.

Keeping load_migrations function for others to use if they desire
but requiring the finder be sent to it in order to use it.

PHPBB3-11386
2013-03-03 19:54:22 -06:00
Nathaniel Guse
91be998223 [ticket/11386] Fix failing tests from constructor changes
PHPBB3-11386
2013-03-02 15:18:07 -06:00
Nathaniel Guse
8415ae839c [ticket/11386] Update tests with new constructors for ext.manager/migrator
PHPBB3-11386
2013-03-02 11:37:58 -06:00
Nathaniel Guse
193a3beb8f [feature/migrations] Fix failing tests (again)
PHPBB3-11318
2013-02-13 21:41:52 -06:00
Nathan Guse
8d3a82a4fa [feature/migrations] Make the container available to extension installers
This allows extensions to load and install migrations easily as per their
needs.

PHPBB3-11318
2013-02-06 11:31:49 -06:00
Igor Wiedler
0483971f77 [ticket/11305] Mock container for cache driver in functional create_user()
create_user has calls to fetch the cache driver from the container. This
PR mocks the container and returns a null cache driver in that case.

PHPBB3-11305
2013-01-02 21:44:25 +01:00
Andreas Fischer
cb7f6deb07 Merge remote-tracking branch 'p/ticket/10758' into develop
* p/ticket/10758:
  [ticket/10758] Add return to the other compat function.
  [ticket/10758] Add periods.
  [ticket/10758] Yes, only one empty line.
  [ticket/10758] Add deprecated tags.
  [ticket/10758] Add compat functions.
  [ticket/10758] Admin is not working yet.
  [ticket/10758] Test moderator and admin permissions.
  [ticket/10758] Check that acl was changed in the test.
  [ticket/10758] Extract obtain_user_data for the benefit of tests.
  [ticket/10758] Functional test for changing a user's permission.
  [ticket/10758] Spelling fix.
  [ticket/10758] Add a test for acp login.
  [ticket/10758] Dependency inject parameters into update_foes.
  [ticket/10758] Dependency inject parameters into cache_moderators.
2012-12-25 15:18:47 +01:00
Oleg Pudeyev
b6f40f7c33 [ticket/10758-upload] Convert error to a failure.
PHPBB3-10758
2012-12-20 20:42:06 -05:00
Oleg Pudeyev
ff83580af1 [ticket/10758] Add a test for acp login.
PHPBB3-10758
2012-12-15 16:50:28 -05:00
Oleg Pudeyev
1774dd2af4 [ticket/11015] Installer still needs 3.0-style dbms name.
PHPBB3-11015
2012-12-13 17:49:30 -05:00
Oleg Pudeyev
2d5ba0ebd7 Merge remote-tracking branch 'upstream/develop' into ticket/11015
* upstream/develop:
  [ticket/11262] Add .lock in cache directory to .gitignore
  [ticket/11265] Add assertions for board installation success.
  [ticket/11263] Fix PHP Notice: Undefined variable: extension_manager
  [ticket/10975] Add a test for viewing a profile.
  [ticket/10975] Test restricting by first character.
  [ticket/10975] Avoid rewriting global config twice.
  [ticket/10975] Test memberlist, not user creation.
  [ticket/10975] Some quick tests to check the memberlist behaviour
2012-12-13 17:43:57 -05:00
Andreas Fischer
93222cf396 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/11265] Add assertions for board installation success.

Conflicts:
	tests/test_framework/phpbb_functional_test_case.php
2012-12-13 23:42:39 +01:00
Oleg Pudeyev
789c04b900 [ticket/11265] Add assertions for board installation success.
PHPBB3-11265
2012-12-13 15:42:00 -05:00
Oleg Pudeyev
aae7a81270 Merge remote-tracking branch 'upstream/develop' into ticket/11015
* upstream/develop: (101 commits)
  [ticket/10491] Make recreate_database static.
  [ticket/11088] Pass required objects in as arguments
  [ticket/11088] Globalize objects in new permission function
  [ticket/11088] Move permission creation to a function
  [ticket/11088] Copy a_styles permission for a_extensions
  [ticket/11088] Remove extraneous word from sentence in comment
  [ticket/11088] Changed "file extensions" to "attachment extensions"
  [ticket/11088] Fix the database updater to correctly manipulate the modules
  [ticket/11088] Put language pack module move below extension module creation
  [ticket/11088] Untested, progress on update script
  [ticket/11088] Fix typo (period instead of comma)
  [ticket/11088] Untested progress for update script
  [ticket/11088] Added missing comma
  [ticket/11088] Removed added space
  [ticket/11088] Move style, extension and language pack management to customise
  [ticket/11243] Show download all link on all pages of topic with attachments
  [feature/template-events] Pass arguments in correct order.
  [feature/template-events] Pass arguments in correct order.
  [ticket/10491] Install board once per test run.
  [ticket/11257] Do not require set_name() method to exist
  ...
2012-12-13 07:56:40 -05:00