aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Rakefile2
-rw-r--r--angularFiles.js19
2 files changed, 20 insertions, 1 deletions
diff --git a/Rakefile b/Rakefile
index fdbd573b..a1c3a6ba 100644
--- a/Rakefile
+++ b/Rakefile
@@ -2,7 +2,7 @@ require 'yaml'
include FileUtils
content = File.open('angularFiles.js', 'r') {|f| f.read }
-files = eval(content.gsub(/angularFiles = /, '').gsub(/:/, '=>'));
+files = eval(content.gsub(/\};(\s|\S)*/, '}').gsub(/angularFiles = /, '').gsub(/:/, '=>'));
BUILD_DIR = 'build'
diff --git a/angularFiles.js b/angularFiles.js
index 1070299f..af859471 100644
--- a/angularFiles.js
+++ b/angularFiles.js
@@ -154,3 +154,22 @@ angularFiles = {
'test/jquery_remove.js'
]
};
+
+// Execute only in slim-jim
+if (typeof JASMINE_ADAPTER !== 'undefined') {
+ // SlimJim config
+ files = [JASMINE_ADAPTER];
+ angularFiles.jstd.forEach(function(pattern) {
+ // replace angular source
+ if (pattern === '@angularSrc') files = files.concat(angularFiles.angularSrc);
+ // ignore jstd files
+ else if (!/jstd-(scenario-)?adapter/.test(pattern)) files.push(pattern);
+ });
+
+ exclude = angularFiles.jstdExclude;
+
+ autoWatch = true;
+ autoWatchInterval = 1;
+ logLevel = LOG_ERROR;
+ logColors = true;
+}