Lily Carpenter 10 gadi atpakaļ
vecāks
revīzija
647ee85088
3 mainītis faili ar 3 papildinājumiem un 2 dzēšanām
  1. 1 1
      gulpfile.js
  2. 1 0
      karma.conf.js
  3. 1 1
      tests/noteSpec.js

+ 1 - 1
gulpfile.js

@@ -13,7 +13,7 @@ gulp.task('connect', function(){
13 13
 });
14 14
 
15 15
 gulp.task('html', function(){
16
-  var html_path = 'www/*.html';
16
+  var html_path = 'www/**/*.html';
17 17
   var js_path = 'www/js/**/*.js';
18 18
   var css_path = 'www/css/**/*.css';
19 19
 

+ 1 - 0
karma.conf.js

@@ -17,6 +17,7 @@ module.exports = function(config) {
17 17
     files: [
18 18
       'www/lib/angular/angular.js',
19 19
       'www/lib/angular-mocks/angular-mocks.js',
20
+      'www/lib/angular-route/angular-route.js',
20 21
       'www/js/**/*.js',
21 22
       'tests/**/*.js'
22 23
     ],

+ 1 - 1
tests/noteSpec.js

@@ -6,7 +6,7 @@ describe('Notes controller', function(){
6 6
     Notes = _Notes_;
7 7
     Notes.saveData = function(data){};
8 8
     Notes.getData = function(){return [{"title": "Test", "body": "Test"}];};
9
-    $controller('NoteCtrl', {Notes:Notes,$scope:scope});
9
+    $controller('noteCtrl', {Notes:Notes,$scope:scope, defaultNote:{data: {"title": "Placeholder", "body": "Placeholder"}}});
10 10
   }));
11 11
 
12 12
   it('initializes default notes list', function(){