Commit graph

19105 commits

Author SHA1 Message Date
Nathaniel Guse
05cd045923 [ticket/11413] Revert some cache service related changes from earlier
PHPBB3-11413
2013-05-13 00:56:08 -05:00
Nathaniel Guse
bae42c6f0a [ticket/11413] Use phpbb_user in test
PHPBB3-11413
2013-05-13 00:48:27 -05:00
Nathaniel Guse
ad430ae406 [ticket/11413] $user should have been $this->user
PHPBB3-11413
2013-05-13 00:41:57 -05:00
Nathaniel Guse
4e073eb818 Merge branch 'ticket/11413' of github.com:EXreaction/phpbb3 into ticket/11413 2013-05-13 00:36:16 -05:00
Nathaniel Guse
a4d6486d80 [ticket/11413] Fix unit tests
PHPBB3-11413
2013-05-13 00:35:01 -05:00
Nathan Guse
bcf7ea3310 Merge remote-tracking branch 'remotes/cyberalien/ticket/11533' into develop
# By Vjacheslav Trushkin
# Via Vjacheslav Trushkin
* remotes/cyberalien/ticket/11533:
  [ticket/11533] Update unit tests
  [ticket/11533] Fix colspan and unnecessary tables
  [ticket/11533] Change list to table for notification settings
  [ticket/11533] Columns counter for notification settings
2013-05-12 18:56:34 -05:00
Nathan Guse
f93a750f28 Merge remote-tracking branch 'remotes/Marc/ticket/11465' into develop
# By Marc Alexander (8) and Joas Schilling (3)
# Via Marc Alexander
* remotes/Marc/ticket/11465:
  [ticket/11465] Increase count of disabled extensions to 5 in functional test
  [ticket/11465] Add disabled ext to allow proper testing of get_module_infos()
  [ticket/11465] Add tests for optional arguments of get_module_infos()
  [ticket/11465] Add comments explaining the tests
  [ticket/11465] Check if class exists before including info file
  [ticket/11465] Correctly set the root path for the test
  [ticket/11465] The info file does not have _info suffix
  [ticket/11465] Add phpBB module to test
  [ticket/11465] Move require_once() in unit test to the top of the file
  [ticket/11465] Add unit tests for acp_modules::get_module_infos()
  [ticket/11465] Use extension finder when adding extensions' acp modules
2013-05-12 18:49:23 -05:00
Nils Adermann
a42693e66d Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/11105] Added spaces between ; and "url=" to adhere to w3c conventions.

Conflicts:
	phpBB/includes/functions.php
2013-05-12 23:09:41 +02:00
Nils Adermann
45e014d35d Merge pull request #1403 from bantu/ticket/11105
[ticket/11105] Add mandatory space to content part of meta http-equiv=re...
2013-05-12 14:05:53 -07:00
gamerchan
d680aac7c5 [ticket/11105] Added spaces between ; and "url=" to adhere to w3c conventions.
There was no space between ; and the string "url=". But according to w3c, we
should have atleast one space between them. So, added space characters
accordingly.

PHPBB3-11105
2013-05-12 22:57:40 +02:00
Marc Alexander
bd6cebfe38 [ticket/11465] Increase count of disabled extensions to 5 in functional test
The ACP function test checks the amount of disabled extensions. Due to
the added disabled extension for the tests of the acp_modules method
get_module_infos(), this needed to be increased from 4 to 5.

PHPBB3-11465
2013-05-12 22:44:59 +02:00
Marc Alexander
7e70eec5a3 Merge branch 'develop' of https://github.com/phpbb/phpbb3 into ticket/11465 2013-05-12 22:41:00 +02:00
Marc Alexander
f90ed6c3cb [ticket/11465] Add disabled ext to allow proper testing of get_module_infos()
This will now also enable us to test the $use_all_available parameter of
get_module_infos(), which will not only return the module infos for enabled
extensions but also those from disabled extensions.

PHPBB3-11465
2013-05-12 22:24:50 +02:00
Marc Alexander
7327f9326f [ticket/11465] Add tests for optional arguments of get_module_infos()
The possibilities of the first argument have already been covered
previously. The second argument will be covered with an entry that
should exist, an incorrect entry, and the default false entry that
should use the previously set module class. Unfortunately, the third
argument doesn't have an effect in the tests, as the mocked extension
manager will not properly handle enabled/disabled extensions.

PHPBB3-11465
2013-05-12 16:57:30 +02:00
Dhruv
d522dc5372 Merge branch 'ticket/10820' into ticket/10820-develop
* ticket/10820:
  [ticket/10820] fix regex Extract IE version from user agent string and then compare it with 7

Conflicts:
	phpBB/download/file.php
2013-05-12 16:09:01 +05:30
Dhruv
cae8c36037 [ticket/10820] fix regex
Extract IE version from user agent string and then compare it with 7

PHPBB3-10820
2013-05-12 16:03:48 +05:30
Dhruv
bcd6f79d5c [ticket/10820] Add test cases
PHPBB3-10325
2013-05-12 15:57:13 +05:30
Vjacheslav Trushkin
c2f5ba69f0 [ticket/develop/10772] Fix copyright year
PHPBB3-10772
2013-05-12 12:43:15 +03:00
Vjacheslav Trushkin
f3c547bc8d Merge branch 'ticket/10772' into ticket/develop/10772
* ticket/10772:
  [ticket/10772] Use forum specific style for trigger_error
2013-05-12 12:42:22 +03:00
Marc Alexander
0a707dd1ce [ticket/11531] Add basic set of functional tests for new avatar system
This currently includes tests for the gravatar, remote avatar, and upload
avatar drivers. The local avatar driver is currently not supported. Two
tests currently fail and have been marked as incomplete. One failure is
due to an issue with Symfony's DomCrawler that exists in Symfony < 2.2.
The other one is caused by a bug in the way remote avatars are treated.
According to my tests, this bug also exists in phpBB 3.0.11 and has been
reported in the tracker: http://tracker.phpbb.com/browse/PHPBB3-11534

PHPBB3-11531
2013-05-12 11:35:46 +02:00
Nathaniel Guse
fe13b89dd4 Merge remote-tracking branch 'remotes/bantu/ticket/11452' into develop 2013-05-11 20:52:52 -05:00
Nathaniel Guse
393ed4a2d0 Merge remote-tracking branch 'remotes/cyberalien/ticket/10741' into develop 2013-05-11 20:15:53 -05:00
Vjacheslav Trushkin
f17e67364d [ticket/11533] Update unit tests
Update notification settings functional unit test for new layout

PHPBB3-11533
2013-05-11 23:33:40 +03:00
Vjacheslav Trushkin
858f644c38 [ticket/11533] Fix colspan and unnecessary tables
Fix colspan and remove unnecessary tables in notification
settings page in subsilver2.

PHPBB3-11533
2013-05-11 23:32:55 +03:00
Vjacheslav Trushkin
f129fdb559 [ticket/11533] Change list to table for notification settings
PHPBB3-11533
2013-05-11 23:32:23 +03:00
Vjacheslav Trushkin
b40c6fe46a [ticket/11533] Columns counter for notification settings
Add columns counter template variable. It counts number of
notification types + column for name + column for checkbox

PHPBB3-11533
2013-05-11 23:30:44 +03:00
Vjacheslav Trushkin
18e82931dc [ticket/develop/10772] Unit tests for forum specific style
Unit tests for forum specific style for 3.1 branch

PHPBB3-10772
2013-05-11 22:56:38 +03:00
Vjacheslav Trushkin
170333a6fc [ticket/10772] Use forum specific style for trigger_error
PHPBB3-10772
2013-05-11 22:49:42 +03:00
OpenShift guest
48e1be58db [ticket/11458] Update functional test
Show that the phpbb permission lanuage file is being included

PHPBB3-11458
2013-05-11 02:43:02 -04:00
Nathan Guse
f91f8666fd [ticket/11415] Send the extension base the finder rather than the manager
PHPBB3-11415
2013-05-10 14:01:31 -05:00
Nathan Guse
27b2bbb8ff [ticket/11415] Create function in finder find_from_extension
PHPBB3-11415
2013-05-10 13:58:55 -05:00
Nathan Guse
cb13747c4b [ticket/11420] Rename migrations file to something more helpful
PHPBB3-11420
2013-05-10 13:44:38 -05:00
Nathan Guse
7d66a9ad52 [ticket/11413] Translate the error
PHPBB3-11413
2013-05-10 13:42:54 -05:00
Nathan Guse
c9ff315132 [ticket/11413] Rename file to something more helpful
PHPBB3-11413
2013-05-10 13:40:49 -05:00
OpenShift guest
a50d23078e [ticket/11458] Use finder to get all permission language files
PHPBB3-11458
2013-05-10 10:15:25 -04:00
Marc Alexander
6a1fa3e0f4 [ticket/11465] Add comments explaining the tests
PHPBB3-11465
2013-05-10 13:54:15 +02:00
OpenShift guest
109b1a3a95 [ticket/11458] Use helper to create/move/delete directories/files
PHPBB3-11458
2013-05-09 23:14:09 -04:00
Nils Adermann
c583d9f5e7 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/11324] PHP 5.5 is in RC stage. No longer allow failure on travis.
2013-05-09 20:16:32 +02:00
Nils Adermann
b347986923 Merge pull request #1396 from bantu/ticket/11324
[ticket/11324] PHP 5.5 is in RC state. No longer allow failure on travis...
2013-05-09 11:14:52 -07:00
Andreas Fischer
d1415676c5 [ticket/11324] PHP 5.5 is in RC stage. No longer allow failure on travis.
PHPBB3-11324
2013-05-09 20:10:25 +02:00
Andreas Fischer
e043763905 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/11529] Format markdown code correctly
  [ticket/11529] Rename RUNNING_TESTS.txt to RUNNING_TESTS.md
2013-05-09 20:08:31 +02:00
Andreas Fischer
f9325bfdeb Merge remote-tracking branch 'naderman/ticket/11529' into develop-olympus
* naderman/ticket/11529:
  [ticket/11529] Format markdown code correctly
  [ticket/11529] Rename RUNNING_TESTS.txt to RUNNING_TESTS.md
2013-05-09 20:08:20 +02:00
Nils Adermann
ab3b0df244 [ticket/11529] Format markdown code correctly
PHPBB3-11529
2013-05-09 20:06:12 +02:00
Nils Adermann
1c9d36615a [ticket/11529] Rename RUNNING_TESTS.txt to RUNNING_TESTS.md
PHPBB3-11529
2013-05-09 19:59:34 +02:00
Nils Adermann
3327739290 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/11513] Update RUNNING_TESTS.txt to no longer refer to PEAR.
  [ticket/11513] Update all CLI calls to phpunit to use vendor/bin.
  [ticket/11513] Use PHPUnit from composer in .travis.yml.
  [ticket/11513] Update (all) composer dependencies.
  [ticket/11513] Add PHPUnit 3.7 and DbUnit 1.2 as a composer dev dependency.

Conflicts:
	.travis.yml
	phpBB/composer.lock
2013-05-09 19:42:13 +02:00
Nils Adermann
3fb536d7b7 Merge pull request #1387 from bantu/ticket/11513
[ticket/11513] Install PHPUnit via Composer
2013-05-09 10:30:20 -07:00
Andreas Fischer
c31123e8a4 [ticket/11513] Update RUNNING_TESTS.txt to no longer refer to PEAR.
PHPBB3-11513
2013-05-09 19:21:40 +02:00
Andreas Fischer
f2f97dd5e0 [ticket/11513] Update all CLI calls to phpunit to use vendor/bin.
PHPBB3-11513
2013-05-09 19:21:40 +02:00
Andreas Fischer
b5b1e88915 [ticket/11513] Use PHPUnit from composer in .travis.yml.
PHPBB3-11513
2013-05-09 18:46:29 +02:00
Andreas Fischer
a42514105d [ticket/11513] Update (all) composer dependencies.
PHPBB3-11513
2013-05-09 18:46:29 +02:00