package.json päivitys

nimirum · Apr 24, 2015 · ad98ea4 · ad98ea4
1 parent a914773
commit ad98ea4
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 7 deletions.
diff --git a/package.json b/package.json
@@ -1,14 +1,18 @@
 {
   "name": "Elokuvakirjasto",
-  "version": "0.0.0"
+  "version": "0.0.0",
   "author": "",
   "license": "ISC",
   "devDependencies": {
-    "karma": "~0.10",
+    "karma": "~0.12",
     "protractor": "^1.1.1",
     "http-server": "^0.6.1",
     "bower": "^1.3.1",
     "shelljs": "^0.2.6",
-    "karma-junit-reporter": "^0.2.2"
+    "karma-junit-reporter": "^0.2.2",
+    "karma-jasmine": "~0.2"
+  },
+  "dependencies": {
+    "karma-chrome-launcher": "^0.1.8"
   }
 }
diff --git a/test/add_movie_test.js b/test/add_movie_test.js
@@ -24,7 +24,7 @@ describe('Add movie', function(){
 	    });
 
 	    // Lisää vakoilijat
-	    // spyOn(FirebaseServiceMock, 'jokuFunktio');
+	    // spyOn(FirebaseServiceMock, 'jokuFunktio').and.callThrough();
   	});
 
   	/*

diff --git a/test/edit_movie_test.js b/test/edit_movie_test.js
@@ -31,7 +31,7 @@ describe('Edit movie', function(){
 	    });
 
 	    // Lisää vakoilijat
-	    // spyOn(FirebaseServiceMock, 'jokuFunktio');
+	    // spyOn(FirebaseServiceMock, 'jokuFunktio').and.callThrough();
   	});
 
   	/*

diff --git a/test/movie_list_test.js b/test/movie_list_test.js
@@ -24,7 +24,7 @@ describe('Movie list', function(){
 	    });
 
 	    // Lisää vakoilijat
-	    // spyOn(FirebaseServiceMock, 'jokuFunktio');
+	    // spyOn(FirebaseServiceMock, 'jokuFunktio').and.callThrough();
   	});
 
   	/*

diff --git a/test/show_movie_test.js b/test/show_movie_test.js
@@ -31,7 +31,7 @@ describe('Show movie', function(){
 	    });
 
 	    // Lisää vakoilijat
-	    // spyOn(FirebaseServiceMock, 'jokuFunktio');
+	    // spyOn(FirebaseServiceMock, 'jokuFunktio').and.callThrough();
   	});
 
   	/*
-Original file line number
+Diff line change
@@ Expand Up / @@ -24,7 +24,7 @@ describe('Add movie', function(){ @@
     	    });
     	    // Lisää vakoilijat
-    	    // spyOn(FirebaseServiceMock, 'jokuFunktio');
+    	    // spyOn(FirebaseServiceMock, 'jokuFunktio').and.callThrough();
       	});
       	/*
@@ Expand Down @@