yetangitu/Jamstash
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Fixes the queue test

Browse source
This commit is contained in:
Hyzual 2014-11-30 19:25:23 +01:00
parent e5846e30f9
commit 91b112cb0a
2 changed files with 15 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

6
app/queue/queue.js
View file

@ -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', .controller('QueueCtrl', ['$scope', '$rootScope', 'globals', 'player',
function QueueCtrl($scope, $rootScope, $routeParams, $location, utils, globals, player) { function QueueCtrl($scope, $rootScope, globals, player) {
'use strict'; 'use strict';
$scope.settings = globals.settings; $scope.settings = globals.settings;
$scope.song = $rootScope.queue; $scope.song = $rootScope.queue;

13
app/queue/queue_test.js
View file

@ -1,24 +1,28 @@
describe("Queue controller", function() { describe("Queue controller", function() {
'use strict'; 'use strict';
var player, scope; var player, $rootScope, scope, globals;
beforeEach(function() { beforeEach(function() {
module('jamstash.queue.ctrl'); module('jamstash.queue.ctrl');
inject(function ($controller, $rootScope, _player_) { inject(function ($controller, _$rootScope_, _globals_, _player_) {
$rootScope = _$rootScope_;
scope = $rootScope.$new(); scope = $rootScope.$new();
globals = _globals_;
player = _player_; player = _player_;
// Mock the functions of the services // Mock the functions of the services
spyOn(player, "playSong").and.stub(); spyOn(player, "playSong").and.stub();
$controller('PlayerCtrl', { $controller('QueueCtrl', {
$rootScope: $rootScope,
$scope: scope, $scope: scope,
globals: globals,
player: player player: player
}); });
}); });
});
it("When I call playSong, it calls playSong in the player service", function() { it("When I call playSong, it calls playSong in the player service", function() {
var fakeSong = {"id": 3174}; var fakeSong = {"id": 3174};
@ -27,4 +31,3 @@ describe("Queue controller", function() {
expect(player.playSong).toHaveBeenCalledWith(true, fakeSong); expect(player.playSong).toHaveBeenCalledWith(true, fakeSong);
}); });
}); });
});