Merge pull request #157 from Meteor-Community-Packages/fix/coverage-i…

…ntegration

Fix/coverage integration

.eslintrc

@@ -16,6 +16,10 @@
     "max-len": 0,
     "no-console": 0,
     "no-plusplus": 0,
-    "object-curly-newline": 0
+    "object-curly-newline": 0,
+    "template-curly-spacing" : "off",
+    "indent": ["error", 2, {
+      "ignoredNodes": ["TemplateLiteral"]
+    }]
   }
 }

package/package.js

@@ -3,7 +3,7 @@ Package.describe({
   summary: 'Run Meteor package or app tests with Mocha',
   git: 'https://github.com/meteortesting/meteor-mocha.git',
   documentation: '../README.md',
-  version: '3.0.0',
+  version: '3.2.0',
   testOnly: true,
 });
 
@@ -16,10 +16,10 @@ Package.onUse(function onUse(api) {
 
   api.use([
     'meteortesting:[email protected]',
-    '[email protected] || 2.0.0'
+    'fetch'
   ], 'server');
   api.use('browser-policy', 'server', { weak: true });
-  api.use('lmieulet:[email protected] || 2.0.1 || 3.0.0 || 4.1.0', 'client', { weak: true });
+  api.use('lmieulet:[email protected] || 2.0.1 || 3.0.0 || 4.0.0 || 5.0.0', 'client', { weak: true });
 
   api.mainModule('client.js', 'client');
   api.mainModule('server.js', 'server');

package/server.handleCoverage.js

@@ -1,4 +1,28 @@
-import { HTTP } from 'meteor/http';
+import { fetch } from 'meteor/fetch';
+
+/**
+ * Makes a standardized HTTP GET request to the server.
+ * @private
+ * @param url {string} relative path to the server endpoint
+ * @param message {string} message to be added, in case an error is thrown
+ * @return {Promise<any>}
+ */
+const request = async ({ url, message }) => {
+  let response;
+  let data;
+  try {
+    response = await fetch(Meteor.absoluteUrl(url));
+    data = await response.json();
+  } catch (error) {
+    throw new Error(`${message} ${error.message}`);
+  }
+
+  if (response?.status !== 200) {
+    throw new Error(`${message} ${response?.status} ${data}`);
+  }
+
+  return data;
+};
 
 export default (coverageOptions) => {
   let promise = Promise.resolve(true);
@@ -12,57 +36,29 @@ export default (coverageOptions) => {
 
     cLog('Export code coverage');
 
-    const importCoverageDump = () => new Promise((resolve, reject) => {
+    const importCoverageDump = () => async () => {
       cLog('- In coverage');
-      HTTP.get(Meteor.absoluteUrl('coverage/import'), (error, response) => {
-        if (error) {
-          reject(new Error('Failed to import coverage file'));
-          return;
-        }
-
-        const { statusCode } = response;
-
-        if (statusCode !== 200) {
-          reject(new Error('Failed to import coverage file'));
-        }
-        resolve();
+      return request({
+        url: 'coverage/import',
+        message: 'Failed to import coverage file.',
       });
-    });
+    };
 
-    const exportReport = (fileType, reportType) => new Promise((resolve, reject) => {
+    const exportReport = async (fileType, reportType) => {
       cLog(`- Out ${fileType}`);
-      const url = Meteor.absoluteUrl(`/coverage/export/${fileType}`);
-      HTTP.get(url, (error, response) => {
-        if (error) {
-          reject(new Error(`Failed to save ${fileType} ${reportType}`));
-          return;
-        }
-
-        const { statusCode } = response;
-
-        if (statusCode !== 200) {
-          reject(new Error(`Failed to save ${fileType} ${reportType}`));
-        }
-        resolve();
+      return request({
+        url: `/coverage/export/${fileType}`,
+        message: `Failed to save ${fileType} ${reportType}.`,
       });
-    });
+    };
 
-    const exportRemap = () => new Promise((resolve, reject) => {
+    const exportRemap = async () => {
       cLog('- Out remap');
-      HTTP.get(Meteor.absoluteUrl('/coverage/export/remap'), (error, response) => {
-        if (error) {
-          reject(new Error('Failed to remap your coverage'));
-          return;
-        }
-
-        const { statusCode } = response;
-
-        if (statusCode !== 200) {
-          reject(new Error('Failed to remap your coverage'));
-        }
-        resolve();
+      return request({
+        url: '/coverage/export/remap',
+        message: '`Failed to remap your coverage.',
       });
-    });
+    };
 
     if (coverageOptions.in.coverage) {
       promise = promise.then(() => importCoverageDump());

tests/dummy_app/.meteor/versions

@@ -29,12 +29,16 @@ [email protected]
 [email protected]
 [email protected]
 [email protected]
+[email protected]
 [email protected]
 [email protected]
 [email protected]
 [email protected]
 [email protected]
 [email protected]
+meteortesting:[email protected]
+meteortesting:[email protected]
+meteortesting:[email protected]
 [email protected]
 [email protected]
 [email protected]