Skip to content

Commit

Permalink
use component.destroy() in tests instead of component.teardown()
Browse files Browse the repository at this point in the history
  • Loading branch information
Rich-Harris committed Mar 1, 2017
1 parent 1736498 commit d6962b3
Show file tree
Hide file tree
Showing 28 changed files with 30 additions and 30 deletions.
6 changes: 3 additions & 3 deletions test/formats.js
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ function testAmd ( code, expectedId, dependencies, html ) {

assert.htmlEqual( main.innerHTML, html );

component.teardown();
component.destroy();
}

define.amd = true;
Expand All @@ -44,7 +44,7 @@ function testCjs ( code, dependencyById, html ) {

assert.htmlEqual( main.innerHTML, html );

component.teardown();
component.destroy();
});
}

Expand All @@ -59,7 +59,7 @@ function testIife ( code, name, globals, html ) {

assert.htmlEqual( main.innerHTML, html );

component.teardown();
component.destroy();
});
}

Expand Down
2 changes: 1 addition & 1 deletion test/generate.js
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@ describe( 'generate', () => {
if ( config.test ) {
config.test( assert, component, target, window );
} else {
component.teardown();
component.destroy();
assert.equal( target.innerHTML, '' );
}
})
Expand Down
2 changes: 1 addition & 1 deletion test/generator/binding-select-initial-value/_config.js
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,6 @@ export default {
assert.equal( select.value, 'b' );
assert.ok( options[1].selected );

component.teardown();
component.destroy();
}
};
2 changes: 1 addition & 1 deletion test/generator/component-binding-each-nested/_config.js
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,6 @@ export default {
<p>blah, bar, baz</p>
` );

component.teardown();
component.destroy();
}
};
2 changes: 1 addition & 1 deletion test/generator/component-binding-each/_config.js
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,6 @@ export default {
<p>blah, bar, baz</p>
` );

component.teardown();
component.destroy();
}
};
2 changes: 1 addition & 1 deletion test/generator/component-events-each/_config.js
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,6 @@ export default {
buttons[2].dispatchEvent( event );

assert.deepEqual( clicks, [ 'a', 'c' ]);
component.teardown();
component.destroy();
}
};
2 changes: 1 addition & 1 deletion test/generator/component-yield-multiple-in-if/_config.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,6 @@ export default {
component.set({ arriving: false });
assert.htmlEqual( target.innerHTML, `<div><p class='widget'>Goodbye</p></div>` );

component.teardown();
component.destroy();
}
};
2 changes: 1 addition & 1 deletion test/generator/computed-values-default/_config.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,6 @@ export default {
test ( assert, component, target ) {
component.set({ a: 2 });
assert.equal( target.innerHTML, '<p>4</p>' );
component.teardown();
component.destroy();
}
};
2 changes: 1 addition & 1 deletion test/generator/computed-values/_config.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,6 @@ export default {
assert.equal( component.get( 'c' ), 5 );
assert.equal( component.get( 'cSquared' ), 25 );
assert.equal( target.innerHTML, '<p>3 + 2 = 5</p>\n<p>5 * 5 = 25</p>' );
component.teardown();
component.destroy();
}
};
2 changes: 1 addition & 1 deletion test/generator/deconflict-builtins/_config.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,6 @@ export default {

test ( assert, component ) {
assert.equal( component.get( 'foo' ), 'got' );
component.teardown();
component.destroy();
}
};
2 changes: 1 addition & 1 deletion test/generator/destructuring/_config.js
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,6 @@ export default {
assert.equal( count, 1 );
assert.equal( number, 42 );

component.teardown();
component.destroy();
}
};
2 changes: 1 addition & 1 deletion test/generator/each-block-keyed/_config.js
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,6 @@ export default {
assert.ok( !target.contains( p1 ), 'first <p> element should be removed' );
assert.equal( p2, p3, 'second <p> element should be retained' );

component.teardown();
component.destroy();
}
};
2 changes: 1 addition & 1 deletion test/generator/events-custom/_config.js
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,6 @@ export default {
component.fire( 'foo', expected );
assert.equal( count, 1 );

component.teardown();
component.destroy();
}
};
2 changes: 1 addition & 1 deletion test/generator/events-lifecycle/_config.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ export default {
count += 1;
});

component.teardown();
component.destroy();
assert.equal( count, 1 );
}
};
2 changes: 1 addition & 1 deletion test/generator/hello-world/_config.js
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ export default {
component.set({ name: 'everybody' });
assert.htmlEqual( target.innerHTML, '<h1>Hello everybody!</h1>' );

component.teardown();
component.destroy();
assert.htmlEqual( target.innerHTML, '' );
}
};
2 changes: 1 addition & 1 deletion test/generator/if-block-elseif-text/_config.js
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,6 @@ export default {
before-else-after
` );

component.teardown();
component.destroy();
}
};
2 changes: 1 addition & 1 deletion test/generator/if-block-elseif/_config.js
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,6 @@ export default {
<p>x is between 5 and 10</p>
` );

component.teardown();
component.destroy();
}
};
2 changes: 1 addition & 1 deletion test/generator/lifecycle-events/_config.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
export default {
test ( assert, component ) {
assert.deepEqual( component.events, [ 'render' ]);
component.teardown();
component.destroy();
assert.deepEqual( component.events, [ 'render', 'teardown' ]);
}
};
2 changes: 1 addition & 1 deletion test/generator/onrender-chain/_config.js
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,6 @@ export default {
<span>1</span><span>2</span><span>3</span><span>4</span><span>5</span>
` );

component.teardown();
component.destroy();
}
};
2 changes: 1 addition & 1 deletion test/generator/onrender-fires-when-ready/_config.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,6 @@ export default {
component.set({ foo: true });
assert.htmlEqual( target.innerHTML, `<div><p>true</p>\n<p>true</p></div>` );

component.teardown();
component.destroy();
}
};
2 changes: 1 addition & 1 deletion test/generator/raw-mustaches-preserved/_config.js
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,6 @@ export default {
assert.equal( target.innerHTML, `<div>${ns}<p>does not change</p>${ns}</div>` );
assert.strictEqual( target.querySelector( 'p' ), p );

component.teardown();
component.destroy();
}
};
2 changes: 1 addition & 1 deletion test/generator/raw-mustaches/_config.js
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ export default {
assert.equal( target.innerHTML, `before${ns}${ns}after` );
component.set({ raw: 'how about <strong>unclosed elements?' });
assert.equal( target.innerHTML, `before${ns}how about <strong>unclosed elements?</strong>${ns}after` );
component.teardown();
component.destroy();
assert.equal( target.innerHTML, '' );
}
};
2 changes: 1 addition & 1 deletion test/generator/select/_config.js
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ export default {

assert.equal( target.querySelector( 'select' ).value, 'a' );

component.teardown();
component.destroy();
assert.htmlEqual( target.innerHTML, '' );
}
};
2 changes: 1 addition & 1 deletion test/generator/set-in-observe-dedupes-renders/_config.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,6 @@ export default {

test ( assert, component ) {
component.set({ foo: { x: 2 } });
component.teardown();
component.destroy();
}
};
2 changes: 1 addition & 1 deletion test/generator/svg-attributes/_config.js
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,6 @@ export default {
test ( assert, component, target ) {
const circle = target.querySelector( 'circle' );
assert.equal( circle.getAttribute( 'class' ), 'red' );
component.teardown();
component.destroy();
}
};
2 changes: 1 addition & 1 deletion test/generator/svg-class/_config.js
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,6 @@ export default {
assert.equal( svg.namespaceURI, 'http://www.w3.org/2000/svg' );
assert.equal( svg.getAttribute( 'class' ), 'foo' );

component.teardown();
component.destroy();
}
};
2 changes: 1 addition & 1 deletion test/generator/svg-each-block-namespace/_config.js
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,6 @@ export default {
assert.equal( circles[0].namespaceURI, 'http://www.w3.org/2000/svg' );
assert.equal( circles[1].namespaceURI, 'http://www.w3.org/2000/svg' );
assert.equal( circles[2].namespaceURI, 'http://www.w3.org/2000/svg' );
component.teardown();
component.destroy();
}
};
2 changes: 1 addition & 1 deletion test/generator/svg-xlink/_config.js
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,6 @@ export default {

assert.equal( href.namespaceURI, 'http://www.w3.org/1999/xlink' );

component.teardown();
component.destroy();
}
};

0 comments on commit d6962b3

Please sign in to comment.