Merge pull request #1771 from madhuracj/rfe812

#812 store export definitions for reuse

2 files changed, 1 insertions, 10 deletions

diff --git a/test/libraries/PMA_display_export_test.php b/test/libraries/PMA_display_export_test.php
index 41357101f0..5cf00ecff2 100644
--- a/test/libraries/PMA_display_export_test.php
+++ b/test/libraries/PMA_display_export_test.php
@@ -180,16 +180,6 @@ class PMA_DisplayExport_Test extends PHPUnit_Framework_TestCase
             $unlim_num_rows_str
         );
 
-        //validate 1: PMA_getHtmlForExportOptionHeader
-        $this->assertContains(
-            '<div class="exportoptions" id="header">',
-            $html
-        );
-        $this->assertContains(
-            __('Exporting databases from the current server'),
-            $html
-        );
-
         //validate 2: PMA_getHtmlForExportOptionsMethod
         $this->assertContains(
             $cfg['Export']['method'],
diff --git a/test/libraries/PMA_relation_cleanup_test.php b/test/libraries/PMA_relation_cleanup_test.php
index 876fe6990c..3e4a456b85 100644
--- a/test/libraries/PMA_relation_cleanup_test.php
+++ b/test/libraries/PMA_relation_cleanup_test.php
@@ -55,6 +55,7 @@ class PMA_Relation_Cleanup_Test extends PHPUnit_Framework_TestCase
         $GLOBALS['cfg']['Server']['savedsearches'] = 'savedsearches';
         $GLOBALS['cfg']['Server']['central_columns'] = 'central_columns';
         $GLOBALS['cfg']['Server']['designer_settings'] = 'designer_settings';
+        $GLOBALS['cfg']['Server']['exporttemplates'] = 'pma__exporttemplates';
 
         $this->redefineRelation();
     }