From 733b0296b3257ec59c6a674c3b3c2ec59b09a00a Mon Sep 17 00:00:00 2001 From: Piyush Vijay Date: Thu, 2 Aug 2018 21:06:20 +0530 Subject: [PATCH] Test fixtures for travis. Signed-Off-By: Piyush Vijay --- js/src/ajax.js | 1 - js/src/functions/chart.js | 2 +- js/src/functions/import.js | 2 +- js/src/functions/navigation.js | 2 -- libraries/classes/Config/FormDisplay.php | 3 --- scripts/{build-js-files => build-js.sh} | 21 +++++++++++-------- scripts/create-release.sh | 8 ++----- .../Config/FormDisplayTemplateTest.php | 21 +++++++------------ test/classes/Config/PageSettingsTest.php | 6 +++--- webpack.config.babel.js | 4 ++-- 10 files changed, 29 insertions(+), 41 deletions(-) rename scripts/{build-js-files => build-js.sh} (69%) diff --git a/js/src/ajax.js b/js/src/ajax.js index 5ee303edc0..0080d6f1ec 100644 --- a/js/src/ajax.js +++ b/js/src/ajax.js @@ -94,7 +94,6 @@ export let AJAX = { * @return self For chaining */ registerOnload: function (file, func) { - var eventName = 'onload_' + this.hash(file); $(document).on(eventName, func); if (this._debug) { diff --git a/js/src/functions/chart.js b/js/src/functions/chart.js index e0f856b44c..8c2f00864d 100644 --- a/js/src/functions/chart.js +++ b/js/src/functions/chart.js @@ -63,4 +63,4 @@ export function PMA_createProfilingChart (target, data) { ] }); return chart; -} \ No newline at end of file +} diff --git a/js/src/functions/import.js b/js/src/functions/import.js index 41cab724bf..71e4dab109 100644 --- a/js/src/functions/import.js +++ b/js/src/functions/import.js @@ -38,4 +38,4 @@ export function matchFile (fname) { changePluginOpts(); } } -} \ No newline at end of file +} diff --git a/js/src/functions/navigation.js b/js/src/functions/navigation.js index 82febec917..59d43e6d25 100644 --- a/js/src/functions/navigation.js +++ b/js/src/functions/navigation.js @@ -497,7 +497,6 @@ export function navFilterStateRestore () { ) { let $obj = $('#pma_navigation_tree'); if (! $obj.data('fastFilter')) { - $obj.data( 'fastFilter', new PMA_fastFilter.filter($obj, '') @@ -528,7 +527,6 @@ export function navFilterStateRestore () { return true; } if (! $obj.data('fastFilter')) { - $obj.data( 'fastFilter', new PMA_fastFilter.filter($obj, '') diff --git a/libraries/classes/Config/FormDisplay.php b/libraries/classes/Config/FormDisplay.php index e7cfea9756..085c7de6b4 100644 --- a/libraries/classes/Config/FormDisplay.php +++ b/libraries/classes/Config/FormDisplay.php @@ -365,9 +365,6 @@ class FormDisplay return $htmlOutput; } - public function getFormParams () { - return $this->_formParams; - } /** * Prepares data for input field display and outputs HTML code diff --git a/scripts/build-js-files b/scripts/build-js.sh similarity index 69% rename from scripts/build-js-files rename to scripts/build-js.sh index 2a9a4d8d79..08520ff78d 100755 --- a/scripts/build-js-files +++ b/scripts/build-js.sh @@ -9,22 +9,24 @@ if [ -n "$GATEWAY_INTERFACE" ] ; then exit 1 fi -# Going back into the direcory -cd .. - if [ -f package.json ] ; then echo "Running Yarn Install" yarn install - echo "Creating production build of js files" - yarn prod:build + if [ -d node_modules ] ; then + echo "Creating production build of js files" + yarn prod:build + fi fi #Performing cleanup #Removing yarn files -rm yarn.lock +if [ -f yarn.lock ] ; then + rm -f yarn.lock +fi + if [ -f yarn-error.log ] ; then - rm yarn-error.log + rm -f yarn-error.log fi #Removing node_modules from the directory rm -rf node_modules @@ -33,7 +35,8 @@ rm -rf js/lib #Removing JavaScript source code rm -rf js/src #Removing babel files as they are not required in production -rm .babelrc -rm webpack.config.babel.js +rm -f .babelrc +rm -f webpack.config.babel.js +rm -f .jshintrc echo "Finished building js files" diff --git a/scripts/create-release.sh b/scripts/create-release.sh index 1aef5f4131..ace5d78c75 100755 --- a/scripts/create-release.sh +++ b/scripts/create-release.sh @@ -216,7 +216,7 @@ rm -rf .github rm -rf PMAStandard # Testsuite setup -rm -f .travis.yml .coveralls.yml .scrutinizer.yml .jshintrc .weblate codecov.yml +rm -f .travis.yml .coveralls.yml .scrutinizer.yml .weblate codecov.yml # Remove readme for github rm -f README.rst @@ -274,10 +274,7 @@ if [ ! -d libraries/tcpdf ] ; then fi fi -if [ -f package.json ] ; then - echo "* Running Yarn" - yarn install --production -fi +./scripts/build-js.sh # Remove git metadata rm .git @@ -334,7 +331,6 @@ for kit in $KITS ; do rm doc/html/.buildinfo doc/html/objects.inv # Javascript sources rm -rf js/vendor/openlayers/src/ - rm -rf node_modules fi # Remove developer scripts diff --git a/test/classes/Config/FormDisplayTemplateTest.php b/test/classes/Config/FormDisplayTemplateTest.php index 6102644a82..67ae6ae2c3 100644 --- a/test/classes/Config/FormDisplayTemplateTest.php +++ b/test/classes/Config/FormDisplayTemplateTest.php @@ -539,10 +539,10 @@ class FormDisplayTemplateTest extends TestCase $this->assertEquals( [ - 'validateField(\'testID\', \'PMA_\\\';\', true, ' + '[\'testID\', \'PMA_\\\';\', true, ' . '[\'\\\\r\\\\n\\\\\\\'' - . '' . "\n", + . 'getConfigData(' . "\n" + . 'var i = 1,' . "\n" + . 'i++' . "\n" + . ');' . "\n" + . '' . "\n", $result ); } diff --git a/test/classes/Config/PageSettingsTest.php b/test/classes/Config/PageSettingsTest.php index 43e2ce1890..84ffe3406a 100644 --- a/test/classes/Config/PageSettingsTest.php +++ b/test/classes/Config/PageSettingsTest.php @@ -73,9 +73,9 @@ class PageSettingsTest extends PmaTestCase ); $this->assertContains( - "validateField('MaxRows', 'PMA_validatePositiveNumber', true);\n" - . "validateField('RepeatCells', 'PMA_validateNonNegativeNumber', true);\n" - . "validateField('LimitChars', 'PMA_validatePositiveNumber', true);\n", + "['MaxRows', 'PMA_validatePositiveNumber', true],\n" + . "['RepeatCells', 'PMA_validateNonNegativeNumber', true],\n" + . "['LimitChars', 'PMA_validatePositiveNumber', true],\n", $html ); } diff --git a/webpack.config.babel.js b/webpack.config.babel.js index 936a351055..fcd0d02143 100644 --- a/webpack.config.babel.js +++ b/webpack.config.babel.js @@ -3,7 +3,7 @@ import webpack from 'webpack'; import BundleAnalyzerPlugin from 'webpack-bundle-analyzer'; function WebpackConfig (env) { - let BindleAnalyzer = BundleAnalyzerPlugin.BundleAnalyzerPlugin; + let BundleAnalyzer = BundleAnalyzerPlugin.BundleAnalyzerPlugin; // environment either development or production var MODE; @@ -49,7 +49,7 @@ function WebpackConfig (env) { new webpack.NoEmitOnErrorsPlugin() ]; if (MODE === 'development') { - plugins.push(new BindleAnalyzer()); + plugins.push(new BundleAnalyzer()); } return {