library-mirrors/jquery
1
0
Fork 0
mirror of https://github.com/jquery/jquery.git synced 2024-11-23 02:54:22 +00:00
Code Issues Actions 9 Packages Projects Releases Wiki Activity

Tests: Restrict "p > * > *" selection in selector.js to #qunit-fixture

Browse Source 
Add `match` and `QUnit.assert.selectInFixture` functions that
mimic `QUnit.assert.t`.

Ref gh-2880
Closes gh-2973
This commit is contained in:
Alexander Lisianoi 2016-03-05 10:48:52 +01:00 committed by Richard Gibson
parent 474b477eed
commit 59ec78e602
2 changed files with 33 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
test/data/testinit.js
View File

@ -32,14 +32,14 @@ this.q = function() {
/**
* Asserts that a select matches the given IDs
* @param {String} a - Assertion name
* @param {String} b - Sizzle selector
* @param {String} c - Array of ids to construct what is expected
* @example t("Check for something", "//[a]", ["foo", "bar"]);
* @result returns true if "//[a]" return two elements with the IDs 'foo' and 'bar'
* @param {String} message - Assertion name
* @param {String} selector - Sizzle selector
* @param {String} expectedIds - Array of ids to construct what is expected
* @param {(String|Node)=document} context - Selector context
* @example match("Check for something", "p", ["foo", "bar"]);
*/
QUnit.assert.t = function( a, b, c ) {
var f = jQuery( b ).get(),
function match( message, selector, expectedIds, context ) {
var f = jQuery( selector, context ).get(),
s = "",
i = 0;
@ -47,7 +47,31 @@ QUnit.assert.t = function( a, b, c ) {
s += ( s && "," ) + '"' + f[ i ].id + '"';
}
this.deepEqual( f, q.apply( q, c ), a + " (" + b + ")" );
this.deepEqual( f, q.apply( q, expectedIds ), message + " (" + selector + ")" );
}
/**
* Asserts that a select matches the given IDs.
* The select is not bound by a context.
* @param {String} message - Assertion name
* @param {String} selector - Sizzle selector
* @param {String} expectedIds - Array of ids to construct what is expected
* @example t("Check for something", "p", ["foo", "bar"]);
*/
QUnit.assert.t = function( message, selector, expectedIds ) {
match( message, selector, expectedIds, undefined );
};
/**
* Asserts that a select matches the given IDs.
* The select is performed within the `#qunit-fixture` context.
* @param {String} message - Assertion name
* @param {String} selector - Sizzle selector
* @param {String} expectedIds - Array of ids to construct what is expected
* @example selectInFixture("Check for something", "p", ["foo", "bar"]);
*/
QUnit.assert.selectInFixture = function( message, selector, expectedIds ) {
match( message, selector, expectedIds, "#qunit-fixture" );
};
this.createDashboardXML = function() {

2
test/unit/selector.js
View File

@ -109,7 +109,7 @@ QUnit.test( "child and adjacent", function( assert ) {
assert.t( "Child", "p>a", [ "simon1","google","groups","mark","yahoo","simon" ] );
assert.t( "Child w/ Class", "p > a.blog", [ "mark","simon" ] );
assert.t( "All Children", "code > *", [ "anchor1","anchor2" ] );
assert.t( "All Grandchildren", "p > * > *", [ "anchor1","anchor2" ] );
assert.selectInFixture( "All Grandchildren", "p > * > *", [ "anchor1","anchor2" ] );
assert.t( "Adjacent", "p + p", [ "ap","en","sap" ] );
assert.t( "Adjacent", "p#firstp + p", [ "ap" ] );
assert.t( "Adjacent", "p[lang=en] + p", [ "sap" ] );