1
0
mirror of https://github.com/phpmyadmin/phpmyadmin.git synced 2026-10-29 21:24:44 +03:00
Commit Graph

86 Commits

Author SHA1 Message Date
Michal Čihař
dce94f229f More consistency for URL::getCommon
Now URL::getCommon always returns HTML encoded string, if you want
unencded one, use URL::getCommonRaw. This makes it easier to review the
code if uses correct variant.

Also I've fixed several wrong uses of the HTML encoded variant in
Location header.

Signed-off-by: Michal Čihař <michal@cihar.com>
2016-06-17 12:44:29 +02:00
Michal Čihař
25ede08182 Merge branch 'QA_4_6' 2016-06-14 08:30:03 +02:00
Michal Čihař
79a34ff94c Calculate table size as integer
It should be big enough on 64-bit systems, so avoid rounding issues
which double calculations can bring.

Fixes #12303

Signed-off-by: Michal Čihař <michal@cihar.com>
2016-06-14 08:28:26 +02:00
Michal Čihař
8deed657a2 Merge branch 'QA_4_6' 2016-05-12 15:43:24 +02:00
Michal Čihař
57a1d3a7ca Adjust tests to template doing no stripping
Signed-off-by: Michal Čihař <michal@cihar.com>
2016-05-12 15:42:57 +02:00
Michal Čihař
f904df8698 Merge branch 'QA_4_6' 2016-05-12 15:36:49 +02:00
Michal Čihař
288995ba18 Remove trimming from template renderere
This relies on preg_replace correctly handles multibyte chars what is
not true on Windows and it then corrupts the content as it removers
parts of UTF-8 chars. Removal fixes occassional 200 errors on Windows.

Fixes #11705

Signed-off-by: Michal Čihař <michal@cihar.com>
2016-05-12 15:35:38 +02:00
Michal Čihař
3e2029e750 Move MySQL charsets handling to the Charsets class
Issue #11731

Signed-off-by: Michal Čihař <michal@cihar.com>
2016-04-11 12:55:42 +02:00
Michal Čihař
5d37731854 Merge branch 'QA_4_6' 2016-04-06 11:29:49 +02:00
Michal Čihař
73278068a9 Adjust tests to simplified DatabaseStructureController
Signed-off-by: Michal Čihař <michal@cihar.com>
2016-04-06 11:29:43 +02:00
Deven Bansod
c47a275e22 Added newly introduced variables
Changed appropriate variables to have byte-formatting

Fixed tests

Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
2016-03-23 16:19:53 +05:30
Durgesh
6650f7b07d Refactor text sanitization and javascript escaping, Issue #11989, #11988
Signed-off-by: Durgesh <007durgesh219@gmail.com>
2016-02-22 14:45:19 +05:30
Durgesh
0b64827930 Refactored url parmeters generating, Issue #11990
Signed-off-by: Durgesh <007durgesh219@gmail.com>
2016-02-22 14:36:41 +05:30
Michal Čihař
2d47e41084 Remove no longer needed variables
Signed-off-by: Michal Čihař <michal@cihar.com>
2016-02-12 15:18:21 +01:00
Michal Čihař
86d3d0bc04 Define theme for all tests
This allows to unify environment.

Signed-off-by: Michal Čihař <michal@cihar.com>
2016-02-12 15:14:39 +01:00
Madhura Jayaratne
4cb0c4cdf0 Avoid additional query for profiling support
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2016-02-01 23:19:49 +11:00
Madhura Jayaratne
3ad437b554 Update tests
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2016-02-01 23:04:01 +11:00
Michal Čihař
b450e58dbb Remove require of libraries included in test bootstrap
There is no need to specify them in every test when we already do it
globally.

Signed-off-by: Michal Čihař <michal@cihar.com>
2016-01-12 16:43:16 +01:00
Michal Čihař
908c44c027 Remove no longer used variables
Signed-off-by: Michal Čihař <michal@cihar.com>
2016-01-12 14:51:08 +01:00
Michal Čihař
a37273c5ba Initialize array variables
Signed-off-by: Michal Čihař <michal@cihar.com>
2016-01-05 11:07:51 +01:00
Marc Delisle
911f8274c7 Clarify class and variable name
Signed-off-by: Marc Delisle <marc@infomarc.info>
2015-12-31 08:09:47 -05:00
Madhura Jayaratne
f4e87fa070 Fix failing tests
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2015-12-17 21:31:28 +11:00
Madhura Jayaratne
eb2c50e446 Move more test classes to be subclasses to PMATestCase
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2015-12-17 20:22:41 +11:00
Madhura Jayaratne
4622f16b1f Use common test class as parent for more test cases
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2015-12-17 20:06:21 +11:00
Madhura Jayaratne
65d2413c0f Properly mock dbi
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2015-12-17 09:56:36 +11:00
Madhura Jayaratne
5b5b694a3a Fix typo
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2015-12-16 23:25:43 +11:00
Madhura Jayaratne
9e19e168ea Correctly mock dbi
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2015-12-16 23:09:49 +11:00
Madhura Jayaratne
a624f09e24 Update tests
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2015-12-16 22:49:23 +11:00
Madhura Jayaratne
a24e96275e Fix more tests
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2015-12-09 08:17:38 +11:00
Madhura Jayaratne
19f86d9df6 Fix more tests
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2015-12-09 07:29:27 +11:00
Madhura Jayaratne
22d2e1e437 Add back dbi mocking
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2015-12-09 07:09:30 +11:00
Madhura Jayaratne
f22cfdf076 Fix tests
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2015-12-08 11:06:36 +11:00
Michal Čihař
2248ec64b6 Remove unused variables
Signed-off-by: Michal Čihař <michal@cihar.com>
2015-12-02 09:21:29 +01:00
Madhura Jayaratne
484f26a434 Was invoking wrong method
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2015-12-02 07:08:54 +11:00
Madhura Jayaratne
e60853adee This method no longer exists
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2015-12-02 07:04:22 +11:00
Madhura Jayaratne
34b03a3494 Merge branch 'master' of github.com:phpmyadmin/phpmyadmin 2015-12-02 06:52:36 +11:00
Madhura Jayaratne
26e96680f4 Fix some test failures
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2015-12-02 06:51:54 +11:00
Michal Čihař
353b59fe37 Add missing parameter
Signed-off-by: Michal Čihař <michal@cihar.com>
2015-12-01 16:58:46 +01:00
Michal Čihař
c3ed799ee5 Fix testcase
Signed-off-by: Michal Čihař <michal@cihar.com>
2015-12-01 16:57:18 +01:00
Marc Delisle
23d78658d7 Fix unit tests
Signed-off-by: Marc Delisle <marc@infomarc.info>
2015-12-01 10:14:35 -05:00
Michal Čihař
2572a35dba Fix controller name
Signed-off-by: Michal Čihař <michal@cihar.com>
2015-12-01 14:39:32 +01:00
Michal Čihař
8ebfeb25a0 Fix includes in testsuite
Signed-off-by: Michal Čihař <michal@cihar.com>
2015-12-01 14:22:28 +01:00
Madhura Jayaratne
c7297bf533 Update tests
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2015-11-27 20:25:32 +11:00
Madhura Jayaratne
b8c992035e Prefix private variables with underscore
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2015-11-26 19:59:12 +11:00
Madhura Jayaratne
ba8859d7df Merge branch 'master' into refactor
Conflicts:
	db_create.php
2015-11-24 21:07:09 +11:00
Madhura Jayaratne
8e282a3f6e Merge build_html_for_db.lib.php into ServerDatabasesController
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2015-11-24 20:56:04 +11:00
Madhura Jayaratne
3cf75085d6 Merge pull request #11676 from madhuracj/refactor
Refactoring server databases page
2015-11-24 08:56:43 +11:00
Madhura Jayaratne
62dac7ff0f Update tests
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2015-11-24 08:35:12 +11:00
Hugues Peccatte
54053550fd Make PHPCS happy.
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
2015-11-21 15:04:31 +01:00
Madhura Jayaratne
2fb291bbb0 Move packages for better organization
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2015-11-18 12:29:00 +11:00