Skip to content

Commit

Permalink
test: testactular - its no longer necessary to run ./scripts/develope…
Browse files Browse the repository at this point in the history
…ment.sh in background to compile javascript. It still is for coffee script, however.
  • Loading branch information
kylefinley committed Sep 10, 2012
1 parent cc9f968 commit 48cfa38
Showing 1 changed file with 17 additions and 2 deletions.
19 changes: 17 additions & 2 deletions test/conf.js
Expand Up @@ -11,9 +11,24 @@ basePath = '../'
files = [
JASMINE,
JASMINE_ADAPTER,
'_public/js/vendor.js',
'_public/js/app.js',

// Javascript //
'vendor/scripts/angular/angular.js',
'vendor/scripts/**/*.js',
'app/scripts/**/*.js',

// CoffeeScript //
// When using coffeescript you must run `./scripts/development.sh` in the background
// to compile the .coffee file to .js. Uncomment these lines to used the generated file.
// '_public/js/vendor.js',
// '_public/js/app.js',

'test/vendor/angular/angular-mocks.js',

// Sapling mocks
// 'test/vendor/sapling/sapling-mocks.js',

// Specs
'test/unit/**/*.spec.js'
];

Expand Down

0 comments on commit 48cfa38

Please sign in to comment.