updated unit tests

Author: jcb121

karma.conf.js

@@ -79,7 +79,7 @@ module.exports = function(config) {
 	// optionally, configure the reporter
     coverageReporter: {
       type : 'html',
-      dir : 'test/coverage/'
+      dir : 'dist/coverage/'
   	},
 
 	ngHtml2JsPreprocessor: {

src/client/app/components/deckLoader/deckLoader.js

@@ -4,7 +4,6 @@ rootApp.directive("deckLoader", function () {
         templateUrl: "components/deckLoader/deckLoader.html",
         scope: {},
         controller: function ($scope, decks, users ) {
-			console.log(decks);
 			$scope.Decks = decks;
 
 			if(users.user_id){

src/client/app/components/deckLoader/deckLoader.spec.js

@@ -5,28 +5,29 @@ describe('deckLoader.js', function(){
 		$scope,
 		$element,
 		$q,
-		mockDecks = function(){
-			this.get = function(){};
-		};
+		decks;
 
 	beforeEach(module('app'));
 	beforeEach(module('app.templates'));
 	beforeEach(module(function($provide) {
-		//decks calls Webdecks, Webdecks makes a HTTP request, Fake it.
-		$provide.value("decks", new mockDecks());
+		$provide.service("decks", function(){
+			this.get = function(){
+				return $q.when('mockDecks');
+			};
+		});
 	}));
-	beforeEach(inject(function(_$compile_, _$rootScope_, _$q_){
+	beforeEach(inject(function(_$compile_, _$rootScope_, _$q_, _decks_){
 		$compile = _$compile_;
 		$rootScope = _$rootScope_;
 		$q = _$q_;
+		decks = _decks_;
 	}));
 	beforeEach(function(){
 		var element = $compile("<deck-loader></deck-loader>")($rootScope);
 		$rootScope.$digest();
 		$scope = element.isolateScope() || element.scope();
 	});
 	it('should bind the decks service to $scope', function() {
-		console.log($scope);
-		//expect($scope.Decks).toEqual("decks");
+		expect($scope.Decks).toEqual(decks);
 	});
 });

src/client/app/components/pokemonCard/pokemonCard.spec.js

@@ -3,29 +3,23 @@ describe('pokemonCard.js', function(){
 	var $compile,
     	$rootScope,
 		$scope,
-		$element;
-
-	var cardsSeriveMock = {
-		get : jasmine.createSpy('get'),
-		typeof : jasmine.createSpy('typeof')
-	};
-
-	var decksSeriveMock = {
-		get : jasmine.createSpy('get'),
-	};
+		$element,
+		cards;
 
 	beforeEach(module('app'));
 	beforeEach(module('app.templates'));
 	beforeEach(module(function($provide) {
-		//$provide.value("markedCards", "markedCards" );
-		//$provide.value("activeCard", "activeCard" );
-		$provide.value("cards", cardsSeriveMock);
-		$provide.value("decks", decksSeriveMock );
-		//$provide.value("typeChecker", "typeChecker");
+		$provide.service("cards", function($q){
+			this.getById = jasmine.createSpy('getById').and.callFake(function(num) {
+				return $q.when("ABC");
+    		});
+		});
+
 	}));
-	beforeEach(inject(function(_$compile_, _$rootScope_){
+	beforeEach(inject(function(_$compile_, _$rootScope_, _cards_, _decks_){
 		$compile = _$compile_;
 		$rootScope = _$rootScope_;
+		cards = _cards_;
 	}));
 
 
@@ -39,8 +33,6 @@ describe('pokemonCard.js', function(){
 			expect($scope.card.name).toEqual('mock');
 
 		});
-
-
 	});
 
 	describe('When card data is absent in the directive',function(){
@@ -50,8 +42,7 @@ describe('pokemonCard.js', function(){
 			$scope = element.isolateScope() || element.scope();
 		});
 		it('should bind the decks service to $scope', function() {
-
-			expect(cardsSeriveMock.get ).toHaveBeenCalledWith({id:55});
+			expect(cards.getById ).toHaveBeenCalledWith(55);
 		});
 	});