Merge pull request #253 from bem/fix#251@v2

Fixes for library tests
bem · Dec 26, 2013 · 5fa8ac2 · 5fa8ac2
2 parents 8683caa + 010e83a
commit 5fa8ac2
Show file tree

Hide file tree

Showing 8 changed files with 32 additions and 21 deletions.
diff --git a/.bem/make.js b/.bem/make.js
@@ -3,9 +3,7 @@
 var PATH = require('path'),
     environ = require('bem-environ')(__dirname);
 
-environ.extendMake(MAKE);
 require('bem-tools-autoprefixer').extendMake(MAKE);
-
 require('./nodes')(MAKE);
 
 try {
@@ -181,10 +179,9 @@ MAKE.decl('TargetBundleNode', {
             environ.getLibPath('bem-core', 'common.blocks'),
             environ.getLibPath('bem-core', 'touch.blocks'),
             'common.blocks',
-            'design/common.blocks',
             'touch.blocks',
+            'design/common.blocks',
             'design/touch.blocks',
-            'touch-pad.blocks',
             'design/touch-pad.blocks'
         ];
     },
@@ -194,8 +191,8 @@ MAKE.decl('TargetBundleNode', {
             environ.getLibPath('bem-core', 'common.blocks'),
             environ.getLibPath('bem-core', 'touch.blocks'),
             'common.blocks',
-            'design/common.blocks',
             'touch.blocks',
+            'design/common.blocks',
             'design/touch.blocks',
             'design/touch-phone.blocks'
         ];
@@ -240,11 +237,20 @@ MAKE.decl('ExampleNode', {
 MAKE.decl('SpecNode', {
 
     getTechs : function() {
-        return this.__base()
-            .concat([
-                'spec.js+browser.js+bemhtml',
-                'phantomjs'
-            ]);
+        return [
+            'bemjson.js',
+            'bemdecl.js',
+            'deps.js',
+            'roole',
+            'spec.js+browser.js+bemhtml',
+            'bemhtml',
+            'html',
+            'phantomjs'
+        ];
+    },
+
+    getForkedTechs : function() {
+        return ['bemhtml', 'spec.js+browser.js+bemhtml', 'phantomjs'];
     },
 
     getLevels : function() {

diff --git a/common.blocks/input/_type/input_type_password.bemhtml b/common.blocks/input/_type/input_type_password.bemhtml
@@ -1,3 +1,3 @@
 block('input').mod('type', 'password').elem('control').attrs()(function() {
-    return this._.extend(applyNext(), { type: 'password' })
+    return this.extend(applyNext(), { type: 'password' })
 })
diff --git a/common.blocks/input/_type/input_type_search.bemhtml b/common.blocks/input/_type/input_type_search.bemhtml
@@ -1,3 +1,3 @@
 block('input').mod('type', 'search').elem('control').attrs()(function() {
-    return this._.extend(applyNext(), { type: 'search' })
+    return this.extend(applyNext(), { type: 'search' })
 })
diff --git a/common.blocks/input/_type/input_type_textarea.bemhtml b/common.blocks/input/_type/input_type_textarea.bemhtml
@@ -9,7 +9,7 @@ block('input').mod('type', 'textarea').elem('control')(
         var attrs = applyNext(),
             input = this._input;
         delete attrs.value;
-        return this._.extend(
+        return this.extend(
             { rows: input.rows || 10, cols: input.cols || 10 },
             attrs);
     }),

diff --git a/common.blocks/link/link.deps.js b/common.blocks/link/link.deps.js
@@ -1,5 +1,7 @@
 [{
-    mustDeps : { block : 'i-bem', elem : 'dom' },
+    mustDeps : [
+        { block : 'i-bem', elems : ['dom'] }
+    ],
     shouldDeps : [
         { mod : 'disabled' },
         { block : 'jquery', elem : 'event', mods : { type : 'pointer' } }

diff --git a/common.blocks/link/link.spec.js b/common.blocks/link/link.spec.js
@@ -1,13 +1,13 @@
 modules.define(
     'spec',
     ['i-bem__dom', 'jquery', 'BEMHTML', 'sinon'],
-    function(provide, DOM, $, BEMHTML, sinon) {
+    function(provide, BEMDOM, $, BEMHTML, sinon) {
 
 describe('link', function() {
     var link;
 
     beforeEach(function() {
-        link = DOM.init(
+        link = BEMDOM.init(
                 $(BEMHTML.apply({
                     block : 'link',
                     js : true
@@ -17,7 +17,7 @@ describe('link', function() {
     });
 
     afterEach(function() {
-        DOM.destruct(link.domElem);
+        BEMDOM.destruct(link.domElem);
     });
 
     it('should emit "click" event and do not prevent default action', function() {

diff --git a/package.json b/package.json
@@ -33,6 +33,9 @@
   "optionalDependencies": {},
   "private": true,
   "scripts": {
-    "test": "jshint-groups && jscs . && csscomb -vl ."
+    "test": "npm run lint && npm run unit",
+    "lint": "jshint-groups && jscs . && csscomb -vl .",
+    "unit": "bower-npm-install && bem make -w 16 desktop.specs touch-pad.specs touch-phone.specs"
   }
 }
+
diff --git a/touch.blocks/input/__control/input__control.bemhtml b/touch.blocks/input/__control/input__control.bemhtml
@@ -1,15 +1,15 @@
 block('input').elem('control')(
 
-    attrs()(function() {
-        var baseAttrs = applyNext(),
+    attrs().match(function() { return !this.ctx._input__controlAttrs })(function() {
+        var baseAttrs = applyNext({ 'ctx._input__controlAttrs': true }),
             attrs = this.ctx.attrs || {};
 
         attrs.autocomplete = attrs.autocomplete || 'off';
         attrs.autocorrect = attrs.autocorrect || 'off';
         attrs.autocapitalize = attrs.autocapitalize || 'off';
         attrs.spellcheck = attrs.spellcheck || 'false';
 
-        return this._.extend(baseAttrs, attrs);
+        return this.extend(baseAttrs, attrs);
     })
 
 )