zapier convert: Add test for renderPackageJson and fix escaping packa…

…ge description
zapier · Feb 20, 2018 · 6d8014e · 6d8014e
1 parent d452dd6
commit 6d8014e
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 7 deletions.
diff --git a/src/tests/utils/convert.js b/src/tests/utils/convert.js
@@ -673,4 +673,21 @@ const getSessionKey = (z, bundle) => {
       });
     });
   });
+
+  describe('render package.json', () => {
+    it('should render track info', () => {
+      const wbDef = {
+        general: {
+          title: 'Example App',
+          description: 'It\'s an "example" app.',
+          app_id: 1234
+        }
+      };
+      return convert.renderPackageJson(wbDef).then(content => {
+        const pkg = JSON.parse(content);
+        pkg.zapier.convertedFromAppID.should.eql(1234);
+        pkg.zapier.convertedByCLIVersion.should.be.ok();
+      });
+    });
+  });
 });
diff --git a/src/utils/convert.js b/src/utils/convert.js
@@ -5,7 +5,7 @@ const stripComments = require('strip-comments');
 const { camelCase, snakeCase } = require('./misc');
 const { copyFile, readFile, writeFile, ensureDir } = require('./files');
 const { printStarting, printDone } = require('./display');
-const CLI_VERSION = require('../../package.json').version;
+const { PACKAGE_VERSION } = require('../constants');
 
 const TEMPLATE_DIR = path.join(__dirname, '../../scaffold/convert');
 const ZAPIER_LEGACY_SCRIPTING_RUNNER_VERSION = '1.0.0';
@@ -935,18 +935,21 @@ const writeIndex = (legacyApp, newAppDir) => {
 const renderPackageJson = legacyApp => {
   const { needsLegacyScriptingRunner } = getMetaData(legacyApp);
 
+  // Not using escapeSpecialChars because we don't want to escape single quotes (not allowed in JSON)
+  const description = legacyApp.general.description
+    .replace(/\n/g, '\\n')
+    .replace(/"/g, '\\"');
+
   const templateContext = {
     NAME: _.kebabCase(legacyApp.general.title),
-    DESCRIPTION: escapeSpecialChars(legacyApp.general.description),
+    DESCRIPTION: description,
     APP_ID: legacyApp.general.app_id,
-    CLI_VERSION: CLI_VERSION
+    CLI_VERSION: PACKAGE_VERSION
   };
 
-  const zapierCoreVersion = require('../../package.json').version;
-
   const dependencies = [];
 
-  dependencies.push(`"zapier-platform-core": "${zapierCoreVersion}"`);
+  dependencies.push(`"zapier-platform-core": "${PACKAGE_VERSION}"`);
 
   if (needsLegacyScriptingRunner) {
     // TODO: Make conditional
@@ -1071,5 +1074,6 @@ module.exports = {
   getHeader,
   getBeforeRequests,
   getAfterResponses,
-  hasAuth
+  hasAuth,
+  renderPackageJson
 };