Merge pull request #42 from edanca/fix-mergeResults

Fix: Including args and customFileName to mergeResults

README.md

@@ -78,9 +78,11 @@ to get a single report for ALL test execution.  Consider the following:
 1) Create a small node script
 ```javascript
 const mergeResults = require('wdio-json-reporter/mergeResults')
-mergeResults()
+mergeResults('./Results', 'wdio-json-*', 'wdio-custom-filename.json')
 ```
 
+*Note:* `wdio-custom-filename.json` is optional, is the parameter is not provided the default value is `wdio-merged.json`
+
 2) Call node script from command line and pass 2 arguments
 
 * <RESULTS_DIR>: Directory where results files are written
@@ -91,6 +93,16 @@ Example:
 node mergeResults.json ./Results "wdio-json-*"
 ```
 
+3) As part of a wdio hook
+
+```js
+// Located in your wdio.conf.js file
+onComplete: function (exitCode, config, capabilities, results) {
+  const mergeResults = require('wdio-json-reporter/mergeResults')
+  mergeResults('./Results', 'results-*', 'wdio-custom-filename.json')
+}
+```
+
 Upon completion, the merge script will output a single json file named `wdio-merged.json` in the provided <RESULTS_DIR>
 
 

package.json

@@ -42,7 +42,7 @@
     "eslint-plugin-standard": "~3.0.1",
     "jest": "^24.3.0"
   },
-  "resolutions":{
+  "resolutions": {
     "braces": "~2.3.0"
   },
   "contributors": [

src/mergeResults.js

@@ -2,12 +2,13 @@ const fs = require('fs')
 const path = require('path')
 
 const mergeResults = (...args) => {
-    const dir = process.argv[2]
-    const filePattern = process.argv[3]
+    const dir = args[0] || process.argv[2]
+    const filePattern = args[1] || process.argv[3]
+    const customFileName = args[2] || process.argv[4]
 
     const rawData = getDataFromFiles(dir, filePattern)
     const mergedResults = mergeData(rawData)
-    writeFile(dir, mergedResults)
+    writeFile(dir, mergedResults, customFileName)
 }
 
 function getDataFromFiles (dir, filePattern) {
@@ -43,8 +44,8 @@ function mergeData (rawData) {
     return mergedResults
 }
 
-function writeFile (dir, mergedResults) {
-    const fileName = 'wdio-merged.json'
+function writeFile (dir, mergedResults, customFileName) {
+    let fileName = customFileName || 'wdio-merged.json'
     const filePath = path.join(dir, fileName)
     fs.writeFileSync(filePath, JSON.stringify(mergedResults))
 }