X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=test%2Fspec%2Fmkws-index-simple.spec.js;h=dd43bb978149408742926d7273462beeedd34c64;hb=249e6c9946d2b29fbaf93ce74d291b4c8c015c82;hp=eeda1a8e9ed71a8275831054d6418ace500975c6;hpb=6766d6a434dc1d2fa4191c9673f517dd43a0f554;p=mkws-moved-to-github.git

diff --git a/test/spec/mkws-index-simple.spec.js b/test/spec/mkws-index-simple.spec.js
index eeda1a8..dd43bb9 100644
--- a/test/spec/mkws-index-simple.spec.js
+++ b/test/spec/mkws-index-simple.spec.js
@@ -13,90 +13,40 @@ var utils = require("./mkws_utils.js");
  *
  */
 
-function html_check (file, tags_array, ignore_doctype) {
-  var html = fs.readFileSync(file, "utf-8");
-  var tags = utils.flat_list(tags_array);
-
-  describe("index-full.html string test for " + file, function() {
-    it("html test", function() {
-      expect(html).toBeDefined();
-
-      // forgotten doctype declaration
-      if (!ignore_doctype) {
-        expect(html).toMatch(/<html.*?>/);
-        expect(html).toMatch(/<\/html.*?>/);
-      }
-      expect(html).toMatch(/<head.*?>/);
-      expect(html).toMatch(/<body.*?>/);
-      expect(html).toMatch(/<\/head.*?>/);
-      expect(html).toMatch(/<\/body.*?>/);
-
-      expect(html).toMatch(/<meta .*?charset=utf-8/i);
-      expect(html).toMatch(/<title>.+<\/title>/i);
-      expect(html).toMatch(/<link .*?type="text\/css" href=".*?\/?mkwsStyle.css"/);
-
-
-      for(var i = 0, data = ""; i < tags.length; i++) {
-        data = '<div id="' + tags[i] + '">';
-        // console.log(data)
-        expect(html).toMatch(data);
-      }
-    });
-  });
-}
-
-
-/*
- * parse HTML data to DOM, and run jQuery request on it
- *
- */
-
-function jsdom_check (file, tags_array, ignore_doctype) {
-  var html = fs.readFileSync(file, "utf-8");
-  var tags = utils.flat_list(tags_array);
-
-  describe("index-full.html jsdom + jquery for " + file, function() {
-    var window = require('jsdom').jsdom(html, null, {
-
-      FetchExternalResources: false,
-      ProcessExternalResources: false,
-      MutationEvents: false,
-      QuerySelector: false
-    }).createWindow();
-
-    /* apply jquery to the window */
-    var $ = jQuery = require('jquery').create(window);
-
-
-    it("html jquery test", function() {
-      expect(html).toBeDefined();
-
-      expect($("body").length == 0).toEqual(false);
-      expect($("body").length == 1).toEqual(true);
-      expect($("head").length == 1).toEqual(true);
-
-      for(var i = 0; i < tags.length; i++) {
-        expect($("#" + tags[i]).length == 1).toEqual(true);
-      }
-    });
-
-    it("html jquery fail test", function() {
-      expect(html).toBeDefined();
-
-      expect($("body_does_not_exists").length == 1).toEqual(false);
-      expect($("#body_does_not_exists").length == 1).toEqual(false);
+function html_check(file, tags_array, ignore_doctype) {
+    var html = fs.readFileSync(file, "utf-8");
+    var tags = utils.flat_list(tags_array);
+
+    describe("language.html string test for " + file, function () {
+        it("html test", function () {
+            expect(html).toBeDefined();
+
+            // forgotten doctype declaration
+            if (!ignore_doctype) {
+                expect(html).toMatch(/<html.*?>/);
+                expect(html).toMatch(/<\/html.*?>/);
+            }
+            expect(html).toMatch(/<head.*?>/);
+            expect(html).toMatch(/<body.*?>/);
+            expect(html).toMatch(/<\/head.*?>/);
+            expect(html).toMatch(/<\/body.*?>/);
+
+            expect(html).toMatch(/<meta .*?charset=utf-8/i);
+            expect(html).toMatch(/<title>.+<\/title>/i);
+            expect(html).toMatch(/<link .*?type="text\/css" href=".*?\/?mkws.css"/);
+
+
+            for (var i = 0, data = ""; i < tags.length; i++) {
+                data = '<div id="' + tags[i] + '">';
+                // console.log(data)
+                expect(html).toMatch(data);
+            }
+        });
     });
-  });
 }
 
-html_check('../examples/htdocs/index-full.html', [utils.tags.required, utils.tags.optional, utils.tags.optional2]);
-html_check('../examples/htdocs/index-mobile.html', [utils.tags.required, utils.tags.optional]);
-html_check('../examples/htdocs/index-popup.html', [], true);
-html_check('../examples/htdocs/index-jquery.html', []);
-html_check('../examples/htdocs/index-mike.html', [utils.tags.required, utils.tags.optional], true);
-
-jsdom_check('../examples/htdocs/index-full.html', [utils.tags.required, utils.tags.optional, utils.tags.optional2]);
-jsdom_check('../examples/htdocs/index-mobile.html', [utils.tags.required, utils.tags.optional]);
-jsdom_check('../examples/htdocs/index-popup.html', [], true);
-jsdom_check('../examples/htdocs/index-jquery.html', []);
-jsdom_check('../examples/htdocs/index-mike.html', [utils.tags.required, utils.tags.optional], true);
+html_check('../examples/htdocs/language.html', [utils.tags.required, utils.tags.optional, utils.tags.optional2]);
+html_check('../examples/htdocs/mobile.html', [utils.tags.required, utils.tags.optional]);
+html_check('../examples/htdocs/popup.html', [], true);
+html_check('../examples/htdocs/jquery.html', []);
+html_check('../examples/htdocs/mike.html', [utils.tags.required, utils.tags.optional], true);