From e14514d547bbbb8e9140b200824029ea608cf815 Mon Sep 17 00:00:00 2001 From: Yvonne Yip Date: Thu, 11 Apr 2013 13:03:03 -0700 Subject: [PATCH] test: use toolkitchen/test submodule --- .gitmodules | 3 +++ conf/karma.conf.js | 3 ++- conf/mocha.conf.js | 3 ++- lib/test | 1 + modern.ie.sh | 14 -------------- test/html/bind-object-repeat.html | 2 +- test/runner.html | 4 ++-- 7 files changed, 11 insertions(+), 19 deletions(-) create mode 160000 lib/test delete mode 100755 modern.ie.sh diff --git a/.gitmodules b/.gitmodules index 884a896c..bfaa7793 100644 --- a/.gitmodules +++ b/.gitmodules @@ -4,3 +4,6 @@ [submodule "buildbot"] path = buildbot url = https://github.com/toolkitchen/buildbot.git +[submodule "lib/test"] + path = lib/test + url = https://github.com/toolkitchen/test diff --git a/conf/karma.conf.js b/conf/karma.conf.js index aefecaf5..9caadff5 100644 --- a/conf/karma.conf.js +++ b/conf/karma.conf.js @@ -13,12 +13,13 @@ basePath = '../'; files = [ MOCHA, MOCHA_ADAPTER, - 'test/lib/mocha-htmltest.js', + 'lib/test/mocha-htmltest.js', 'conf/mocha.conf.js', 'node_modules/chai/chai.js', 'platform/platform.js', 'toolkit.js', 'test/js/*.js', + {pattern: 'lib/**/*.js', included: false}, {pattern: 'platform/**/*', included: false}, {pattern: 'src/*.js', included: false}, {pattern: 'test/**/*.html', included: false}, diff --git a/conf/mocha.conf.js b/conf/mocha.conf.js index 3736ae27..ce355f6b 100644 --- a/conf/mocha.conf.js +++ b/conf/mocha.conf.js @@ -1,4 +1,5 @@ mocha.setup({ ui:'tdd', - slow: 1000 + slow: 1000, + htmlbase: '/base/test/' }); diff --git a/lib/test b/lib/test new file mode 160000 index 00000000..0d5ec612 --- /dev/null +++ b/lib/test @@ -0,0 +1 @@ +Subproject commit 0d5ec6127f0fe261d199b827e208c61e99a1ce5a diff --git a/modern.ie.sh b/modern.ie.sh deleted file mode 100755 index d5fc92d7..00000000 --- a/modern.ie.sh +++ /dev/null @@ -1,14 +0,0 @@ -#!/bin/bash - -runIE() { - VBoxManage guestcontrol "IE10 - Win8" exec --username IEUser --image "C:\\Program Files\\Internet Explorer\\iexplore.exe" --password 'Passw0rd!' --wait-exit -- "$1" -} - -killIE() { - VBoxManage guestcontrol "IE10 - Win8" exec --username IEUser --image "C:\\Windows\\system32\\taskkill.exe" --password 'Passw0rd!' --wait-exit -- /IM iexplore.exe /F -} - -trap "killIE; exit 0" EXIT - -url=$1 -runIE "${url/localhost/10.0.2.2}" diff --git a/test/html/bind-object-repeat.html b/test/html/bind-object-repeat.html index b3935508..4409ef89 100644 --- a/test/html/bind-object-repeat.html +++ b/test/html/bind-object-repeat.html @@ -4,7 +4,7 @@ bind object + repeat - + diff --git a/test/runner.html b/test/runner.html index c9bd5fbd..54e4e829 100644 --- a/test/runner.html +++ b/test/runner.html @@ -12,7 +12,7 @@ license that can be found in the LICENSE file. - + @@ -20,7 +20,7 @@ license that can be found in the LICENSE file.