More tests for coverage

lib/bemhtml/index.js

@@ -81,10 +81,7 @@ BEMHTML.prototype.render = function render(context,
 
   var isBEM = bem;
   if (isBEM === undefined) {
-    if (ctx.bem === undefined)
-      isBEM = entity.block || entity.elem;
-    else
-      isBEM = ctx.bem;
+    isBEM = entity.block || entity.elem;
   }
   isBEM = !!isBEM;
 
@@ -93,7 +90,7 @@ BEMHTML.prototype.render = function render(context,
 
   var addJSInitClass = jsParams && (
     this._elemJsInstances ?
-      (entity.block || entity.elem) :
+      entity.block :
       (entity.block && !entity.elem)
   );
 
@@ -284,9 +281,6 @@ BEMHTML.prototype.renderMix = function renderMix(entity,
     context.elem = oldElem;
     context.block = oldBlock;
 
-    if (!nestedMix)
-      continue;
-
     for (var j = 0; j < nestedMix.length; j++) {
       var nestedItem = nestedMix[j];
       if (!nestedItem) continue;

lib/bemxjst/index.js

@@ -8,7 +8,7 @@ var ClassBuilder = require('./class-builder').ClassBuilder;
 var utils = require('./utils');
 
 function BEMXJST(options) {
-  this.options = options || {};
+  this.options = options;
 
   this.entities = null;
   this.defaultEnt = null;
@@ -117,10 +117,6 @@ BEMXJST.prototype.compile = function compile(code) {
 
 BEMXJST.prototype.recompileInput = function recompileInput(code) {
   var args = BEMXJST.prototype.locals;
-  // Reuse function if it already has right arguments
-  if (typeof code === 'function' && code.length === args.length)
-    return code;
-
   var out = code.toString();
 
   // Strip the function

test/api-compile-test.js

@@ -146,5 +146,60 @@ describe('API compile', function() {
         template.apply({ block: 'b1' });
       });
     });
+
+    it('should throw bem-xjst error on template with no block', function() {
+      assert.throws(function() {
+        bemxjst.compile(function() {
+          attrs()(function() { return { a: 1 }; });
+        });
+      });
+    });
+  });
+
+  describe('Runtime lint mode', function() {
+    function captureStream(stream) {
+      var oldWrite = stream.write;
+      var buf = '';
+
+      stream.write = function(chunk) {
+        buf += chunk.toString();
+        oldWrite.apply(stream, arguments);
+      };
+
+      return {
+        unhook: function unhook() { stream.write = oldWrite; },
+        captured: function() { return buf; }
+      };
+    }
+
+    var hook;
+    beforeEach(function() { hook = captureStream(process.stderr); });
+    afterEach(function() { hook.unhook(); });
+
+    it('should work with runtimeLint option', function() {
+      var template = bemxjst.compile(function() {
+        block('b__e').content()('test');
+      }, { runtimeLint: true });
+
+      template.apply({ block: 'b__e' });
+
+      var stderr = hook.captured();
+      assert.equal(
+        stderr.substr(0, 17),
+        '\nBEM-XJST WARNING'
+      );
+    });
+  });
+
+  describe('context option', function() {
+    it('should work with context option', function() {
+      assert.doesNotThrow(function() {
+        var template = bemxjst.compile(function() {
+          block('b').content()('test');
+        }, { context: 'this' });
+
+        template.apply({ block: 'b' });
+      });
+    });
   });
 });

test/bemhtml-test.js

@@ -118,6 +118,12 @@ describe('BEMHTML engine tests', function() {
         .apply({ block: 'b', tag: 'br' })
         .should.equal('<br class="b">');
     });
+
+    it('should close short tags with xhtml: true', function() {
+      compile(function() {}, { xhtml: true })
+        .apply({ block: 'b', tag: 'br' })
+        .should.equal('<br class="b"/>');
+    });
   });
 
   describe('omitOptionalEndTags option', function() {

test/bemjson-js-test.js

@@ -76,6 +76,14 @@ describe('BEMJSON js', function() {
         'Nancy&#39;","b":"&#39;Tom&amp;Jerry&#39;"}}\'></div>');
   });
 
+  it('should render js data attribute in mixed', function() {
+    compile(function() {})
+      .apply({ block: 'b', mix: [ { block: 'a', js: { data: 1 } } ] })
+      .should
+        .equal('<div class="b a i-bem" ' +
+               'data-bem=\'{"a":{"data":1}}\'></div>');
+  });
+
   describe('elemJsInstances option', function() {
     it('should not render i-bem for elems be default', function() {
       compile('')
@@ -95,11 +103,11 @@ describe('BEMJSON js', function() {
 
       tmpls.apply({
           block: 'a',
-          js: true,
+          js: { data: 1 },
           mix: { block: 'b', elem: 'e', js: true }
         })
         .should.equal('<div class="a b__e i-bem"' +
-          ' data-bem=\'{"a":{},"b__e":{}}\'></div>');
+          ' data-bem=\'{"a":{"data":1},"b__e":{}}\'></div>');
 
       tmpls.apply({
         block: 'b',

test/bemjson-mods-test.js

@@ -60,11 +60,18 @@ describe('BEMJSON mods', function() {
     }, '<div class="b1 b1__e1"></div>');
   });
 
-  it('should not inherit mods from namesake parent block', function () {
+  it('should not inherit mods from namesake parent block', function() {
     test(function() {}, {
       block: 'b1',
       mods: { a: 1 },
       content: { block: 'b1' }
     }, '<div class="b1 b1_a_1"><div class="b1"></div></div>');
   });
+
+  it('should not render epmty modName mods', function() {
+    test(function() {}, {
+      block: 'b',
+      mods: { a: 1, '': 2 }
+    }, '<div class="b b_a_1"></div>');
+  });
 });

test/bemjson-tag-test.js

@@ -22,4 +22,10 @@ describe('BEMJSON tag', function() {
     test(function() {
     }, { tag: false, content: 'ok' }, 'ok');
   });
+
+  it('should render empty string ' +
+     'if block with no content and no tag', function() {
+    test(function() {
+    }, { block: 'test', tag: false }, '');
+  });
 });