From 40eba3a40118c73e339c1ea48f449f0156eac426 Mon Sep 17 00:00:00 2001 From: c-spencer Date: Thu, 19 May 2011 19:59:50 +0100 Subject: [PATCH] Get css tests passing (wrong test start rule) and update jsdom library paths --- lib/ace/mode/css_tokenizer_test.js | 8 ++++---- lib/ace/test/mockdom.js | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/lib/ace/mode/css_tokenizer_test.js b/lib/ace/mode/css_tokenizer_test.js index 40569e16..a216ec2e 100644 --- a/lib/ace/mode/css_tokenizer_test.js +++ b/lib/ace/mode/css_tokenizer_test.js @@ -51,21 +51,21 @@ module.exports = { "test: tokenize pixel number" : function() { var line = "-12px"; - var tokens = this.tokenizer.getLineTokens(line, "start").tokens; + var tokens = this.tokenizer.getLineTokens(line, "ruleset").tokens; assert.equal(1, tokens.length); assert.equal("constant.numeric", tokens[0].type); }, "test: tokenize hex3 color" : function() { - var tokens = this.tokenizer.getLineTokens("#abc", "start").tokens; + var tokens = this.tokenizer.getLineTokens("#abc", "ruleset").tokens; assert.equal(1, tokens.length); assert.equal("constant.numeric", tokens[0].type); }, "test: tokenize hex6 color" : function() { - var tokens = this.tokenizer.getLineTokens("#abc012", "start").tokens; + var tokens = this.tokenizer.getLineTokens("#abc012", "ruleset").tokens; assert.equal(1, tokens.length); assert.equal("constant.numeric", tokens[0].type); @@ -81,7 +81,7 @@ module.exports = { }, "test for last rule in ruleset to catch capturing group bugs" : function() { - var tokens = this.tokenizer.getLineTokens("top", "start").tokens; + var tokens = this.tokenizer.getLineTokens("top", "ruleset").tokens; assert.equal(1, tokens.length); assert.equal("support.type", tokens[0].type); diff --git a/lib/ace/test/mockdom.js b/lib/ace/test/mockdom.js index 1c9b8476..4bf618a9 100644 --- a/lib/ace/test/mockdom.js +++ b/lib/ace/test/mockdom.js @@ -1,5 +1,5 @@ -var dom = require('jsdom/level2/html').dom.level2.html; -var browser = require('jsdom/browser/index').windowAugmentation(dom); +var dom = require('jsdom/lib/jsdom/level2/html').dom.level2.html; +var browser = require('jsdom/lib/jsdom/browser/index').windowAugmentation(dom); global.document = browser.document; global.window = browser.window;