From f8586d5039cf15cd6f90d07add62e3306822db4f Mon Sep 17 00:00:00 2001 From: Jose David Rodriguez Velasco Date: Wed, 30 Jun 2021 09:15:42 -0700 Subject: [PATCH] revert(apex-methods-automock): reverts functionality providing apex automocks (#234) fixes #232 This PR reverts #231, #210, and #208. They provided functionality to auto mock apex methods. **Note:** Test authors will need to keep implementing their own apex (+apexContinuation) methods mocks after this PR is merged. * Revert "fix: apex automock should return a resolved promise (#231)" This reverts commit 544f95a85f3e08f624dc3f9d091538c96917da08. * Revert "fix: add apex stubs to the transformIgnorePatterns (#210)" This reverts commit fe8381a72cb4b6403f27e1c6fa030dc5c22609cb. * Revert "fix: automock apex methods with valid wire adapters (#208)" This reverts commit 125c68992acc3af85946c4f93c0cfd1985c85cfa. --- .eslintrc | 2 +- jest.config.js | 19 ---------------- .../method/__tests__/apex-method.test.js | 18 --------------- src/apex-stubs/method/method.js | 9 -------- src/config.js | 2 +- src/resolver.js | 22 +++---------------- 6 files changed, 5 insertions(+), 67 deletions(-) delete mode 100644 jest.config.js delete mode 100644 src/apex-stubs/method/__tests__/apex-method.test.js delete mode 100644 src/apex-stubs/method/method.js diff --git a/.eslintrc b/.eslintrc index 3cfb4463..bd3938b7 100644 --- a/.eslintrc +++ b/.eslintrc @@ -14,7 +14,7 @@ }, "overrides": [ { - "files": ["src/lightning-stubs/**", "src/apex-stubs/**"], + "files": ["src/lightning-stubs/**"], "parser": "babel-eslint", "parserOptions": { "sourceType": "module" diff --git a/jest.config.js b/jest.config.js deleted file mode 100644 index 90abf16d..00000000 --- a/jest.config.js +++ /dev/null @@ -1,19 +0,0 @@ -/* - * Copyright (c) 2018, salesforce.com, inc. - * All rights reserved. - * SPDX-License-Identifier: MIT - * For full license text, see the LICENSE file in the repo root or https://opensource.org/licenses/MIT - */ -'use strict'; - -const path = require('path'); - -module.exports = { - moduleFileExtensions: ['js', 'html'], - transform: { - '^.+\\.(js|html|css)$': require.resolve('@lwc/jest-transformer'), - }, - resolver: path.resolve(__dirname, './src/resolver.js'), - testPathIgnorePatterns: ['/node_modules/'], - snapshotSerializers: [require.resolve('@lwc/jest-serializer')], -}; diff --git a/src/apex-stubs/method/__tests__/apex-method.test.js b/src/apex-stubs/method/__tests__/apex-method.test.js deleted file mode 100644 index 3183485d..00000000 --- a/src/apex-stubs/method/__tests__/apex-method.test.js +++ /dev/null @@ -1,18 +0,0 @@ -/* - * Copyright (c) 2018, salesforce.com, inc. - * All rights reserved. - * SPDX-License-Identifier: MIT - * For full license text, see the LICENSE file in the repo root or https://opensource.org/licenses/MIT - */ -import method from '../method'; - -describe('apex resources', () => { - it('should return a resolved promise when apex method is invoked imperatively', () => { - let resolved = false; - method().then(() => (resolved = true)); - - return Promise.resolve().then(() => { - expect(resolved).toBe(true); - }); - }); -}); diff --git a/src/apex-stubs/method/method.js b/src/apex-stubs/method/method.js deleted file mode 100644 index 83a3f59e..00000000 --- a/src/apex-stubs/method/method.js +++ /dev/null @@ -1,9 +0,0 @@ -/* - * Copyright (c) 2021, salesforce.com, inc. - * All rights reserved. - * SPDX-License-Identifier: MIT - * For full license text, see the LICENSE file in the repo root or https://opensource.org/licenses/MIT - */ -import { createApexTestWireAdapter } from '@salesforce/wire-service-jest-util'; - -export default createApexTestWireAdapter(jest.fn().mockImplementation(() => Promise.resolve())); diff --git a/src/config.js b/src/config.js index 78c515da..0c9c8aa8 100644 --- a/src/config.js +++ b/src/config.js @@ -26,7 +26,7 @@ const jestConfig = { '^.+\\.(js|html|css)$': require.resolve('@lwc/jest-transformer'), }, transformIgnorePatterns: [ - '/node_modules/(?!(.*@salesforce/sfdx-lwc-jest/src/(lightning|apex)-stubs)/)', + '/node_modules/(?!(.*@salesforce/sfdx-lwc-jest/src/lightning-stubs)/)', ], setupFilesAfterEnv: jestPreset.setupFilesAfterEnv || [], resolver: path.resolve(__dirname, './resolver.js'), diff --git a/src/resolver.js b/src/resolver.js index 4679e416..14eaa5b5 100644 --- a/src/resolver.js +++ b/src/resolver.js @@ -47,21 +47,13 @@ function resolveAsFile(name, extensions) { return undefined; } -function getModuleMock(modulePath, moduleName) { - const p = path.join(__dirname, modulePath, moduleName); +function getLightningMock(modulePath) { + const p = path.join(__dirname, 'lightning-stubs', modulePath); if (fs.existsSync(p)) { - return path.join(p, moduleName + '.js'); + return path.join(p, modulePath + '.js'); } } -function getLightningMock(moduleName) { - return getModuleMock('lightning-stubs', moduleName); -} - -function getApexMock(moduleName) { - return getModuleMock('apex-stubs', moduleName); -} - function getModule(modulePath, options) { const { ns, name } = getInfoFromId(modulePath); @@ -69,14 +61,6 @@ function getModule(modulePath, options) { return getLightningMock(name); } - // See https://developer.salesforce.com/docs/component-library/documentation/en/lwc/reference_salesforce_modules - if ( - modulePath.startsWith('@salesforce/apex/') || - modulePath.startsWith('@salesforce/apexContinuation/') - ) { - return getApexMock('method'); - } - if (ns === DEFAULT_NAMESPACE) { const paths = getModulePaths(); for (let i = 0; i < paths.length; i++) {