fixup! Add osls to the tests suite

Author: j0k3r

examples/include-external-npm-packages-lock-file/_setup.js

@@ -3,6 +3,24 @@
 // That file is only used by the e2e tests
 
 const path = require('path');
+const fse = require('fs-extra');
+
+async function replacePluginLockReference(lockPath, pluginPackagePath) {
+  const lock = await fse.readJson(lockPath);
+  const pluginPackage = lock.packages['../..'];
+  const installedPackage = lock.packages['node_modules/serverless-webpack'] || {};
+
+  lock.packages[''].devDependencies['serverless-webpack'] = `file:${pluginPackagePath}`;
+  delete lock.packages['../..'];
+  lock.packages['node_modules/serverless-webpack'] = {
+    ...pluginPackage,
+    ...installedPackage,
+    resolved: `file:${pluginPackagePath}`
+  };
+  delete lock.packages['node_modules/serverless-webpack'].link;
+
+  await fse.writeJson(lockPath, lock, { spaces: 2 });
+}
 
 module.exports = async (originalFixturePath, fixturePath, utils) => {
   const pluginPath = path.resolve(originalFixturePath, '..', '..');
@@ -16,7 +34,7 @@ module.exports = async (originalFixturePath, fixturePath, utils) => {
     utils.replaceInFile(SLS_CONFIG_PATH, '- serverless-webpack', `- ${pluginPath}`),
     utils.replaceInFile(WEBPACK_CONFIG_PATH, "'serverless-webpack'", `'${pluginPath}'`),
     utils.replaceInFile(PACKAGE_JSON_PATH, 'file:../..', `file:${utils.pluginPackagePath}`),
-    utils.replaceInFile(LOCK_PATH, '../..', `${utils.pluginPackagePath}`)
+    replacePluginLockReference(LOCK_PATH, utils.pluginPackagePath)
   ]);
 
   const command = /^win/.test(process.platform) ? 'npm.cmd' : 'npm';

lib/validate.js

@@ -47,16 +47,17 @@ module.exports = {
     };
 
     const getEntryExtension = fileName => {
+      const servicePath = this.serverless.config.servicePath || undefined;
       const files = glob.sync(`${fileName}.*`, {
-        cwd: this.serverless.config.servicePath || undefined,
+        cwd: servicePath,
         nodir: true,
         ignore: this.configuration.excludeFiles ? this.configuration.excludeFiles : undefined
       });
 
       if (_.isEmpty(files)) {
         // If we cannot find any handler we should terminate with an error
         throw new this.serverless.classes.Error(
-          `No matching handler found for '${fileName}' in '${this.serverless.config.servicePath}'. Check your service definition.`
+          `No matching handler found for '${fileName}' in '${servicePath || process.cwd()}'. Check your service definition.`
         );
       }
 

tests/utils.test.js

@@ -29,7 +29,7 @@ describe('Utils', () => {
       expect(err).toHaveProperty('stderr', 'stderr');
     });
 
-    it('should print message and stderr', () => {
+    it('should include cwd, stdout and stderr in toString()', () => {
       const err = new Utils.SpawnError('message', 'stdout', 'stderr', { cwd: 'cwd' });
 
       expect(err.toString()).toEqual('message\ncwd: cwd\nstdout:\nstdout\nstderr:\nstderr');

tests/validate.test.js

@@ -1125,7 +1125,7 @@ describe('validate', () => {
         globMock.sync.mockReturnValue([]);
         expect(() => {
           module.validate();
-        }).toThrow(/No matching handler found for/);
+        }).toThrow(`No matching handler found for 'module1' in '${process.cwd()}'. Check your service definition.`);
       });
 
       it('should throw an exception if `options.function` is defined but not found in entries from serverless.yml', () => {