1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-02-24 20:13:22 +01:00

1774 Commits

Author SHA1 Message Date
Nathaniel Guse
9f5c1e0062 [ticket/11388] Add newlines at EOF
PHPBB3-11388
2013-07-11 15:40:43 -05:00
Nathaniel Guse
159f018056 [ticket/11388] INCLUDECSS
PHPBB3-11388
2013-07-11 15:31:55 -05:00
Marc Alexander
599f83395f [ticket/11548] Run array_map on complete error array and not just colour_error
Up to now the array_map() that turns error messages into the localized output
was only ran if the group's color was set. With this patch it'll run the
array_map() on the complete error array if it's not empty.

PHPBB3-11548
2013-07-11 16:15:27 -04:00
Vjacheslav Trushkin
6eef2aebd7 [ticket/11647] Fix tests for INCLUDEJS
PHPBB-11647
2013-07-11 15:40:28 -04:00
Nils Adermann
59f34bef08 Merge pull request #1470 from EXreaction/feature/twig
Feature/twig
2013-07-11 12:11:41 -07:00
Nathaniel Guse
7104aeb77e Merge branch 'develop-olympus' into develop
# By Vjacheslav Trushkin
# Via Nathaniel Guse (1) and Vjacheslav Trushkin (1)
* develop-olympus:
  [ticket/10772] Remove unnecessary comment
  [ticket/10772] Functional tests for forum style

Conflicts:
	tests/functional/forum_style_test.php
2013-07-11 13:15:26 -05:00
Nathaniel Guse
cb0335ebcb Merge remote-tracking branch 'remotes/cyberalien/ticket/develop/10772' into develop
# By Vjacheslav Trushkin
# Via Vjacheslav Trushkin
* remotes/cyberalien/ticket/develop/10772:
  [ticket/develop/10772] Fix copyright year
  [ticket/develop/10772] Unit tests for forum specific style
  [ticket/10772] Use forum specific style for trigger_error
2013-07-11 13:12:41 -05:00
Nathaniel Guse
406c48c655 Merge remote-tracking branch 'remotes/cyberalien/ticket/10772' into develop-olympus
# By Vjacheslav Trushkin
# Via Vjacheslav Trushkin
* remotes/cyberalien/ticket/10772:
  [ticket/10772] Remove unnecessary comment
  [ticket/10772] Functional tests for forum style
  [ticket/10772] Use forum specific style for trigger_error
2013-07-11 13:08:24 -05:00
Nathaniel Guse
5b81cad775 Merge branch 'develop-olympus' into develop
# By Igor Wiedler
# Via Igor Wiedler (1) and Nathaniel Guse (1)
* develop-olympus:
  [ticket/11644] Skip phpbb_dbal_order_lower_test on MySQL 5.6
2013-07-11 12:25:54 -05:00
Igor Wiedler
20d59c49e2 [ticket/11644] Skip phpbb_dbal_order_lower_test on MySQL 5.6
PHPBB3-11644
2013-07-11 13:00:21 -04:00
Nathaniel Guse
947b907efe [ticket/11388] Do not append assets_version if using remote path (e.g. http)
PHPBB3-11388
2013-07-11 11:28:35 -05:00
Nathaniel Guse
648e1e51fa [ticket/11388] INCLUDEJS test for //(url)
PHPBB3-11388
2013-07-11 08:44:48 -05:00
Joas Schilling
7262045a24 [ticket/9657] Fix notification tests
PHPBB3-9657
2013-07-11 15:19:39 +02:00
Joas Schilling
753dc62267 [ticket/9657] Fix unit tests
PHPBB3-9657
2013-07-11 15:02:07 +02:00
Joas Schilling
bdb7ec0ceb Merge remote-tracking branch 'phpbb/develop' into feature/softdelete-1-permission
* phpbb/develop: (704 commits)
  [ticket/11630] Improvements to the PHP lint pre-commit hook
  [feature/auth-refactor] Move auth providers to separate directory
  [ticket/11619] Use HTTP/1.0 because of lack of chunked-encoding handling.
  [ticket/11619] Some tests for get_remote_file().
  [ticket/11617] Remove spaces and tabs from empty lines
  [ticket/11617] Missing U_ACTION in acp_captcha.php
  [feature/auth-refactor] Fix code style issue
  [feature/auth-refactor] Fix comment grammar
  [feature/auth-refactor] Fix the actual cause of test failures
  [ticket/10838] Fix URL for wiki and remove irrelevant line
  [ticket/10838] Remove php 5.4 and builtin server references
  [ticket/10838] Fix missing data
  [ticket/10838] separate database used mentioned in unit tests
  [ticket/11585] Make $auth_admin class property
  [feature/auth-refactor] A possible fix for the functional test failures
  [ticket/11566] Subsilver template error displayed after table headers
  [ticket/11566] Remove extra pair of brackets from conditional statement
  [ticket/11566] Check that guest doesn't have reporting permission by default
  [ticket/11566] Add captcha to report post template in subsilver
  [ticket/11566] Use the new constant CONFIRM_REPORT for captcha init
  ...

Conflicts:
	phpBB/docs/sphinx.sample.conf
	phpBB/feed.php
	phpBB/styles/prosilver/template/search_results.html
	phpBB/styles/prosilver/template/viewforum_body.html
2013-07-11 11:41:48 +02:00
Nathaniel Guse
8d8979eda7 [ticket/11388] Fixing includejs test
Changed expected output to file?(any supplied argument string)&asset_version
=($config['asset_version'])#(any supplied anchor string)

Testing lines one at a time to make checking them easier.

PHPBB3-11388
2013-07-10 13:23:36 -05:00
Nathaniel Guse
f88cdce43a Merge remote-tracking branch 'remotes/cyberalien/feature/twig/includejs_tests' into feature/twig
# By Vjacheslav Trushkin
# Via Vjacheslav Trushkin
* remotes/cyberalien/feature/twig/includejs_tests:
  [feature/twig] Unit tests for includejs
2013-07-10 11:38:48 -05:00
Vjacheslav Trushkin
9725eb19f8 [feature/twig] Unit tests for includejs
PHPBB3-11598
2013-07-10 11:43:52 -04:00
Andy Chase
c96b0b1a47 [ticket/11620] Removed unnecessary lines and whitespace
PHPBB3-11620
2013-07-09 12:03:17 -07:00
Andy Chase
f51721e905 [ticket/11620] Rename provider -> mock_auth_provider
Rename the class and file name to better match
what the class is mocking, as well as implement the
interface of that class.

PHPBB3-11620
2013-07-08 16:38:53 -07:00
Andy Chase
cd1fe789d2 [ticket/11620] Minor changes to tests for coding standards
PHPBB3-11620
2013-07-08 16:34:46 -07:00
Nathan Guse
47ec38c011 [feature/twig] Add simple test to make sure Twig filters/tags are working
PHPBB3-11598
2013-07-08 15:21:27 -05:00
Andy Chase
3999d7ec7c [ticket/11620] More mock provider methods
The mock provider object now better matches the interface
given for providers.

PHPBB3-11620
2013-07-08 10:28:40 -07:00
Nathan Guse
9f85a4d118 [ticket/11420] Use !==, === when comparing strings
PHPBB3-11420
2013-07-06 12:59:26 -05:00
Nathan Guse
e03586f2cf Merge branch 'develop-olympus' into develop
# By Andreas Fischer
# Via Andreas Fischer (1) and Nathan Guse (1)
* develop-olympus:
  [ticket/11619] Use HTTP/1.0 because of lack of chunked-encoding handling.
  [ticket/11619] Some tests for get_remote_file().
2013-07-05 18:21:38 -05:00
Andy Chase
a1168972ff [ticket/11620] Added validate_session to provider.
PHPBB3-11620
2013-07-05 15:00:05 -07:00
Andy Chase
5cdcb689df [ticket/11620] Implemented a provider mock object.
Due to an auth_refactor, there is a new dependency
in session.php on phpbb_container and a provider.

For purposes of testing, implemented a simple one.

PHPBB3-11620
2013-07-05 14:49:30 -07:00
Andy Chase
6f8187f7fa [ticket/11620] Reworked create_test without data provider
PHPBB3-11620
2013-07-05 14:10:04 -07:00
Andy Chase
521d35dd6e [ticket/11620] Add create_test with test for bot detection
Added a test for the creation of a session with a simple test
for detecting whether a bot is present.

PHPBB3-11620
2013-07-05 14:10:02 -07:00
Andy Chase
7ef95ce8ac [ticket/11620] Fix typo and confusingly named test
PHPBB3-11620
2013-07-05 14:10:01 -07:00
Andy Chase
ab1c42babf [ticket/11620] Add indentation, change quote style.
indentation is probably more important than 80 characters per line apparently.
Single quotes instead of double per coding guidelines.

PHPBB3-11620
2013-07-05 14:10:00 -07:00
Andy Chase
290533a14f [ticket/11620] Add validate_referrer test
Add a test for the validate_referrer function.

PHPBB3-11620
2013-07-05 14:09:58 -07:00
Andy Chase
30ebc03d14 [ticket/11620] Remove unneeded functions from testable facade
There are functions listed in testable facade that don't have a lot of dependencies,
instead mostly just take the input and perform database functions on them.
These can be tested without a testable facade function and so will be removed.

PHPBB3-11620
2013-07-05 14:09:57 -07:00
Andy Chase
17890a308b [ticket/11620] Add ipv6 test cases and remove extra arguments.
PHPBB3-11620
2013-07-05 14:09:56 -07:00
Andy Chase
2f92c903e7 [ticket/11620] Make testable_facade non-static, expand.
Make the class functions of testable_facade no longer static methods,
but a class based one and expand the methods to be filled in, in later commits.

PHPBB3-11620
2013-07-05 14:09:54 -07:00
Andy Chase
e8facfc735 [ticket/11620] Add commas in extract_page_test
PHPBB3-11620
2013-07-05 14:09:53 -07:00
Andy Chase
71fbe74ede [ticket/11620] Fix quotes in extract_hostname_test
PHPBB3-11620
2013-07-05 14:09:52 -07:00
Andy Chase
b8d9d7b79f [ticket/11620] Add extract_current_hostname
Add a tests for extracting the current hostname from session.

PHPBB3-11620
2013-07-05 14:09:50 -07:00
Andy Chase
7fd03abcab [ticket/11620] Add data provider to extract_page
These test cases were taken from a live session,
more test cases should be added to test specific
functionality in this function.

PHPBB3-11620
2013-07-05 14:09:49 -07:00
Andy Chase
9f156e9954 [ticket/11620] Rename class_functions_test -> extract_page_test
Renaming this file because it is going to contain a large data provider,
so I'd rather split this test out.

PHPBB3-11620
2013-07-05 14:09:48 -07:00
Andy Chase
e1d957c3ee [ticket/11620] Remove accidental argument from testable_facade.
PHPBB3-11620
2013-07-05 14:09:46 -07:00
Andy Chase
19a348e359 [ticket/11620] Add test for test_extract_current_page
PHPBB3-11620
2013-07-05 14:09:45 -07:00
Andy Chase
1d9d22cc76 [ticket/11620] Add testable facade for sessions.php
Since many functions in session.php have global variables inside the function,
this exposes those functions through a testable facade that uses testable_factory's
mock global variables to modify global variables used in the functions.

 This is using the facade pattern to provide a testable "front" to the functions in sessions.php.

 PHPBB3-11620
2013-07-05 14:09:44 -07:00
Nathan Guse
9ac61565fd [feature/twig] Add template tests for S_NUM_ROWS and S_BLOCK_NAME
PHPBB3-11598
2013-07-05 12:48:02 -05:00
Nathan Guse
13c3565454 [feature/twig] Remove style dependency for controller helper
If a controller wants to use set_style, it can just use phpbb_style

PHPBB3-11598
2013-07-05 12:11:59 -05:00
Nathan Guse
1f4a717f9e [feature/twig] Add template test for ===, !==
PHPBB3-11598
2013-07-05 10:29:24 -05:00
Nathaniel Guse
25b4732845 [feature/twig] Remove debug code
PHPBB3-11598
2013-07-04 15:32:04 -05:00
Marc Alexander
5afcb1d5f4 [ticket/11600] Remove duplicate test case
PHPBB3-11600
2013-07-04 21:15:02 +02:00
Nathaniel Guse
8cf6dbd950 [feature/twig] Trying some new debug code for this mkdir error
PHPBB3-11598
2013-07-04 13:40:37 -05:00
Nathaniel Guse
4f6cb9acbd [feature/twig] Fix helper URL test
PHPBB3-11598
2013-07-04 13:19:21 -05:00