Permalink
Browse files

Fixed tests

  • Loading branch information...
1 parent fb7cb43 commit 76ca950af4578b8e0cdf6b160a4b09aa1cddb26a @GulinSS committed Feb 8, 2013
Showing with 8 additions and 1,750 deletions.
  1. +2 −0 .gitignore
  2. +2 −0 config.coffee
  3. +4 −8 test/testacular.conf.js
  4. +0 −1,741 test/vendor/angular/angular-mocks.js
  5. +0 −1 test/vendor/angular/version.txt
View
@@ -3,6 +3,8 @@ nbproject
manifest.mf
build.xml
+node_modules
+
.project
.settings
.idea/*
View
@@ -20,6 +20,7 @@ exports.config =
'vendor/angular/angular.js'
'vendor/angular-resource/angular-resource.js'
'vendor/angular-cookies/angular-cookies.js'
+ 'vendor/angular-sanitize/angular-sanitize.js'
'vendor/bootstrap/docs/assets/js/bootstrap.js'
]
@@ -41,6 +42,7 @@ exports.config =
bower:
extend:
"bootstrap" : 'vendor/bootstrap/docs/assets/js/bootstrap.js'
+ "angular-mocks": []
"styles": []
asserts:
"img" : /bootstrap(\\|\/)img/
View
@@ -10,18 +10,14 @@ files = [
JASMINE_ADAPTER,
// Application Code //
- 'vendor/scripts/angular/angular.js',
- 'vendor/scripts/angular/angular-*.js',
+ 'vendor/jquery/jquery.js',
+ 'vendor/angular/angular.js',
+ 'vendor/angular-*/angular-*.js',
+ 'vendor/bootstrap/docs/assets/js/bootstrap.js',
- //'vendor/scripts/**/*.js',
- 'vendor/scripts/**/*.coffee',
//'app/scripts/**/*.js',
'app/scripts/**/*.coffee',
- // Javascript //
-
- 'test/vendor/angular/angular-mocks.js',
-
// Specs //
// CoffeeScript //
Oops, something went wrong.

0 comments on commit 76ca950

Please sign in to comment.