Fix some pr notations

enb · Jun 9, 2015 · b0b0e85 · b0b0e85
1 parent eb9fd7b
commit b0b0e85
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 12 deletions.
diff --git a/techs/bh-bundle-i18n.js b/techs/bh-bundle-i18n.js
@@ -54,26 +54,22 @@ module.exports = require('enb-bh/techs/bh-bundle').buildFlow()
     .builder(function (templateFiles, keysetsFilename) {
         var cache = this.node.getNodeCache(this._target),
             cacheKey = 'keysets-file-' + path.basename(keysetsFilename),
-            promiseCompileBH = this._compileBH(templateFiles),
-            promise;
+            promises = [this._compileBH(templateFiles)];
 
         if (cache.needRebuildFile(cacheKey, keysetsFilename)) {
             dropRequireCache(require, keysetsFilename);
-            promise = asyncRequire(keysetsFilename)
+            promises.push(asyncRequire(keysetsFilename)
                 .then(function (keysets) {
                     cache.cacheFileInfo(cacheKey, keysetsFilename);
 
                     return keysets;
-                });
+                }));
         } else {
-            promise = asyncRequire(keysetsFilename);
+            promises.push(asyncRequire(keysetsFilename));
         }
 
-        return vow.all([
-                promise,
-                promiseCompileBH
-            ])
-            .spread(function (sources, bh) {
+        return vow.all(promises)
+            .spread(function (bh, sources) {
                 var parsed = keysets.parse(sources);
 
                 return [

diff --git a/test/techs/bh-bundle-i18n.test.js → test/techs/bh-bundle-i18n/v2.test.js b/test/techs/bh-bundle-i18n.test.js → test/techs/bh-bundle-i18n/v2.test.js
@@ -5,8 +5,8 @@ var path = require('path'),
     TestNode = require('enb/lib/test/mocks/test-node'),
     FileList = require('enb/lib/file-list'),
     dropRequireCache = require('enb/lib/fs/drop-require-cache'),
-    Tech = require('../../techs/bh-bundle-i18n'),
-    core = require('../fixtures/core.js'),
+    Tech = require('../../../techs/bh-bundle-i18n'),
+    core = require('../../fixtures/bem-core-v3/common.blocks/i18n/i18n.i18n.js').i18n.i18n,
     bhCoreFilename = require.resolve('enb-bh/node_modules/bh/lib/bh.js'),
     bhCoreContents = fs.readFileSync(bhCoreFilename);