1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-02-25 12:33:29 +01:00

1648 Commits

Author SHA1 Message Date
asperous
d533e8807c [ticket/11620] Added a test for checking if users are banned
PHPBB3-11620
2013-07-22 11:07:41 -07:00
asperous
016faad668 [ticket/11620] Remove typo in beginning of session_key_test
PHPBB3-11620
2013-07-22 11:07:40 -07:00
asperous
750ea77108 [ticket/11620] Typo in file name session_key_tests -> test
PHPBB3-11620
2013-07-22 11:07:40 -07:00
asperous
f5a09858d0 [ticket/11620] Added a session key reset test
PHPBB3-11620
2013-07-22 11:07:39 -07:00
asperous
f7da773c06 [ticket/11620] Added manual key test
PHPBB3-11620
2013-07-22 11:07:38 -07:00
Andy Chase
87e65224d4 [ticket/11620] Cherry-Pick merge tests from session-storage-cache
PHPBB3-11620
2013-07-22 11:07:17 -07:00
asperous
62d7a05700 [ticket/11620] Abstracted session setUp into a test_case class
When defining a database test case with a setUp function, it is important
to call the parent's setup function, because that is when the database is setup.

PHPBB3-11620
2013-07-22 10:53:52 -07:00
Nathan Guse
960c3bb4fb Merge pull request #1401 from marc1706/ticket/11531
[ticket/11531] Add basic set of functional tests for new avatar system
2013-07-22 10:25:32 -07:00
Marc Alexander
2eb32ef515 [ticket/11531] Check if uploaded avatar is properly displayed in tests
PHPBB3-11531
2013-07-22 13:38:19 +02:00
Andreas Fischer
8efca016fa Merge remote-tracking branch 'EXreaction/ticket/11707' into develop
* EXreaction/ticket/11707:
  [ticket/11707] Twig DEFINE not working as expected
2013-07-22 03:07:38 +02:00
Andreas Fischer
fb5c8957ec Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/11720] Add functional test for submitting report as user
  [ticket/11720] Do not call $captcha->validate if $captcha is not set
2013-07-22 00:51:03 +02:00
Andreas Fischer
90e532430c Merge branch 'prep-release-3.0.12' into develop-olympus
* prep-release-3.0.12:
  [ticket/11720] Add functional test for submitting report as user
  [ticket/11720] Do not call $captcha->validate if $captcha is not set
2013-07-22 00:50:49 +02:00
Marc Alexander
865bf0db3d [ticket/11720] Add functional test for submitting report as user
The already existing functional tests were not ran as the filename was
missing the appended "_test".

PHPBB3-11720
2013-07-21 18:50:06 +02:00
Marc Alexander
e48f0555e9 [ticket/11531] Reduced amount of avatar functional tests to minimum
The tests were reduced to only test one case that should be correct and one
that should fail. Different test cases have been split up over the specific
test files for the acp groups, acp users, ucp groups, and ucp users page.

PHPBB3-11531
2013-07-20 14:36:38 +02:00
Nathaniel Guse
375976eb38 [ticket/11707] Twig DEFINE not working as expected
PHPBB3-11707
2013-07-19 14:12:28 -05:00
Nathaniel Guse
1c59ad87b0 [ticket/11718] Quick test for fixes in ELSEIF
PHPBB3-11718
2013-07-19 13:34:08 -05:00
Marc Alexander
96989e536d [ticket/11531] Use abstract class for avatar tests and unify test cases
PHPBB3-11531
2013-07-17 23:55:20 +02:00
Joas Schilling
d6a747fbd0 [ticket/11582] Correctly add all required fixtures
PHPBB3-11582
2013-07-17 17:27:15 +02:00
Marc Alexander
bc6122b64f Merge branch 'develop' of https://github.com/phpbb/phpbb3 into ticket/11531 2013-07-14 16:51:46 -04:00
Joas Schilling
a9a6305d93 [ticket/11582] Fix little typo
PHPBB3-11582
2013-07-14 13:20:58 -04:00
Joas Schilling
e4a5ce307d [ticket/11582] Test the event and and fix it.
PHPBB3-11582
2013-07-14 12:55:03 -04:00
Joas Schilling
cfb13bb547 [ticket/11582] Fix extension permission tests
PHPBB3-11582
2013-07-14 12:02:48 -04:00
Igor Wiedler
f6865dc33a Merge remote-tracking branch 'upstream/develop' into ticket/11574
* upstream/develop: (575 commits)
  [ticket/11702] Fix forum_posts left over for link-click counts in viewforum.php
  [ticket/11696] Move file to new directory
  [ticket/11696] Rename constructor to __construct()
  [ticket/11696] Remove manual loading of db_tools in extension controller test
  [ticket/11696] Rename db_tools.php so it can be autoloaded
  [ticket/11698] Moving all autoloadable files to phpbb/
  [ticket/11694] Do not locate assets with root path
  [ticket/11692] Don't update search_type in dev migration if already appended
  [ticket/11675] Fix template loop
  [ticket/11690] Old module class names may get autoloaded by class_exists
  [ticket/9649] Display information on index for moderators on unapproved posts
  [ticket/10999] Fix assets_version in ACP
  [prep-release-3.0.12] More changelog items for the 3.0.12 release.
  [ticket/11687] Add assets_version to phpbb_config
  [ticket/11686] Not checking for phpBB Debug errors on functional tests
  [ticket/11670] Consistency with logo: Replace "phpBB(tm)" with "phpBB(R)".
  [ticket/11674] Do not include vendor folder if there are no dependencies.
  [ticket/11685] Remove logout confirmation page
  [ticket/11684] Remove useless confirmation page after login and admin login
  [ticket/9657] Define user before injecting
  ...

Conflicts:
	phpBB/includes/functions_container.php
	phpBB/install/database_update.php
	phpBB/install/index.php
2013-07-14 11:34:58 -04:00
Joas Schilling
5d4c443c2d [ticket/11696] Remove manual loading of db_tools in extension controller test
Remember to store the file, before commiting it...

PHPBB3-11696
2013-07-14 10:10:05 -04:00
Joas Schilling
057d860d07 [ticket/11696] Rename db_tools.php so it can be autoloaded
PHPBB3-11696
2013-07-14 10:10:05 -04:00
Nils Adermann
7030578bbe [ticket/11698] Moving all autoloadable files to phpbb/
PHPBB3-11698
2013-07-14 01:32:34 -04:00
Nils Adermann
2aa58ee3b8 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/11686] Not checking for phpBB Debug errors on functional tests
2013-07-13 17:06:17 -04:00
Nathan Guse
fd2c309aa7 Merge pull request #1473 from marc1706/ticket/11600
[ticket/11600] Increase code test coverage of avatar manager
2013-07-13 13:27:06 -07:00
Nathan Guse
e10cbbf023 Merge pull request #1541 from nickvergessen/ticket/11684
[ticket/11684] Remove useless confirmation page after login and admin login
2013-07-13 10:38:24 -07:00
Nathan Guse
b6c3939c32 Merge pull request #1543 from nickvergessen/ticket/11685
[ticket/11685] Remove logout confirmation page
2013-07-13 10:37:43 -07:00
Nathaniel Guse
6bfa2fc055 [ticket/11686] Not checking for phpBB Debug errors on functional tests
PHPBB3-11686
2013-07-13 12:06:05 -05:00
Joas Schilling
8f95ef55a6 [ticket/11685] Remove logout confirmation page
PHPBB3-11685
2013-07-13 12:27:00 -04:00
Joas Schilling
7d0c1d02ca [ticket/11684] Remove useless confirmation page after login and admin login
PHPBB3-11684
2013-07-13 12:02:49 -04:00
Nathan Guse
87795eba55 Merge pull request #1017 from nickvergessen/feature/softdelete-1-permission
Soft delete
2013-07-13 08:57:20 -07:00
Nathan Guse
d879acb7cc Merge pull request #1519 from cyberalien/ticket/11647
Fix INCLUDEJS URLs handling
2013-07-13 08:46:46 -07:00
Joas Schilling
167ca1f33f [ticket/9657] Define user before injecting
PHPBB3-9657
2013-07-13 11:25:38 -04:00
Joas Schilling
1584fdd26d Merge remote-tracking branch 'EXreaction/ticket/11420' into develop
* EXreaction/ticket/11420:
  [ticket/11420] Fix tests
  [ticket/11420] Fix tests
  [ticket/11420] Fix tests
  [ticket/11420] Use !==, === when comparing strings
  [ticket/11420] Fix comments, license link
  [ticket/11420] Rename migrations file to something more helpful
  [ticket/11420] Forgot to include mock sql_insert_buffer
  [ticket/11420] Fix notification options conversion
2013-07-13 11:15:53 -04:00
Joas Schilling
8352a7cada Merge remote-tracking branch 'phpbb/develop' into ticket/9657
* phpbb/develop: (216 commits)
  [ticket/11626] Remove last reference to template in ldap
  [ticket/11626] Remove LDAP dependency on template
  [develop-olympus] Increment version number to 3.0.13-dev.
  [develop-olympus] Add changelog for 3.0.12 release.
  [develop-olympus] Bump version numbers for 3.0.12-RC1 release.
  [develop-olympus] Bumping version numbers to final for 3.0.12 releases.
  [ticket/11669] Fix PHP bug #55124 (recursive mkdir on /./)
  [ticket/11668] Run lint test at the end of the test suite
  [ticket/11548] Fix test errors in groups test on develop
  [ticket/11548] Check upload avatar URL the same way as in phpBB 3.0
  [ticket/11548] Fix incorrect usage of array_map on acp groups page
  [ticket/11665] Fix test class name
  [ticket/11664] Stop creating php.html file in root path in tests
  [ticket/11665] Can't change file names already sent to set_filenames
  [ticket/11662] Typos: occured -> occurred
  [ticket/11662] Typos: occured -> occurred
  [ticket/11660] Fix bugs from bugs in #11651 (missing vars, db->sql_connect)
  [feature/auth-refactor] Add parent::setUp() in setUp()
  [feature/auth-refactor] Changes
  [feature/auth-refactor] DataProvider for acp_board test
  ...
2013-07-13 09:36:24 -04:00
Igor Wiedler
1dea0286a4 [ticket/11574] Use alternate DI config file for updater
PHPBB3-11574
2013-07-13 09:57:57 +02:00
Joas Schilling
da38d13094 [ticket/9657] Add functional tests for forking a copy
PHPBB3-9657
2013-07-13 00:53:55 -04:00
Joas Schilling
e96932b0e3 [ticket/9657] Add functional test for splitting topic
PHPBB3-9657
2013-07-12 22:43:11 -04:00
Joas Schilling
a01d8cdfa3 [ticket/9657] Add functional test for restoring a post/topic
PHPBB3-9657
2013-07-12 21:20:33 -04:00
Nathan Guse
86b910692a Merge pull request #1515 from Hardolaf/feature/auth-refactor
[feature/auth-refactor] Use a base class for all authentication providers
2013-07-12 12:51:35 -07:00
Joas Schilling
0297b88aaf [ticket/9657] Add unit tests for softdeleting and moving posts/topics
PHPBB3-9657
2013-07-12 15:41:52 -04:00
Nathaniel Guse
8a93a35def Merge remote-tracking branch 'remotes/Marc/ticket/11548-develop' into develop
# By Marc Alexander
# Via Marc Alexander
* remotes/Marc/ticket/11548-develop:
  [ticket/11548] Fix test errors in groups test on develop
  [ticket/11548] Check upload avatar URL the same way as in phpBB 3.0
2013-07-12 14:12:46 -05:00
Andreas Fischer
6c8bfcdef6 Merge remote-tracking branch 'EXreaction/ticket/11669' into develop
* EXreaction/ticket/11669:
  [ticket/11669] Fix PHP bug #55124 (recursive mkdir on /./)
2013-07-12 21:02:29 +02:00
Nathaniel Guse
224aec0f2d [ticket/11669] Fix PHP bug #55124 (recursive mkdir on /./)
PHPBB3-11669
2013-07-12 13:57:24 -05:00
Marc Alexander
01b9f9f9b6 [ticket/11548] Fix test errors in groups test on develop
This will fix the errors that appeared in the functional groups test due to
the changes in the new avatar system. The patch will make them work again.

PHPBB3-11548
2013-07-12 14:38:18 -04:00
Andreas Fischer
0d0338a55c Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/11548] Fix incorrect usage of array_map on acp groups page

Conflicts:
	tests/functional/common_groups_test.php
	tests/functional/ucp_groups_test.php
2013-07-12 20:09:22 +02:00
Marc Alexander
da8e35ac77 [ticket/11548] Fix incorrect usage of array_map on acp groups page
The array_map was only ran on small parts of the actual error array instead
of the whole one. This resulted in the output of the language variables' names
rather than their actual value.

PHPBB3-11548
2013-07-12 13:40:30 -04:00