From ee6b9ce43c04e053e97dde62b125985d855866b7 Mon Sep 17 00:00:00 2001 From: Wolfram Schneider Date: Wed, 21 Aug 2013 17:03:37 +0200 Subject: [PATCH] refactor to check more HTML pages in mkws/examples/htdocs --- test/spec/mkws-index-full.spec.js | 58 +++++++++++++++++++++---------------- 1 file changed, 33 insertions(+), 25 deletions(-) diff --git a/test/spec/mkws-index-full.spec.js b/test/spec/mkws-index-full.spec.js index 52b9746..52c4eed 100644 --- a/test/spec/mkws-index-full.spec.js +++ b/test/spec/mkws-index-full.spec.js @@ -4,14 +4,8 @@ * */ -var file = '../examples/htdocs/index-full.html' var fs = require("fs"); -var html = fs.readFileSync(file, "utf-8"); - -var mkws_tags_required = ["mkwsSearch", "mkwsResults"]; -var mkws_tags_optional = ["mkwsSwitch", "mkwsLang", "mkwsTargets"]; -var mkws_tags_optional2 = ["mkwsMOTD", "mkwsStat", "footer"]; /* * combine arrays, return a flat list @@ -39,38 +33,52 @@ function flat_list (list) { * simple test with string matching of the HTML page * */ -describe("index-full.html string test", function() { - it("html test", function() { - expect(html).toBeDefined(); - expect(html).toMatch(//); // forgotten doctype? - expect(html).toMatch(//); - expect(html).toMatch(//); - expect(html).toMatch(/<\/html.*?>/); - expect(html).toMatch(/<\/head.*?>/); - expect(html).toMatch(/<\/body.*?>/); +function html_check (file, tags_array) { + var html = fs.readFileSync(file, "utf-8"); + var tags = flat_list(tags_array); - expect(html).toMatch(/.+<\/title>/i); - expect(html).toMatch(//); // forgotten doctype? + expect(html).toMatch(/<\/html.*?>/); + expect(html).toMatch(//); + expect(html).toMatch(//); + expect(html).toMatch(/<\/head.*?>/); + expect(html).toMatch(/<\/body.*?>/); - for(var i = 0, data = ""; i < tags.length; i++) { - data = '
'; - // console.log(data) - expect(html).toMatch(data); - } + expect(html).toMatch(/.+<\/title>/i); + expect(html).toMatch(/'; + // console.log(data) + expect(html).toMatch(data); + } + }); }); -}); +} +var mkws_tags_required = ["mkwsSearch", "mkwsResults"]; +var mkws_tags_optional = ["mkwsSwitch", "mkwsLang", "mkwsTargets"]; +var mkws_tags_optional2 = ["mkwsMOTD", "mkwsStat", "footer"]; +html_check('../examples/htdocs/index-full.html', [mkws_tags_required, mkws_tags_optional, mkws_tags_optional2]); +html_check('../examples/htdocs/index-mobile.html', [mkws_tags_required, mkws_tags_optional]); +html_check('../examples/htdocs/index-jquery.html', []); +var file = '../examples/htdocs/index-full.html'; +var html = fs.readFileSync(file, "utf-8"); /* * parse HTML data to DOM, and run jQuery request on it * */ describe("index-full.html jsdom + jquery", function() { var window = require('jsdom').jsdom(html, null, { + FetchExternalResources: false, ProcessExternalResources: false, MutationEvents: false, -- 1.7.10.4