Skip to content

Commit

Permalink
Merge pull request tastejs#563 from txmikester/angular-test-fix
Browse files Browse the repository at this point in the history
Fixed broken AngularJS test runner
  • Loading branch information
passy committed May 17, 2013
2 parents 7a337a5 + 57d0c3e commit d3e1ac8
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 12 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ basePath = '../../';
files = [
JASMINE,
JASMINE_ADAPTER,
'components/angular/angular.js',
'components/angular-mocks/angular-mocks.js',
'bower_components/angular/angular.js',
'bower_components/angular-mocks/angular-mocks.js',
'js/**/*.js',
'test/unit/**/*.js'
];
Expand Down
21 changes: 11 additions & 10 deletions architecture-examples/angularjs/test/package.json
Original file line number Diff line number Diff line change
@@ -1,12 +1,13 @@
{
"name": "todomvc-angular-tests",
"description": "Unit tests for the AngularJS example of TodoMVC",
"author": "Pascal Hartig <phartig@rdrei.net>",
"version": "1.0.0",
"devDependencies": {
"testacular": "~ 0.4.0"
},
"scripts": {
"test": "testacular start config/testacular.conf.js"
}
"name": "todomvc-angular-tests",
"description": "Unit tests for the AngularJS example of TodoMVC",
"author": "Pascal Hartig <phartig@rdrei.net>",
"version": "1.0.0",
"devDependencies": {
"karma": "~0.8.5"
},
"scripts": {
"test": "karma start config/testacular.conf.js"
},
"dependencies": {}
}

0 comments on commit d3e1ac8

Please sign in to comment.