From 7036cb8ea2db81a5480363b9847a2567e3c638d0 Mon Sep 17 00:00:00 2001 From: coderaiser Date: Wed, 28 Dec 2016 13:48:19 +0200 Subject: [PATCH] feature(util) getStrBigFirst: client -> util --- client/client.js | 15 ++------------- common/util.js | 10 +++++++++- test/server/util.js | 14 ++++++++++++-- 3 files changed, 23 insertions(+), 16 deletions(-) diff --git a/client/client.js b/client/client.js index c38c1d5e..59f01488 100644 --- a/client/client.js +++ b/client/client.js @@ -43,6 +43,8 @@ var Util, DOM, CloudFunc, join; Debug = false; }; + var getStrBigFirst = Util.getStrBigFirst; + /** * Функция привязываеться ко всем ссылкам и * загружает содержимое каталогов @@ -552,18 +554,5 @@ var Util, DOM, CloudFunc, join; }); } }; - - function getStrBigFirst(str) { - var first; - - if (!str) - throw Error('str could not be empty!'); - - first = str[0].toUpperCase(); - str = first + str.slice(1); - - return str; - } - } })(this, Util, DOM, CloudFunc); diff --git a/common/util.js b/common/util.js index be653431..1b2ec4fa 100644 --- a/common/util.js +++ b/common/util.js @@ -21,7 +21,15 @@ function UtilProto(exec) { var Util = this; - this.check = new checkProto(); + this.check = new checkProto(); + + this.getStrBigFirst = function getStrBigFirst(str) { + if (!str) + throw Error('str could not be empty!'); + + var first = str[0].toUpperCase(); + return first + str.slice(1); + } function checkProto() { /** diff --git a/test/server/util.js b/test/server/util.js index dc8f5034..30422ebc 100644 --- a/test/server/util.js +++ b/test/server/util.js @@ -4,7 +4,7 @@ const test = require('tape'); const DIR = '../../'; const Util = require(DIR + 'common/util'); -test('getExt: no extension', function(t) { +test('getExt: no extension', (t) => { const EXT = ''; const name = 'file-withot-extension'; const ext = Util.getExt(name); @@ -13,7 +13,7 @@ test('getExt: no extension', function(t) { t.end(); }); -test('getExt: return extension', function(t) { +test('getExt: return extension', (t) => { const EXT = '.png'; const name = 'picture.png'; const ext = Util.getExt(name); @@ -22,3 +22,13 @@ test('getExt: return extension', function(t) { t.end(); }); +test('getStrBigFirst: args', (t) => { + t.throws(Util.getStrBigFirst, /str could not be empty!/, 'should throw when no str'); + t.end(); +}); + +test('getStrBigFirst', (t) => { + t.equal(Util.getStrBigFirst('hello'), 'Hello', 'should return str'); + t.end(); +}); +