From 8c43f3d567405719d7eb0d0e33b1d71678a3ebf8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nguy=E1=BB=85n=20Vi=E1=BB=87t=20H=C6=B0ng?= Date: Fri, 27 Apr 2018 11:27:51 +0700 Subject: [PATCH] removed path.sep and use path.join to concatenate path --- browser/lib/consts.js | 5 +++-- tests/dataApi/createSnippet-test.js | 2 +- tests/dataApi/deleteSnippet-test.js | 2 +- tests/dataApi/updateSnippet-test.js | 2 +- 4 files changed, 6 insertions(+), 5 deletions(-) diff --git a/browser/lib/consts.js b/browser/lib/consts.js index 12227d58..3d414a14 100644 --- a/browser/lib/consts.js +++ b/browser/lib/consts.js @@ -2,6 +2,7 @@ const path = require('path') const fs = require('sander') const { remote } = require('electron') const { app } = remote +const os = require('os') const themePath = process.env.NODE_ENV === 'production' ? path.join(app.getAppPath(), './node_modules/codemirror/theme') @@ -18,8 +19,8 @@ const snippetFile = process.env.NODE_ENV === 'production' function getAppData () { return process.env.APPDATA || (process.platform === 'darwin' - ? process.env.HOME + 'Library' + path.sep + 'Preferences' - : require('os').homedir() + path.sep + '.config') + ? path.join(process.env.HOME, 'Library', 'Preferences') + : path.join(os.homedir(), '.config')) } const consts = { diff --git a/tests/dataApi/createSnippet-test.js b/tests/dataApi/createSnippet-test.js index 97e64cbb..f06cf861 100644 --- a/tests/dataApi/createSnippet-test.js +++ b/tests/dataApi/createSnippet-test.js @@ -4,7 +4,7 @@ const sander = require('sander') const os = require('os') const path = require('path') -const snippetFilePath = path.join(os.tmpdir(), `test${path.sep}create-snippet`) +const snippetFilePath = path.join(os.tmpdir(), 'test', 'create-snippet') const snippetFile = path.join(snippetFilePath, 'snippets.json') test.beforeEach((t) => { diff --git a/tests/dataApi/deleteSnippet-test.js b/tests/dataApi/deleteSnippet-test.js index 3b2f0e91..f1d85af3 100644 --- a/tests/dataApi/deleteSnippet-test.js +++ b/tests/dataApi/deleteSnippet-test.js @@ -5,7 +5,7 @@ const os = require('os') const path = require('path') const crypto = require('crypto') -const snippetFilePath = path.join(os.tmpdir(), `test${path.sep}delete-snippet`) +const snippetFilePath = path.join(os.tmpdir(), 'test', 'delete-snippet') const snippetFile = path.join(snippetFilePath, 'snippets.json') const newSnippet = { id: crypto.randomBytes(16).toString('hex'), diff --git a/tests/dataApi/updateSnippet-test.js b/tests/dataApi/updateSnippet-test.js index aa296025..662548bd 100644 --- a/tests/dataApi/updateSnippet-test.js +++ b/tests/dataApi/updateSnippet-test.js @@ -5,7 +5,7 @@ const os = require('os') const path = require('path') const crypto = require('crypto') -const snippetFilePath = path.join(os.tmpdir(), `test${path.sep}update-snippet`) +const snippetFilePath = path.join(os.tmpdir(), 'test', 'update-snippet') const snippetFile = path.join(snippetFilePath, 'snippets.json') const oldSnippet = { id: crypto.randomBytes(16).toString('hex'),