Skip to content

Commit f4811f2

Browse files
committed
update karma configs
1 parent 0b51d05 commit f4811f2

File tree

2 files changed

+4
-8
lines changed

2 files changed

+4
-8
lines changed

test/karma.ciconf.js renamed to test/jasmine/karma.ciconf.js

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
// Karma configuration
2-
// Generated on Mon Sep 15 2014 15:00:51 GMT-0400 (EDT)
32

4-
function func(config){
3+
function func(config) {
54

65
// level of logging
76
// possible values: config.LOG_DISABLE || config.LOG_ERROR || config.LOG_WARN || config.LOG_INFO || config.LOG_DEBUG

test/karma.conf.js renamed to test/jasmine/karma.conf.js

+3-6
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,6 @@
11
// Karma configuration
2-
// Generated on Wed Sep 10 2014 15:06:40 GMT-0700 (PDT)
32

4-
var shellyStatic = '../../../shelly/static/js/';
5-
6-
function func(config){
3+
function func(config) {
74

85
// level of logging
96
// possible values: config.LOG_DISABLE || config.LOG_ERROR || config.LOG_WARN || config.LOG_INFO || config.LOG_DEBUG
@@ -23,8 +20,7 @@ func.defaultConfig = {
2320

2421
// list of files / patterns to load in the browser
2522
files: [
26-
shellyStatic + 'plugins/jquery-1.8.3.min.js',
27-
//'../../../streaming/static/streaming/build/streamhead-bundle.js',
23+
'assets/jquery-1.8.3.min.js',
2824
'tests/*_test.js'
2925
],
3026

@@ -61,6 +57,7 @@ func.defaultConfig = {
6157
singleRun: false,
6258

6359
browserify: {
60+
transform: ['./transform.js'],
6461
extensions: ['.js'],
6562
watch: true,
6663
debug: true

0 commit comments

Comments
 (0)