MKWS demo: jQuery popup plugin with jasmine

From: Mike Taylor Date: Mon, 11 Nov 2013 14:06:09 +0000 (+0000) Subject: Merge branch 'master' of ssh://git.indexdata.com/home/git/private/mkws X-Git-Tag: 0.9.1~149^2~13 X-Git-Url: http://sru.miketaylor.org.uk/?a=commitdiff_plain;h=89ec0e8996953b33b1c5bd879f2c6d33a696c179;hp=798f9ed38de5196aa5aebbd4f02becc612669b2b;p=mkws-moved-to-github.git Merge branch 'master' of ssh://git.indexdata.com/home/git/private/mkws --- diff --git a/examples/htdocs/index-jasmine-popup.html b/examples/htdocs/index-jasmine-popup.html deleted file mode 100644 index 38e673b..0000000 --- a/examples/htdocs/index-jasmine-popup.html +++ /dev/null @@ -1,47 +0,0 @@ - - - - MKWS demo: jQuery popup plugin with jasmine - - - - - - - - - - - - - - - - - - - - - - - - - -

-An embryonic MasterKey Widget Set
-=================================
-
-This directory contains an embryonic MasterKey Widget Set, based
-initially on "jsdemo" though now far removed from those beginnnings.
-[...]
-

- - diff --git a/examples/htdocs/index-jasmine.html b/examples/htdocs/index-jasmine.html deleted file mode 100644 index 818123c..0000000 --- a/examples/htdocs/index-jasmine.html +++ /dev/null @@ -1,82 +0,0 @@ - - - - MKWS demo: Wolfram's playground - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -

- - - diff --git a/examples/htdocs/jasmine-popup.html b/examples/htdocs/jasmine-popup.html new file mode 100644 index 0000000..38e673b --- /dev/null +++ b/examples/htdocs/jasmine-popup.html @@ -0,0 +1,47 @@ + + + + MKWS demo: jQuery popup plugin with jasmine + + + + + + + + + + + + + + + + + + + + + + + + + +

+An embryonic MasterKey Widget Set
+=================================
+
+This directory contains an embryonic MasterKey Widget Set, based
+initially on "jsdemo" though now far removed from those beginnnings.
+[...]
+

+ + diff --git a/examples/htdocs/jasmine.html b/examples/htdocs/jasmine.html new file mode 100644 index 0000000..818123c --- /dev/null +++ b/examples/htdocs/jasmine.html @@ -0,0 +1,82 @@ + + + + MKWS demo: Wolfram's playground + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +

+ + + diff --git a/test/Makefile b/test/Makefile index 532e776..8891679 100644 --- a/test/Makefile +++ b/test/Makefile @@ -9,7 +9,7 @@ distclean: check: - jasmine-node ./spec + jasmine-node --captureExceptions ./spec test: check diff --git a/test/spec/mkws-index-jsdom-remote.spec.js b/test/spec/mkws-index-jsdom-remote.spec.js index ed20b93..c885d67 100644 --- a/test/spec/mkws-index-jsdom-remote.spec.js +++ b/test/spec/mkws-index-jsdom-remote.spec.js @@ -17,7 +17,7 @@ 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 () { + describe("language.html jsdom + jquery for " + file, function () { var window = require('jsdom').jsdom(html, null, { FetchExternalResources: false, ProcessExternalResources: false, @@ -51,9 +51,9 @@ function jsdom_check(file, tags_array, ignore_doctype) { } /* -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); +jsdom_check('../examples/htdocs/language.html', [utils.tags.required, utils.tags.optional, utils.tags.optional2]); +jsdom_check('../examples/htdocs/mobile.html', [utils.tags.required, utils.tags.optional]); +jsdom_check('../examples/htdocs/popup.html', [], true); +jsdom_check('../examples/htdocs/jquery.html', []); +jsdom_check('../examples/htdocs/mike.html', [utils.tags.required, utils.tags.optional], true); */ diff --git a/test/spec/mkws-index-jsdom.spec.js b/test/spec/mkws-index-jsdom.spec.js index 8106441..bd481c3 100644 --- a/test/spec/mkws-index-jsdom.spec.js +++ b/test/spec/mkws-index-jsdom.spec.js @@ -17,7 +17,7 @@ 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 () { + describe("language.html jsdom + jquery for " + file, function () { var window = require('jsdom').jsdom(html, null, { FetchExternalResources: false, ProcessExternalResources: false, @@ -50,8 +50,8 @@ function jsdom_check(file, tags_array, ignore_doctype) { }); } -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); +jsdom_check('../examples/htdocs/language.html', [utils.tags.required, utils.tags.optional, utils.tags.optional2]); +jsdom_check('../examples/htdocs/mobile.html', [utils.tags.required, utils.tags.optional]); +jsdom_check('../examples/htdocs/popup.html', [], true); +jsdom_check('../examples/htdocs/jquery.html', []); +jsdom_check('../examples/htdocs/mike.html', [utils.tags.required, utils.tags.optional], true); diff --git a/test/spec/mkws-index-simple.spec.js b/test/spec/mkws-index-simple.spec.js index 9ae5a69..dd43bb9 100644 --- a/test/spec/mkws-index-simple.spec.js +++ b/test/spec/mkws-index-simple.spec.js @@ -17,7 +17,7 @@ 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 () { + describe("language.html string test for " + file, function () { it("html test", function () { expect(html).toBeDefined(); @@ -45,8 +45,8 @@ function html_check(file, tags_array, ignore_doctype) { }); } -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); +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); diff --git a/tools/htdocs/Makefile b/tools/htdocs/Makefile index 2abcb97..8ad95ce 100644 --- a/tools/htdocs/Makefile +++ b/tools/htdocs/Makefile @@ -34,7 +34,7 @@ pz2api-git-checkout: ( cd $$(dirname $$(dirname ${PZ2API_JS})); git clone ${PZ2API_GIT} ); \ fi -mkws-js ${MKWS_JS}: ${PZ2API_JS} mkws.js +mkws-js ${MKWS_JS}: mkws.js @if ! test -e ${PZ2API_JS}; then \ echo "The pazpar2 JS file ${PZ2API_JS} does not exists."; \ echo "Did you checked out the source from the git repo?"; \ @@ -44,7 +44,7 @@ mkws-js ${MKWS_JS}: ${PZ2API_JS} mkws.js ( echo "/* created at: $$(date)"; \ echo " mkws.js GIT id: $$(git log mkws.js | head -n 1 | perl -npe 's,\S+\s+,,') */"; \ curl -sSf ${JQUERY_URL} | perl -npe 's,sourceMappingURL=jquery.*map,,'; \ - cat ../../../libjs-pz2/pz2api.1.js mkws.js ) > ${MKWS_JS}.new + cat ${PZ2API_JS} mkws.js ) > ${MKWS_JS}.new mv -f ${MKWS_JS}.new ${MKWS_JS} distclean: clean