From 91b112cb0ac3bcfb0fabf1221841027658eea1cd Mon Sep 17 00:00:00 2001
From: Hyzual <hyzual@gmail.com>
Date: Sun, 30 Nov 2014 19:25:23 +0100
Subject: [PATCH] Fixes the queue test

---
 app/queue/queue.js      |  6 +++---
 app/queue/queue_test.js | 21 ++++++++++++---------
 2 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/app/queue/queue.js b/app/queue/queue.js
index 772fe61..ccc3a6f 100644
--- a/app/queue/queue.js
+++ b/app/queue/queue.js
@@ -1,7 +1,7 @@
-angular.module('jamstash.queue.ctrl', [])
+angular.module('jamstash.queue.ctrl', ['jamstash.player.service'])
 
-.controller('QueueCtrl', ['$scope', '$rootScope', '$routeParams', '$location', 'utils', 'globals', 'player',
-	function QueueCtrl($scope, $rootScope, $routeParams, $location, utils, globals, player) {
+.controller('QueueCtrl', ['$scope', '$rootScope', 'globals', 'player',
+	function QueueCtrl($scope, $rootScope, globals, player) {
 	'use strict';
     $scope.settings = globals.settings;
     $scope.song = $rootScope.queue;
diff --git a/app/queue/queue_test.js b/app/queue/queue_test.js
index f7667c4..1837b17 100644
--- a/app/queue/queue_test.js
+++ b/app/queue/queue_test.js
@@ -1,30 +1,33 @@
 describe("Queue controller", function() {
     'use strict';
 
-    var player, scope;
+    var player, $rootScope, scope, globals;
 
     beforeEach(function() {
         module('jamstash.queue.ctrl');
 
-        inject(function ($controller, $rootScope, _player_) {
+        inject(function ($controller, _$rootScope_, _globals_, _player_) {
+            $rootScope = _$rootScope_;
             scope = $rootScope.$new();
+            globals = _globals_;
             player = _player_;
 
             // Mock the functions of the services
             spyOn(player, "playSong").and.stub();
 
-            $controller('PlayerCtrl', {
+            $controller('QueueCtrl', {
+                $rootScope: $rootScope,
                 $scope: scope,
+                globals: globals,
                 player: player
             });
         });
+    });
+    it("When I call playSong, it calls playSong in the player service", function() {
+        var fakeSong = {"id": 3174};
 
-        it("When I call playSong, it calls playSong in the player service", function() {
-            var fakeSong = {"id": 3174};
+        scope.playSong(true, fakeSong);
 
-            scope.playSong(true, fakeSong);
-
-            expect(player.playSong).toHaveBeenCalledWith(true, fakeSong);
-        });
+        expect(player.playSong).toHaveBeenCalledWith(true, fakeSong);
     });
 });