1
0
mirror of https://github.com/phpmyadmin/phpmyadmin.git synced 2026-11-01 23:14:58 +03:00
Commit Graph

3035 Commits

Author SHA1 Message Date
Michal Čihař
23d703cf40 Fix typo
Signed-off-by: Michal Čihař <michal@cihar.com>
2016-05-25 11:35:41 +02:00
Michal Čihař
3fc1fa1c80 Do not try to generate coverage from phpunit tests
Signed-off-by: Michal Čihař <michal@cihar.com>
2016-05-25 11:35:24 +02:00
Michal Čihař
4e7077b264 Run selenium tests more verbosely to see the progress
The currently timeout od Travis due to no output.

Signed-off-by: Michal Čihař <michal@cihar.com>
2016-05-25 10:25:27 +02:00
Michal Čihař
9d5c5f0c86 Adjust tests to new error messages
Signed-off-by: Michal Čihař <michal@cihar.com>
2016-05-23 21:27:41 +02:00
Michal Čihař
792f5dc794 Merge branch 'QA_4_6' 2016-05-23 13:23:43 +02:00
Michal Čihař
adfd5a22b9 Avoid double redirects in signon auth on logout
Also adjusts tests to no longer rely on runkit.

Signed-off-by: Michal Čihař <michal@cihar.com>
2016-05-23 13:23:16 +02:00
Michal Čihař
e3d650a2bb Merge branch 'QA_4_6' 2016-05-23 13:05:01 +02:00
Michal Čihař
11eb574242 Improve handling of logout
- add separate script for handling logout
- no longer require old_usr for all authentication methods
  (this avoids potential information leak)
- require valid token for logout

Signed-off-by: Michal Čihař <michal@cihar.com>
2016-05-23 13:02:21 +02:00
Michal Čihař
381c80dda4 Split test cases to avoid huge test methods
Signed-off-by: Michal Čihař <michal@cihar.com>
2016-05-23 12:35:13 +02:00
Michal Čihař
21db724c85 Remove need for having define for test
Signed-off-by: Michal Čihař <michal@cihar.com>
2016-05-23 12:09:36 +02:00
Michal Čihař
1c081f9087 Fix test to not depend on variables set elsewhere
Signed-off-by: Michal Čihař <michal@cihar.com>
2016-05-23 11:47:40 +02:00
Michal Čihař
45516b5cfe Merge branch 'QA_4_6' 2016-05-17 12:01:10 +02:00
Michal Čihař
ec1c32fd09 Fix tested url
Signed-off-by: Michal Čihař <michal@cihar.com>
2016-05-17 11:59:04 +02:00
Michal Čihař
506fd28cbd Add support to link directly to some page
Signed-off-by: Michal Čihař <michal@cihar.com>
2016-05-17 11:54:28 +02:00
Michal Čihař
0e233c89ce Test more doc links generating
Signed-off-by: Michal Čihař <michal@cihar.com>
2016-05-17 11:51:34 +02:00
Michal Čihař
3074d94525 Merge branch 'QA_4_6' 2016-05-17 10:44:59 +02:00
Michal Čihař
574fee04f7 Fix test failures after changing links
Signed-off-by: Michal Čihař <michal@cihar.com>
2016-05-17 10:44:54 +02:00
Michal Čihař
98ad7d1ba4 Merge branch 'QA_4_6'
Signed-off-by: Michal Čihař <michal@cihar.com>
2016-05-17 10:42:37 +02:00
Michal Čihař
d248d8d83d Remove link to no longer maintained blog
Signed-off-by: Michal Čihař <michal@cihar.com>
2016-05-17 10:35:56 +02:00
Michal Čihař
521b79d0d7 Replace non working pbxt link with link to MariaDB knowledgebase
Signed-off-by: Michal Čihař <michal@cihar.com>
2016-05-17 10:34:52 +02:00
Michal Čihař
a8f15e4133 Adjust test to new code
Signed-off-by: Michal Čihař <michal@cihar.com>
2016-05-13 13:15:49 +02:00
Michal Čihař
62b7c2e8f7 Merge branch 'QA_4_6' 2016-05-13 13:08:48 +02:00
Michal Čihař
3686263f1d Fix test expectations
Signed-off-by: Michal Čihař <michal@cihar.com>
2016-05-13 13:08:38 +02:00
Michal Čihař
cb41491f44 Adjust test to no stripping
Signed-off-by: Michal Čihař <michal@cihar.com>
2016-05-13 11:55:52 +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ř
0fac07105e Remove unused method
Signed-off-by: Michal Čihař <michal@cihar.com>
2016-05-12 15:13:48 +02:00
Michal Čihař
efa1845e23 Merge branch 'QA_4_6' 2016-05-10 15:05:32 +02:00
Michal Čihař
bbe8efaf7c Use https for documentation links
Fixes #12225

Signed-off-by: Michal Čihař <michal@cihar.com>
2016-05-10 15:04:29 +02:00
Michal Čihař
5b5d5edefb Merge remote-tracking branch 'origin/pull/12039' 2016-04-27 09:14:15 +02:00
Michal Čihař
8dbb4544fa Remove $cfg['ThemePath']
Fixes #12196

Signed-off-by: Michal Čihař <michal@cihar.com>
2016-04-20 11:46:35 +02:00
Michal Čihař
05c723a4a3 Merge branch 'QA_4_6' 2016-04-20 10:13:44 +02:00
Michal Čihař
f329a38639 Add missing variable
Signed-off-by: Michal Čihař <michal@cihar.com>
2016-04-20 10:13:39 +02:00
Michal Čihař
d014c2893a Merge branch 'QA_4_6' 2016-04-20 10:09:24 +02:00
Michal Čihař
e0724d2660 Fixed check for ndb version
Fixes #12200

Signed-off-by: Michal Čihař <michal@cihar.com>
2016-04-20 10:07:06 +02:00
Michal Čihař
57dce34085 Merge branch 'QA_4_6' 2016-04-18 16:30:01 +02:00
Michal Čihař
951f1fed5f Add method to slice errors from the handler
This can be useful to pop n-last errors.

Signed-off-by: Michal Čihař <michal@cihar.com>
2016-04-18 13:32:52 +02:00
Michal Čihař
ea428dc860 Make ErrorHandler test more complete
Actually test handling of stored errors.

Signed-off-by: Michal Čihař <michal@cihar.com>
2016-04-18 13:32:52 +02:00
Michal Čihař
267bf1e681 Close file in tests
Signed-off-by: Michal Čihař <michal@cihar.com>
2016-04-11 18:29:54 +02:00
Michal Čihař
9145fc7dae Test reading of compressed files
Signed-off-by: Michal Čihař <michal@cihar.com>
2016-04-11 18:03:05 +02:00
Michal Čihař
29fe4d12af Check import status in testcase
Signed-off-by: Michal Čihař <michal@cihar.com>
2016-04-11 17:52:35 +02:00
Michal Čihař
bf2c76c1b1 Adjust tests to new import code
Signed-off-by: Michal Čihař <michal@cihar.com>
2016-04-11 17:40:56 +02:00
Michal Čihař
9a59032379 Improve collation descriptions
- detect new languages
- detect new Unicode variants
- better describe collation method

Signed-off-by: Michal Čihař <michal@cihar.com>
2016-04-11 15:33:33 +02:00
Michal Čihař
b311780d76 Separate methods for charset and collation dropdowns
They do not share much code in the end and this way the code is more
readable.

Signed-off-by: Michal Čihař <michal@cihar.com>
2016-04-11 13:04:41 +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ř
72099ff05a Ensure this is always defined in the global scope
Signed-off-by: Michal Čihař <michal@cihar.com>
2016-04-11 12:46:29 +02:00
Michal Čihař
0758b601e7 Move charset query generation to to the Util class
Signed-off-by: Michal Čihař <michal@cihar.com>
2016-04-11 12:07:27 +02:00
Michal Čihař
e2deac4b22 Move getting collation to the DBI layer
Signed-off-by: Michal Čihař <michal@cihar.com>
2016-04-11 11:42:29 +02:00