fixes UT issues on windows.

Signed-off-by: Eric Wang <[email protected]>

Author: skygragon

lib/core.js

@@ -109,7 +109,7 @@ core.exportProblem = function(problem, opts) {
   const data = _.extend({}, problem);
 
   // unify format before rendering
-  data.app = require('./config').app;
+  data.app = require('./config').app || 'leetcode';
   if (!data.fid) data.fid = data.id;
   if (!data.lang) data.lang = opts.lang;
   data.code = (opts.code || data.code || '').replace(/\r\n/g, '\n');

lib/file.js

@@ -110,7 +110,7 @@ file.data = function(fullpath) {
 /// templates & metadata ///
 file.render = function(tpl, data) {
   const tplfile = path.join(this.codeDir('templates'), tpl + '.tpl');
-  let result = _.template(this.data(tplfile))(data);
+  let result = _.template(this.data(tplfile).replace(/\r\n/g, '\n'))(data);
 
   if (this.isWindows()) {
     result = result.replace(/\n/g, '\r\n');

lib/plugin.js

@@ -150,20 +150,25 @@ Plugin.copy = function(src, cb) {
   const dst = file.pluginFile(src);
 
   const srcstream = src.startsWith('https://') ? request(src) : fs.createReadStream(src);
+  const dststream = fs.createWriteStream(dst);
+  let error;
+
   srcstream.on('response', function(resp) {
     if (resp.statusCode !== 200)
       srcstream.emit('error', 'HTTP Error: ' + resp.statusCode);
   });
   srcstream.on('error', function(e) {
-    spin.stop();
-    file.rm(dst);
-    return cb(e);
+    dststream.emit('error', e);
   });
 
-  const dststream = fs.createWriteStream(dst);
+  dststream.on('error', function(e) {
+    error = e;
+    dststream.end();
+  });
   dststream.on('close', function() {
     spin.stop();
-    return cb(null, dst);
+    if (error) file.rm(dst);
+    return cb(error, dst);
   });
 
   log.debug('copying from ' + src);

package.json

@@ -11,7 +11,7 @@
   },
   "scripts": {
     "lint": "eslint lib/ test/",
-    "test": "npm run lint && nyc mocha test/** && nyc report --reporter=lcov",
+    "test": "npm run lint && nyc mocha test test/plugins && nyc report --reporter=lcov",
     "pkg": "pkg . --out-path=dist/ --targets"
   },
   "pkg": {

test/helper.js

@@ -8,8 +8,13 @@ const h = {
 h.clean = function() {
   if (!fs.existsSync(this.DIR))
     fs.mkdirSync(this.DIR);
-  for (let f of fs.readdirSync(this.DIR))
-    fs.unlinkSync(this.DIR + f);
+  for (let f of fs.readdirSync(this.DIR)) {
+    const fullpath = this.DIR + f;
+    if (fs.statSync(fullpath).isDirectory())
+      fs.rmdirSync(fullpath);
+    else
+      fs.unlinkSync(fullpath);
+  }
 };
 
 module.exports = h;

test/test_core.js

@@ -151,6 +151,8 @@ describe('core', function() {
     });
 
     it('should codeonly ok', function() {
+      file.isWindows = () => false;
+
       const expected = [
         '/**',
         ' * Definition for singly-linked list.',
@@ -209,6 +211,8 @@ describe('core', function() {
     });
 
     it('should detailed ok with cpp', function() {
+      file.isWindows = () => false;
+
       const expected = [
         '/*',
         ' * @lc app=leetcode id=2 lang=cpp',
@@ -257,6 +261,8 @@ describe('core', function() {
     });
 
     it('should detailed ok with ruby', function() {
+      file.isWindows = () => false;
+
       const expected = [
         '#',
         '# @lc app=leetcode id=2 lang=ruby',

test/test_file.js

@@ -1,9 +1,12 @@
 'use strict';
+const fs = require('fs');
 const path = require('path');
 
 const assert = require('chai').assert;
 const rewire = require('rewire');
 
+const th = require('./helper');
+
 describe('file', function() {
   let file;
 
@@ -14,7 +17,8 @@ describe('file', function() {
   describe('#dirAndFiles', function() {
     const HOME = path.join(__dirname, '..');
 
-    it('should ok', function() {
+    it('should ok on linux', function() {
+      if (file.isWindows()) this.skip();
       process.env.HOME = '/home/skygragon';
 
       assert.equal(file.userHomeDir(), '/home/skygragon');
@@ -23,10 +27,18 @@ describe('file', function() {
       assert.equal(file.cacheFile('xxx'), '/home/skygragon/.lc/leetcode/cache/xxx.json');
       assert.equal(file.configFile(), '/home/skygragon/.lc/config.json');
       assert.equal(file.name('/home/skygragon/.lc/leetcode/cache/xxx.json'), 'xxx');
+    });
 
+    it('should ok on windows', function() {
+      if (!file.isWindows()) this.skip();
       process.env.HOME = '';
       process.env.USERPROFILE = 'C:\\Users\\skygragon';
       assert.equal(file.userHomeDir(), 'C:\\Users\\skygragon');
+      assert.equal(file.homeDir(), 'C:\\Users\\skygragon\\.lc');
+      assert.equal(file.cacheDir(), 'C:\\Users\\skygragon\\.lc\\leetcode\\cache');
+      assert.equal(file.cacheFile('xxx'), 'C:\\Users\\skygragon\\.lc\\leetcode\\cache\\xxx.json');
+      assert.equal(file.configFile(), 'C:\\Users\\skygragon\\.lc\\config.json');
+      assert.equal(file.name('C:\\Users\\skygragon\\.lc\\leetcode\\cache\\xxx.json'), 'xxx');
     });
 
     it('should codeDir ok', function() {
@@ -98,5 +110,42 @@ describe('file', function() {
       assert.equal(meta.id, '222');
       assert.equal(meta.lang, 'python3');
     });
+
+    it('should fmt ok', function() {
+      file.init();
+      const data = file.fmt('${id}', {id: 123});
+      assert.equal(data, '123');
+    });
   }); // #meta
+
+  describe('#genneral', function() {
+    beforeEach(function() {
+      th.clean();
+    });
+    afterEach(function() {
+      th.clean();
+    });
+
+    it('should mkdir ok', function() {
+      const dir = th.DIR + 'dir';
+      assert.equal(fs.existsSync(dir), false);
+      file.mkdir(dir);
+      assert.equal(fs.existsSync(dir), true);
+      file.mkdir(dir);
+      assert.equal(fs.existsSync(dir), true);
+    });
+
+    it('should mv ok', function() {
+      const SRC = th.Dir + 'src';
+      const DST = th.DIR + 'dst';
+      assert.equal(fs.existsSync(SRC), false);
+      assert.equal(fs.existsSync(DST), false);
+      file.mkdir(SRC);
+      assert.equal(fs.existsSync(SRC), true);
+      assert.equal(fs.existsSync(DST), false);
+      file.mv(SRC, DST);
+      assert.equal(fs.existsSync(SRC), false);
+      assert.equal(fs.existsSync(DST), true);
+    });
+  }); // #general
 });

test/test_icon.js

@@ -30,7 +30,9 @@ describe('icon', function() {
       assert.equal(icon.unlike, 'unlike');
     });
 
-    it('should ok with unknown theme', function() {
+    it('should ok with unknown theme on linux', function() {
+      file.isWindows = () => false;
+
       icon.setTheme('non-exist');
       assert.equal(icon.yes, '✔');
       assert.equal(icon.no, '✘');

test/test_plugin.js

@@ -146,9 +146,9 @@ describe('plugin', function() {
       ];
       fs.writeFileSync(SRC, data.join('\n'));
 
-      Plugin.install(SRC, function(e, p) {
+      Plugin.copy(SRC, function(e, fullpath) {
         assert.notExists(e);
-        assert.equal(p.x, 123);
+        assert.equal(fullpath, DST);
         assert.equal(fs.existsSync(DST), true);
         done();
       });