issues #22: Add protection in Arch.link() to not call plan.link() whe…

…n link in Arch was already exist
bem-archive · Apr 12, 2012 · dcde819 · dcde819
1 parent 2190b17
commit dcde819
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 6 deletions.
diff --git a/lib/arch.js b/lib/arch.js
@@ -250,14 +250,16 @@ module.exports = INHERIT({
 
         for (var i = 0; i < parents.length; i++) {
             parent = parents[i];
-            children = this.children[parent] || (this.children[parent] = []);
+            if (!this.hasParents(child, parent)) {
+                children = this.children[parent] || (this.children[parent] = []);
 
-            if (_parents.indexOf(parent) === -1) _parents.push(parent);
-            if (children.indexOf(child) === -1) children.push(child);
+                if (_parents.indexOf(parent) === -1) _parents.push(parent);
+                if (children.indexOf(child) === -1) children.push(child);
 
-            for (var k in this.plans) {
-                var p = this.plans[k];
-                if (p.hasNode(child) || p.hasNode(parent)) p.link(child, parent);
+                for (var k in this.plans) {
+                    var p = this.plans[k];
+                    if (p.hasNode(child) || p.hasNode(parent)) p.link(child, parent);
+                }
             }
         }
     },

diff --git a/test/arch-test.js b/test/arch-test.js
@@ -139,6 +139,7 @@ suite
                 arch.setNode('A', { run: 'testA' });
                 arch.setNode('B', { run: 'testA' });
                 arch.link('B', 'A');
+                arch.link('B', 'A');
 
                 return arch;
             },
@@ -162,6 +163,7 @@ suite
                 arch.setNode('A', { run: 'testA' });
                 arch.setNode('B', { run: 'testB' }, 'A');
                 arch.unlink('B', 'A');
+                arch.unlink('B', 'A');
 
                 return arch;
             },