Commit Graph

1506 Commits

Author SHA1 Message Date
Michal Čihař
b5f724d0f7 Merge pull request #924 from ayushchd/sel
Selenium fixes and BrowserStack configuration
2014-02-15 10:53:45 +01:00
Ayush Chaudhary
6d90d5eb81 configure Selenium tests for browserstack
Signed-off-by: Ayush Chaudhary <ayushchd@gmail.com>
2014-02-14 16:39:24 +05:30
Ayush Chaudhary
08563e4e38 Fix minor selenium test issues
Signed-off-by: Ayush Chaudhary <ayushchd@gmail.com>
2014-02-14 16:38:42 +05:30
Jeff Chan
29ca1f7892 Use stable sort for removeProperty of OptionsPropertyGroup.
The original custom sort function is not stable, which causes
different results on HHVM. It now uses the default array_diff
function which is stable. Also updated an incorrect test.

Signed-off-by: Jeff Chan <jefftchan@gmail.com>
2014-02-12 03:07:27 +00:00
Jeff Chan
9a5603f908 Cast unit size value for formatByteDown to float to avoid overflow.
Add another test case to formatByteDown which fails on HHVM 2.4

Signed-off-by: Jeff Chan <jefftchan@gmail.com>
2014-02-10 18:25:54 +00:00
Marc Delisle
e8f14e0ac0 Merge pull request #897 from dhananjay92/bug#4237
Fix for bug#4237.
2014-02-07 12:37:33 -05:00
Dhananjay
0a18d86059 Fix for bug#4237.
Signed-off-by: Dhananjay <dhananjaynakrani@gmail.com>
2014-02-07 11:56:46 +05:30
Chanaka Indrajith
4457f40ef4 Support for export server/db/table without views
Signed-off-by: Chanaka Indrajith <pe.chanaka.ck@gmail.com>
2014-02-06 23:03:04 +05:30
Chanaka Indrajith
55151381fa rfe-1403 : Support for export only triggers/stored procedures
Signed-off-by: Chanaka Indrajith <pe.chanaka.ck@gmail.com>
2014-02-04 22:47:00 +05:30
Michal Čihař
396991a194 Merge remote-tracking branch 'origin/QA_4_1' 2014-02-03 09:01:55 +01:00
Michal Čihař
87bbb24496 Fix tescase for new parameter passed to recaptcha
Signed-off-by: Michal Čihař <mcihar@suse.cz>
2014-02-03 09:00:31 +01:00
Michal Čihař
0e5be0dff1 Fix test case expectations
Signed-off-by: Michal Čihař <michal@cihar.com>
2014-02-02 12:27:32 +01:00
Michal Čihař
a4788a9c90 Adjust tests to new messages
Signed-off-by: Michal Čihař <michal@cihar.com>
2014-02-02 11:42:42 +01:00
Marc Delisle
1b639952d6 Merge commit '8ee7fc8' 2014-01-30 13:24:56 -05:00
Marc Delisle
8ee7fc8a9c bug #4265 Missing datepicker icon for DATETIME(length)
Signed-off-by: Marc Delisle <marc@infomarc.info>
2014-01-30 13:23:31 -05:00
Madhura Jayaratne
cdd53ace21 Merge branch 'QA_4_1'
Conflicts:
	libraries/Util.class.php
	test/libraries/PMA_insert_edit_test.php
2014-01-29 23:30:33 +05:30
Marc Delisle
a8277b944f Merge pull request #881 from Chanaka/rfe-1483
rfe-1483 : Export database without triggers
2014-01-29 09:46:57 -08:00
Madhura Jayaratne
c1c50b5944 Revert e8fa9e5335, ea0ad9d41c and f36fbfd4c6
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2014-01-29 23:06:43 +05:30
Michal Čihař
e7288ef4c5 Adjust test to current mesasge 2014-01-29 14:27:18 +01:00
Chanaka Indrajith
2988aebc86 rfe-1483 : Export database without triggers
Signed-off-by: Chanaka Indrajith <pe.chanaka.ck@gmail.com>
2014-01-28 23:09:59 +05:30
Marc Delisle
2a2d4cd2bb Fix merge conflict
Signed-off-by: Marc Delisle <marc@infomarc.info>
2014-01-27 12:48:11 -05:00
Sampath Liyanage
ea0ad9d41c unit tests updated. Some global variables were set in setup functions of some test files. one testing function with mockobjects was changed from once() to exactly(2) because the bug fix has made that function calls twice
Signed-off-by: Sampath Liyanage <plbsam@gmail.com>
2014-01-27 21:53:36 +05:30
Marc Delisle
3d72b1cc87 Fix typos
Signed-off-by: Marc Delisle <marc@infomarc.info>
2014-01-24 08:24:14 -05:00
Marc Delisle
0e88efbf9b Merge branch 'QA_4_1' 2014-01-22 08:37:58 -05:00
Marc Delisle
7064e047a3 bug #4218 Chrome behavior with date fields
Signed-off-by: Marc Delisle <marc@infomarc.info>
2014-01-22 08:37:32 -05:00
Madhura Jayaratne
16587a8c6b Suffix files containing classes with .class.php file extension
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2014-01-22 18:19:48 +05:30
Madhura Jayaratne
9f2d8f47e4 Remove obsolete method
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2014-01-22 17:19:34 +05:30
Marc Delisle
8ae7c6935c Remove unused code
Signed-off-by: Marc Delisle <marc@infomarc.info>
2014-01-12 07:35:12 -05:00
Hugues Peccatte
ae0c9218ce PHPDoc update.
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
2014-01-09 20:51:40 +01:00
Hugues Peccatte
f7d5da319e Fix coding style.
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
2014-01-09 18:22:11 +01:00
Hugues Peccatte
33cc76d3c3 Fix unit test.
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
2014-01-07 21:16:18 +01:00
Marc Delisle
eedc0f3071 Merge commit '10a6260' 2014-01-06 09:37:02 -05:00
Marc Delisle
10a6260180 Fix failing test
Signed-off-by: Marc Delisle <marc@infomarc.info>
2014-01-06 09:35:54 -05:00
Michal Čihař
9d215e6ac5 Remove unused parameter binary_log_file_names
Signed-off-by: Michal Čihař <michal@cihar.com>
2014-01-06 11:33:25 +01:00
Michal Čihař
790a2c2bee Rename variable to match current meaning
There is not only INFORMATION_SCHEMA now, so the variable should have
more generic name.

Signed-off-by: Michal Čihař <michal@cihar.com>
2014-01-06 11:11:34 +01:00
Hugues Peccatte
6b01f835cb Rename too short variables.
Remove useless initializations.
Rename too long variables.

Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
2014-01-04 20:46:18 +01:00
Marc Delisle
a6926c4f43 Improve function names
Signed-off-by: Marc Delisle <marc@infomarc.info>
2014-01-02 08:31:37 -05:00
Chanaka Indrajith
74e22e34bf Merge remote branch 'upstream/master' into rfe_1462 2014-01-01 19:35:35 +05:30
Marc Delisle
7cd460d511 Merge branch 'QA_4_1' 2013-12-28 06:25:43 -05:00
Marc Delisle
8cc5103b00 Fix failing test
Signed-off-by: Marc Delisle <marc@infomarc.info>
2013-12-28 06:13:51 -05:00
Hugues Peccatte
4f05a8abfa Merge pull request #808 from Tithugues/nestedLevels
Nested levels
2013-12-27 05:33:10 -08:00
Hugues Peccatte
ef49eff205 Standardize names of functions.
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
2013-12-27 13:49:57 +01:00
Marc Delisle
33b180e9d8 Merge branch 'master' of https://github.com/phpmyadmin/phpmyadmin 2013-12-25 19:25:33 -05:00
Chanaka Indrajith
4ca8f9cdc2 Added table comment tool tip for tables, listed in database structure page
Signed-off-by: Chanaka Indrajith <pe.chanaka.ck@gmail.com>
2013-12-26 00:32:43 +05:30
Marc Delisle
edde7126ce Move functions to library file
Signed-off-by: Marc Delisle <marc@infomarc.info>
2013-12-25 09:18:29 -05:00
Hugues Peccatte
094313412d Fix file names.
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
2013-12-24 16:46:04 +01:00
Madhura Jayaratne
895bd1e3cd Merge branch 'master' of github.com:phpmyadmin/phpmyadmin 2013-12-24 12:46:14 +05:30
Madhura Jayaratne
d80406ed66 Reduce coupling between storage engine names and their corresponding class names. Add some missing doc comments
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2013-12-24 12:41:32 +05:30
Hugues Peccatte
8a6f0bbe53 Add missing include in unit tests.
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
2013-12-23 21:31:51 +05:30
Hugues Peccatte
6a8276a855 Update unit tests.
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
2013-12-23 21:31:20 +05:30