aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVojta Jina2011-10-31 17:56:55 -0700
committerVojta Jina2011-10-31 18:22:38 -0700
commitddf6f1143f140d81b22d21ff33de062a35999801 (patch)
tree82bdaef94cea22bcdac15cd6b482f5a845675cb3
parent2636105c5e363f14cda890f19ac9c3bc57556dd2 (diff)
downloadangular.js-ddf6f1143f140d81b22d21ff33de062a35999801.tar.bz2
test(mocks): test mocks with compiled angular
Unfortunately, there people in our team (me), who are not able to use angular.* namespace prefix when writing angular-mocks code, so we need to test it...
-rw-r--r--angularFiles.js9
-rwxr-xr-xgen_jstd_configs.js2
-rwxr-xr-xtest-mocks.sh4
3 files changed, 15 insertions, 0 deletions
diff --git a/angularFiles.js b/angularFiles.js
index 2cf26719..2d9a48fc 100644
--- a/angularFiles.js
+++ b/angularFiles.js
@@ -94,6 +94,15 @@ angularFiles = {
'build/docs/docs-scenario.js'
],
+ 'jstdMocks': [
+ 'lib/jasmine/jasmine.js',
+ 'lib/jasmine-jstd-adapter/JasmineAdapter.js',
+ 'build/angular.js',
+ 'src/angular-mocks.js',
+ 'test/matchers.js',
+ 'test/angular-mocksSpec.js'
+ ],
+
'jstdPerf': [
'lib/jasmine/jasmine.js',
'lib/jasmine-jstd-adapter/JasmineAdapter.js',
diff --git a/gen_jstd_configs.js b/gen_jstd_configs.js
index 15d8491d..7165d202 100755
--- a/gen_jstd_configs.js
+++ b/gen_jstd_configs.js
@@ -16,6 +16,8 @@ fs.readFile('angularFiles.js', function(err, data) {
fs.writeFile('./jsTestDriver.conf', prefix + combine(angularFiles.jstd,
angularFiles.jstdExclude));
+ fs.writeFile('./jsTestDriver-mocks.conf', prefix + combine(angularFiles.jstdMocks));
+
fs.writeFile('./jsTestDriver-scenario.conf', prefixScenario +
combine(angularFiles.jstdScenario) +
'\n\nproxy:\n- {matcher: "*", server: "http://localhost:8000"}');
diff --git a/test-mocks.sh b/test-mocks.sh
new file mode 100755
index 00000000..b91fc901
--- /dev/null
+++ b/test-mocks.sh
@@ -0,0 +1,4 @@
+#!/bin/bash
+if [ ! -e test.dissable ]; then
+ java -jar lib/jstestdriver/JsTestDriver.jar --tests all --config jsTestDriver-mocks.conf $@
+fi