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

Adds angular-ui/ui-utils/ui-keypress dependency

Browse source 
It provides a directive to bind keypress / keyup / keydown events to the DOM.
- Adds back toggling play / pause by pressing space.
- Renames player-service's pause() to togglePause(), which is its actual behavior
- Adds unit tests to togglePause() in player-service
This commit is contained in:
Hyzual 2015-02-08 20:44:56 +01:00
parent e89865365d
commit 8529e331a2
10 changed files with 128 additions and 72 deletions
Download patch file Download diff file Expand all files Collapse all files

24
app/common/main-controller_test.js
View file

@ -6,7 +6,8 @@ describe("Main controller", function() {
mockGlobals = {
settings: {
ShowQueue: false,
Debug: true
Debug: true,
Jukebox: false
}
};
@ -14,9 +15,11 @@ describe("Main controller", function() {
$provide.value('globals', mockGlobals);
});
inject(function ($controller, $rootScope, _$document_, _$window_, _$location_, _$cookieStore_, _utils_, globals, _model_, _notifications_, _player_, _locker_, _Page_) {
// Mock the player service
player = jasmine.createSpyObj("player", ["togglePause"]);
inject(function ($controller, $rootScope, _$document_, _$window_, _$location_, _$cookieStore_, _utils_, globals, _model_, _notifications_, _locker_, _Page_) {
scope = $rootScope.$new();
player = _player_;
utils = _utils_;
spyOn(utils, "switchTheme");
@ -78,4 +81,19 @@ describe("Main controller", function() {
expect(scope.showQueue).toHaveBeenCalled();
});
describe("When I toggle pause,", function() {
it("given that we're using the Jukebox mode, it sends a 'pause' command to the jukebox", function() {
mockGlobals.settings.Jukebox = true;
spyOn(scope, "sendToJukebox");
scope.togglePause();
expect(scope.sendToJukebox).toHaveBeenCalledWith('pause');
});
it("it toggles pause using the player service", function() {
scope.togglePause();
expect(player.togglePause).toHaveBeenCalled();
});
});
});