From 3468cbfa35e66b99d82e2a462f8034551eaa4b59 Mon Sep 17 00:00:00 2001 From: soupette Date: Tue, 24 Aug 2021 10:36:38 +0200 Subject: [PATCH] Fix tests Signed-off-by: soupette --- .../AuthenticatedApp/tests/index.test.js | 4 +- .../pages/App/tests/index.test.js | 4 +- .../admin/admin/src/tests/StrapiApp.test.js | 4 +- packages/core/helper-plugin/babel.config.js | 18 +++++ packages/core/helper-plugin/package.json | 15 +++-- packages/core/helper-plugin/webpack.config.js | 65 +++++++++++++++++++ .../contentManagerHooks/addColumnToTable.js | 2 +- .../tests/addColumnToTable.test.js | 6 +- .../src/pages/Providers/tests/index.test.js | 4 +- yarn.lock | 17 ++++- 10 files changed, 123 insertions(+), 16 deletions(-) create mode 100644 packages/core/helper-plugin/babel.config.js create mode 100644 packages/core/helper-plugin/webpack.config.js diff --git a/packages/core/admin/admin/src/components/AuthenticatedApp/tests/index.test.js b/packages/core/admin/admin/src/components/AuthenticatedApp/tests/index.test.js index d5103582c5..55d9065d7f 100644 --- a/packages/core/admin/admin/src/components/AuthenticatedApp/tests/index.test.js +++ b/packages/core/admin/admin/src/components/AuthenticatedApp/tests/index.test.js @@ -82,8 +82,8 @@ describe('Admin | components | AuthenticatedApp', () => { border: 6px solid #f3f3f3; border-top: 6px solid #1c91e7; border-radius: 50%; - -webkit-animation: fEWCgj 2s linear infinite; - animation: fEWCgj 2s linear infinite; + -webkit-animation: cilQsd 2s linear infinite; + animation: cilQsd 2s linear infinite; }
{ border: 6px solid #f3f3f3; border-top: 6px solid #1c91e7; border-radius: 50%; - -webkit-animation: fEWCgj 2s linear infinite; - animation: fEWCgj 2s linear infinite; + -webkit-animation: cilQsd 2s linear infinite; + animation: cilQsd 2s linear infinite; } .c0 { diff --git a/packages/core/admin/admin/src/tests/StrapiApp.test.js b/packages/core/admin/admin/src/tests/StrapiApp.test.js index 358ef47a07..09322fed74 100644 --- a/packages/core/admin/admin/src/tests/StrapiApp.test.js +++ b/packages/core/admin/admin/src/tests/StrapiApp.test.js @@ -37,8 +37,8 @@ describe('ADMIN | StrapiApp', () => { border: 6px solid #f3f3f3; border-top: 6px solid #1c91e7; border-radius: 50%; - -webkit-animation: fEWCgj 2s linear infinite; - animation: fEWCgj 2s linear infinite; + -webkit-animation: cilQsd 2s linear infinite; + animation: cilQsd 2s linear infinite; }
{ + nodeModules.push(new RegExp(`^${module}(/.+)?$`)); +}); + +module.exports = { + entry: `${__dirname}/lib/src/index.js`, + externals: nodeModules, + // mode: process.env.NODE_ENV, + mode: 'production', + devtool: 'source-map', + output: { + path: `${__dirname}/build`, + filename: `helper-plugin.js`, + library: { + name: 'helperPlugin', + type: 'umd', + }, + + umdNamedDefine: true, + }, + module: { + rules: [ + { + test: /\.js$/, + include: path.resolve(__dirname, 'lib', 'src'), + loader: 'babel-loader', + exclude: /(node_modules)/, + }, + { + test: /\.css$/, + use: ['style-loader', 'css-loader'], + }, + + { + test: /\.(png|svg|jpg|gif)$/, + loader: 'url-loader', + options: { + limit: 8192, + }, + }, + ], + }, + resolve: { + extensions: ['*', '.js'], + cacheWithContext: false, + }, + plugins: [ + new webpack.EnvironmentPlugin({ + NODE_ENV: 'production', + }), + new MiniCssExtractPlugin({ + filename: 'style.css', + }), + ], +}; diff --git a/packages/plugins/i18n/admin/src/contentManagerHooks/addColumnToTable.js b/packages/plugins/i18n/admin/src/contentManagerHooks/addColumnToTable.js index b4369c25cc..a10174b2c6 100644 --- a/packages/plugins/i18n/admin/src/contentManagerHooks/addColumnToTable.js +++ b/packages/plugins/i18n/admin/src/contentManagerHooks/addColumnToTable.js @@ -6,7 +6,7 @@ const addColumnToTableHook = ({ displayedHeaders, layout }) => { const isFieldLocalized = get(layout, 'contentType.pluginOptions.i18n.localized', false); if (!isFieldLocalized) { - return displayedHeaders; + return { displayedHeaders, layout }; } return { diff --git a/packages/plugins/i18n/admin/src/contentManagerHooks/tests/addColumnToTable.test.js b/packages/plugins/i18n/admin/src/contentManagerHooks/tests/addColumnToTable.test.js index 94b0aa61b4..76e62f2f95 100644 --- a/packages/plugins/i18n/admin/src/contentManagerHooks/tests/addColumnToTable.test.js +++ b/packages/plugins/i18n/admin/src/contentManagerHooks/tests/addColumnToTable.test.js @@ -9,8 +9,10 @@ describe('i18n | contentManagerHooks | addColumnToTable', () => { const result = addColumnToTable({ displayedHeaders, layout }); - expect(result).toHaveLength(1); - expect(result).toEqual(['one']); + expect(result).toHaveProperty('displayedHeaders'); + expect(result).toHaveProperty('layout'); + expect(result.displayedHeaders).toHaveLength(1); + expect(result.displayedHeaders).toEqual(['one']); }); it('adds a header to the displayedHeaders array when the content type is localized', () => { diff --git a/packages/plugins/users-permissions/admin/src/pages/Providers/tests/index.test.js b/packages/plugins/users-permissions/admin/src/pages/Providers/tests/index.test.js index 31207160b3..613d947e76 100644 --- a/packages/plugins/users-permissions/admin/src/pages/Providers/tests/index.test.js +++ b/packages/plugins/users-permissions/admin/src/pages/Providers/tests/index.test.js @@ -54,8 +54,8 @@ describe('Admin | containers | ProvidersPage', () => { border: 6px solid #f3f3f3; border-top: 6px solid #1c91e7; border-radius: 50%; - -webkit-animation: fEWCgj 2s linear infinite; - animation: fEWCgj 2s linear infinite; + -webkit-animation: cilQsd 2s linear infinite; + animation: cilQsd 2s linear infinite; } .c1 { diff --git a/yarn.lock b/yarn.lock index c917c1a8bb..6bebcebb3d 100644 --- a/yarn.lock +++ b/yarn.lock @@ -608,7 +608,7 @@ "@babel/helper-plugin-utils" "^7.14.5" "@babel/plugin-syntax-dynamic-import" "^7.8.3" -"@babel/plugin-proposal-export-default-from@^7.12.1": +"@babel/plugin-proposal-export-default-from@7.14.5", "@babel/plugin-proposal-export-default-from@^7.12.1": version "7.14.5" resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-export-default-from/-/plugin-proposal-export-default-from-7.14.5.tgz#8931a6560632c650f92a8e5948f6e73019d6d321" integrity sha512-T8KZ5abXvKMjF6JcoXjgac3ElmXf0AWzJwi2O/42Jk+HmCky3D9+i1B7NPP1FblyceqTevKeV/9szeikFoaMDg== @@ -624,6 +624,14 @@ "@babel/helper-plugin-utils" "^7.14.5" "@babel/plugin-syntax-export-namespace-from" "^7.8.3" +"@babel/plugin-proposal-function-bind@7.14.5": + version "7.14.5" + resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-function-bind/-/plugin-proposal-function-bind-7.14.5.tgz#83bbc684312bf82bda46ec7cb52dc226e891833f" + integrity sha512-PSQk5JImi81nFAzIebCEqkd0aiP9LDVKLCIH+0yR66JV8cQ1oZ8IRK9NNaA5nw9sjo0cPXxuBPCqgqcpugR8tA== + dependencies: + "@babel/helper-plugin-utils" "^7.14.5" + "@babel/plugin-syntax-function-bind" "^7.14.5" + "@babel/plugin-proposal-json-strings@^7.13.8", "@babel/plugin-proposal-json-strings@^7.14.5": version "7.14.5" resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-json-strings/-/plugin-proposal-json-strings-7.14.5.tgz#38de60db362e83a3d8c944ac858ddf9f0c2239eb" @@ -782,6 +790,13 @@ dependencies: "@babel/helper-plugin-utils" "^7.14.5" +"@babel/plugin-syntax-function-bind@^7.14.5": + version "7.14.5" + resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-function-bind/-/plugin-syntax-function-bind-7.14.5.tgz#eb7544014fe349f48acbebc5084eeadde2efe57e" + integrity sha512-gstAIrKtlPwrQaRz4uK+kT7zI2p5MQqX41SeO+kZKH1XGO1jL0nLZBWznRigPpkem6LfIoG2EduQZmPBcUwEmg== + dependencies: + "@babel/helper-plugin-utils" "^7.14.5" + "@babel/plugin-syntax-import-meta@^7.8.3": version "7.10.4" resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-import-meta/-/plugin-syntax-import-meta-7.10.4.tgz#ee601348c370fa334d2207be158777496521fd51"