Merge remote-tracking branch 'arian/master'

Conflicts: Source/Slick.Finder.js
mootools · Mar 26, 2011 · d34487d · d34487d
2 parents 0ba2ca1 + 2a3c8c7
commit d34487d
Show file tree

Hide file tree

Showing 4 changed files with 29 additions and 4 deletions.
diff --git a/Configuration.js b/Configuration.js
@@ -21,7 +21,7 @@ Configuration.sets = {
 	'specs': {
 		path: 'specs/',
 		files: [
-			'unit', 'syntax', 'api', 'engine_bugs', 'html', 'html5', 
+			'unit', 'syntax', 'api', 'engine_bugs', 'html', 'html5',
 			'select_nth-child', 'select_exhaustive', 'mock_template', 
 			'isxml', 'xml',
 			'match', 'parser',

diff --git a/mocks/query_test-slick.html b/mocks/query_test-slick.html
@@ -12,5 +12,9 @@
 		<div id="divtabindex0" tabindex="0">some</div>
 		<div id="divtabindex1" tabindex="1">some</div>
 		<div id="divtabindexnull">some</div>
+
+		<div id="one"><i>text</i></div>
+		<div id="two"></div>
+
 	</body>
 </html>
diff --git a/setup.js b/setup.js
@@ -19,7 +19,7 @@ global.onload = function(){
 	if (!Browser.ie || Browser.version > 8){
 		Mock.CreateTemplate('Generic XHTML',					'../mocks/template.xhtml');
 		Mock.CreateTemplate('Generic XML',						'../mocks/template.xml');
-		Mock.CreateTemplate('SVG',								'../mocks/mootools_logo.svg');
+		Mock.CreateTemplate('SVG',								'../mocks/MooTools_Logo.svg');
 	}
 
 	if (Browser.ie){
@@ -39,7 +39,7 @@ global.onload = function(){
 
 
 	new Mock.Request('XML responseXML',							'../mocks/xml.xml');
-	new Mock.Request('SVG responseXML',							'../mocks/mootools_logo.svg');
+	new Mock.Request('SVG responseXML',							'../mocks/MooTools_Logo.svg');
 
 	// Setup
 

diff --git a/specs/html.js b/specs/html.js
@@ -32,6 +32,27 @@ describe('Slick', function(){
 	itShouldFind(2, 'body [tabindex="1"]');
 	itShouldFind(4, 'body [tabindex]');
 
+	describe('Combinators', function(){
+
+		it('should find `~`', function(){
+			expect(context.SELECT1(context.document.getElementById('one'), '~')).not.toBeNull();
+		});
+		it('should find `~div`', function(){
+			expect(context.SELECT1(context.document.getElementById('one'), '~div')).not.toBeNull();
+		});
+		it('should find `> i`', function(){
+			expect(context.SELECT1(context.document.getElementById('one'), '> i')).not.toBeNull();
+		});
+		it('should find `+`', function(){
+			expect(context.SELECT1(context.document.getElementById('one'), '+')).not.toBeNull();
+		});
+		it('should find `+div`', function(){
+			expect(context.SELECT1(context.document.getElementById('one'), '+div')).not.toBeNull();
+		});
+
+	});
+
+
 });
 
-};
+};