-
-
-
-
-
-
-
-
-
-
-
-
- 
- 
- 
-
-
-
-
- Queue
-
-
-
- -
-
-
-
-
-
+
+
+
-
-
\ No newline at end of file
+
diff --git a/app/subsonic/subsonic.js b/app/subsonic/subsonic.js
index 83f0271..1cf2f1c 100644
--- a/app/subsonic/subsonic.js
+++ b/app/subsonic/subsonic.js
@@ -1,13 +1,13 @@
-/**
-* jamstash.subsonic.ctrl Module
+/**
+* jamstash.subsonic.controller Module
*
* Access and use the Subsonic Server. The Controller is in charge of relaying the Service's messages to the user through the
* notifications.
*/
-angular.module('jamstash.subsonic.ctrl', ['jamstash.subsonic.service'])
+angular.module('jamstash.subsonic.controller', ['jamstash.subsonic.service', 'jamstash.player.service'])
-.controller('SubsonicCtrl', ['$scope', '$rootScope', '$routeParams', 'utils', 'globals', 'map', 'subsonic', 'notifications',
- function SubsonicCtrl($scope, $rootScope, $routeParams, utils, globals, map, subsonic, notifications) {
+.controller('SubsonicController', ['$scope', '$rootScope', '$routeParams', 'utils', 'globals', 'map', 'subsonic', 'notifications', 'player',
+ function ($scope, $rootScope, $routeParams, utils, globals, map, subsonic, notifications, player) {
'use strict';
$scope.settings = globals.settings;
@@ -143,15 +143,19 @@ angular.module('jamstash.subsonic.ctrl', ['jamstash.subsonic.service'])
$scope.selectNone = function () {
$rootScope.selectNone($scope.song);
};
+ // TODO: Hyz: Replace
$scope.playAll = function () {
$rootScope.playAll($scope.song);
};
+ // TODO: Hyz: Replace
$scope.playFrom = function (index) {
$rootScope.playFrom(index, $scope.song);
};
+ // TODO: Hyz: Replace
$scope.removeSong = function (item) {
$rootScope.removeSong(item, $scope.song);
};
+ // TODO: Hyz: Replace
$scope.songsRemoveSelected = function () {
subsonic.songsRemoveSelected($scope.selectedSongs).then(function (data) {
$scope.album = data.album;
@@ -190,12 +194,70 @@ angular.module('jamstash.subsonic.ctrl', ['jamstash.subsonic.service'])
$scope.selectedPlaylist = data.selectedPlaylist;
});
};
+
+ /**
+ * Handles common actions with songs such as displaying them on the scope, adding them to the playing queue
+ * and playing the first song after adding them to the queue. Displays notifications for songs added to the playing queue
+ * Also handles error notifications in case of: a service error, a subsonic error or an HTTP error
+ * @param {Promise} promise a Promise that must be resolved with an array of songs or must be rejected with an object : {'reason': a message that can be displayed to a user, 'httpError': the HTTP error code, 'subsonicError': the error Object sent by Subsonic}
+ * @param {String} action the action to be taken with the songs. Must be 'add', 'play' or 'display'
+ * @return {Promise} the original promise passed in first param. That way we can chain it further !
+ */
+ $scope.requestSongs = function (promise, action) {
+ promise.then(function (songs) {
+ if(action === 'play') {
+ player.emptyQueue().addSongs(songs).playFirstSong();
+ notifications.updateMessage(songs.length + ' Song(s) Added to Queue', true);
+ } else if (action === 'add') {
+ player.addSongs(songs);
+ notifications.updateMessage(songs.length + ' Song(s) Added to Queue', true);
+ } else if (action === 'display') {
+ $scope.album = [];
+ $scope.song = songs;
+ }
+ }, function (error) {
+ var errorNotif;
+ if (error.subsonicError !== undefined) {
+ errorNotif = error.reason + ' ' + error.subsonicError.message;
+ } else if (error.httpError !== undefined) {
+ errorNotif = error.reason + ' HTTP error ' + error.httpError;
+ } else {
+ errorNotif = error.reason;
+ }
+ notifications.updateMessage(errorNotif, true);
+ });
+ return promise;
+ };
+
$scope.getSongs = function (id, action) {
subsonic.getSongs(id, action).then(function (data) {
$scope.album = data.album;
$scope.song = data.song;
});
};
+
+ $scope.getRandomStarredSongs = function (action) {
+ var promise = subsonic.getRandomStarredSongs();
+ $scope.requestSongs(promise, action);
+
+ $scope.selectedPlaylist = null;
+ $scope.selectedAutoPlaylist = 'starred';
+ };
+
+ $scope.getRandomSongs = function (action, genre, folder) {
+ var promise = subsonic.getRandomSongs(genre, folder);
+ $scope.requestSongs(promise, action);
+
+ $scope.selectedPlaylist = null;
+ if (!isNaN(folder)) {
+ $scope.selectedAutoPlaylist = folder;
+ } else if (genre !== undefined && genre !== '' && genre !== 'Random') {
+ $scope.selectedAutoPlaylist = genre;
+ } else {
+ $scope.selectedAutoPlaylist = 'random';
+ }
+ };
+
$scope.getArtistByTag = function (id) { // Gets Artist by ID3 tag
$scope.selectedAutoAlbum = null;
$scope.selectedArtist = id;
@@ -264,6 +326,7 @@ angular.module('jamstash.subsonic.ctrl', ['jamstash.subsonic.service'])
$scope.selectedPlaylist = data.selectedPlaylist;
});
};
+
$scope.getStarred = function (action, type) {
subsonic.getStarred(action, type).then(function (data) {
$scope.album = data.album;
@@ -272,45 +335,7 @@ angular.module('jamstash.subsonic.ctrl', ['jamstash.subsonic.service'])
$scope.selectedPlaylist = data.selectedPlaylist;
});
};
- $scope.getRandomStarredSongs = function (action) {
- subsonic.getRandomStarredSongs()
- .then(function (randomStarredSongs) {
- var mappedSongs = [];
- // Map regardless of the action
- for (var i = 0; i < randomStarredSongs.length; i++) {
- mappedSongs.push(map.mapSong(randomStarredSongs[i]));
- }
- if(action === 'play') {
- $rootScope.queue = [].concat(mappedSongs);
- notifications.updateMessage(mappedSongs.length + ' Song(s) Added to Queue', true);
- $rootScope.playSong(false, $rootScope.queue[0]);
- } else if (action === 'add') {
- $rootScope.queue = $rootScope.queue.concat(mappedSongs);
- notifications.updateMessage(mappedSongs.length + ' Song(s) Added to Queue', true);
- } else if (action === 'display') {
- $scope.album = [];
- $scope.song = mappedSongs;
- }
- }).catch(function (error) {
- var errorNotif;
- if (error.subsonicError !== undefined) {
- errorNotif = error.reason + ' ' + error.subsonicError.message;
- } else if (error.httpError !== undefined) {
- errorNotif = error.reason + ' HTTP error ' + error.httpError;
- } else {
- errorNotif = error.reason;
- }
- notifications.updateMessage(errorNotif, true);
- });
- };
- $rootScope.getRandomSongs = function (action, genre, folder) {
- subsonic.getRandomSongs(action, genre, folder).then(function (data) {
- $scope.album = data.album;
- $scope.song = data.song;
- $scope.selectedAutoPlaylist = data.selectedAutoPlaylist;
- $scope.selectedPlaylist = data.selectedPlaylist;
- });
- };
+
$scope.newPlaylist = function (data, event) {
subsonic.newPlaylist(data, event).then(function (data) {
$scope.getPlaylists(true);
@@ -448,6 +473,12 @@ angular.module('jamstash.subsonic.ctrl', ['jamstash.subsonic.service'])
end = ui.item.index();
$scope.song.splice(end, 0, $scope.song.splice(start, 1)[0]);
};
+ $scope.playSong = function (song) {
+ player.play(song);
+ };
+ $scope.addSongToQueue = function(song) {
+ player.addSong(song);
+ };
/* Launch on Startup */
$scope.getArtists();
diff --git a/app/subsonic/subsonic_test.js b/app/subsonic/subsonic_test.js
index ec2b78e..4691c2d 100644
--- a/app/subsonic/subsonic_test.js
+++ b/app/subsonic/subsonic_test.js
@@ -1,160 +1,237 @@
describe("Subsonic controller", function() {
- 'use strict';
+ 'use strict';
- var scope, $rootScope, subsonic, notifications, deferred;
+ var scope, $rootScope, subsonic, notifications, player,
+ deferred;
- beforeEach(function() {
- jasmine.addCustomEqualityTester(angular.equals);
+ beforeEach(function() {
+ jasmine.addCustomEqualityTester(angular.equals);
- module('jamstash.subsonic.ctrl');
+ module('jamstash.subsonic.controller', function ($provide) {
+ // Mock the player service
+ $provide.decorator('player', function($delegate) {
- inject(function ($controller, _$rootScope_, utils, globals, map, _subsonic_, _notifications_, $q) {
- $rootScope = _$rootScope_;
- scope = $rootScope.$new();
- subsonic = _subsonic_;
- notifications = _notifications_;
+ $delegate.queue = [];
+ $delegate.play = jasmine.createSpy("play");
+ $delegate.playFirstSong = jasmine.createSpy("playFirstSong");
+ return $delegate;
+ });
- // Mock the functions of the services and the rootscope
- deferred = $q.defer();
- spyOn(subsonic, 'getRandomStarredSongs').and.returnValue(deferred.promise);
- spyOn(map, 'mapSong').and.callFake(function (song) {
- return {id: song.id};
- });
- spyOn(notifications, 'updateMessage');
- $rootScope.playSong = jasmine.createSpy('playSong');
- $rootScope.queue = [];
+ $provide.decorator('subsonic', function($delegate, $q) {
+ deferred = $q.defer();
+ $delegate.getRandomStarredSongs = jasmine.createSpy("getRandomStarredSongs").and.returnValue(deferred.promise);
+ $delegate.getRandomSongs = jasmine.createSpy("getRandomSongs").and.returnValue(deferred.promise);
+ return $delegate;
+ });
- $controller('SubsonicCtrl', {
- $scope: scope,
- $rootScope: $rootScope,
- $routeParams: {},
- utils: utils,
- globals: globals,
- map: map,
- subsonic: subsonic,
- notifications: notifications
- });
- });
- });
+ $provide.decorator('notifications', function ($delegate) {
+ $delegate.updateMessage = jasmine.createSpy("updateMessage");
+ return $delegate;
+ });
+ });
- //TODO: JMA: It should be the exact same test when getting songs from an album. We aren't testing that it's randomized, that's the service's job.
- describe("getRandomStarred -", function() {
+ inject(function ($controller, _$rootScope_, utils, globals, map, _subsonic_, _notifications_, $q, _player_) {
+ $rootScope = _$rootScope_;
+ scope = $rootScope.$new();
+ subsonic = _subsonic_;
+ notifications = _notifications_;
+ player = _player_;
- describe("given that my library contains 3 starred songs, ", function() {
- var response = [
- {id:"2548"}, {id:"8986"}, {id:"2986"}
- ];
+ $controller('SubsonicController', {
+ $scope: scope,
+ $rootScope: $rootScope,
+ $routeParams: {},
+ utils: utils,
+ globals: globals,
+ map: map,
+ subsonic: subsonic,
+ notifications: notifications
+ });
+ });
+ });
- it("when displaying random starred songs, it sets the scope with the selected songs", function() {
- scope.getRandomStarredSongs('display');
- deferred.resolve(response);
- $rootScope.$apply();
+ describe("given that my library contains 3 songs, ", function() {
+ var response;
+ beforeEach(function() {
+ response = [
+ {id:"2548"}, {id:"8986"}, {id:"2986"}
+ ];
+ });
- expect(subsonic.getRandomStarredSongs).toHaveBeenCalled();
- expect(scope.song).toEqual([
- {id: "2548"}, {id: "8986"}, {id: "2986"}
- ]);
- });
+ describe("get songs -", function() {
+ beforeEach(function() {
+ spyOn(scope, "requestSongs");
+ });
- it("when adding random starred songs, it adds the selected songs to the queue and notifies the user", function() {
- scope.getRandomStarredSongs('add');
- deferred.resolve(response);
- $rootScope.$apply();
+ it("it can get random starred songs from the subsonic service", function() {
+ scope.getRandomStarredSongs('whatever action');
+ deferred.resolve(response);
- expect(subsonic.getRandomStarredSongs).toHaveBeenCalled();
- expect($rootScope.queue).toEqual([
- {id: "2548"}, {id: "8986"}, {id: "2986"}
- ]);
- expect(notifications.updateMessage).toHaveBeenCalledWith('3 Song(s) Added to Queue', true);
- });
+ expect(subsonic.getRandomStarredSongs).toHaveBeenCalled();
+ expect(scope.requestSongs).toHaveBeenCalledWith(deferred.promise, 'whatever action');
+ expect(scope.selectedPlaylist).toBeNull();
+ expect(scope.selectedAutoPlaylist).toBe('starred');
+ });
- it("when playing random starred songs, it plays the first selected song, empties the queue and fills it with the selected songs, and notifies the user", function() {
- $rootScope.queue = [{id: "7666"}];
+ it("it can get random songs from all folders or genres from the subsonic service", function() {
+ scope.getRandomSongs('whatever action');
+ deferred.resolve(response);
- scope.getRandomStarredSongs('play');
- deferred.resolve(response);
- $rootScope.$apply();
+ expect(subsonic.getRandomSongs).toHaveBeenCalled();
+ expect(scope.requestSongs).toHaveBeenCalledWith(deferred.promise, 'whatever action');
+ expect(scope.selectedPlaylist).toBeNull();
+ expect(scope.selectedAutoPlaylist).toBe('random');
+ });
- expect(subsonic.getRandomStarredSongs).toHaveBeenCalled();
- expect($rootScope.playSong).toHaveBeenCalledWith(false, {id: "2548"});
- expect($rootScope.queue).toEqual([
- {id: "2548"}, {id: "8986"}, {id: "2986"}
- ]);
- expect(notifications.updateMessage).toHaveBeenCalledWith('3 Song(s) Added to Queue', true);
- });
+ it("it can get random songs from a given genre from the subsonic service", function() {
+ scope.getRandomSongs('whatever action', 'Rock');
+ deferred.resolve(response);
- });
+ expect(subsonic.getRandomSongs).toHaveBeenCalledWith('Rock', undefined);
+ expect(scope.requestSongs).toHaveBeenCalledWith(deferred.promise, 'whatever action');
+ expect(scope.selectedPlaylist).toBeNull();
+ expect(scope.selectedAutoPlaylist).toBe('Rock');
+ });
- it("given that I don't have any starred song in my library, when getting random starred songs, it notifies the user with an error message, does not play a song and does not touch the queue", function() {
- $rootScope.queue = [{id: "7666"}];
+ it("it can get random songs from a given folder id from the subsonic service", function() {
+ scope.getRandomSongs('whatever action', '', 1);
+ deferred.resolve(response);
- scope.getRandomStarredSongs('whatever action');
- deferred.reject({reason: 'No starred songs found on the Subsonic server.'});
- $rootScope.$apply();
+ expect(subsonic.getRandomSongs).toHaveBeenCalledWith('', 1);
+ expect(scope.requestSongs).toHaveBeenCalledWith(deferred.promise, 'whatever action');
+ expect(scope.selectedPlaylist).toBeNull();
+ expect(scope.selectedAutoPlaylist).toBe(1);
+ });
+ });
- expect(subsonic.getRandomStarredSongs).toHaveBeenCalled();
- expect($rootScope.playSong).not.toHaveBeenCalled();
- expect($rootScope.queue).toEqual([{id: "7666"}]);
- expect(notifications.updateMessage).toHaveBeenCalledWith('No starred songs found on the Subsonic server.', true);
- });
+ describe("requestSongs -", function() {
+ it("when I display songs, it sets the scope with the selected songs", function() {
+ scope.requestSongs(deferred.promise, 'display');
+ deferred.resolve(response);
+ scope.$apply();
- it("given that the Subsonic server returns an error, when getting random starred songs, it notifies the user with the error message", function() {
- scope.getRandomStarredSongs('whatever action');
- deferred.reject({reason: 'Error when contacting the Subsonic server.',
- subsonicError: {code: 10, message:'Required parameter is missing.'}
- });
- $rootScope.$apply();
+ expect(scope.song).toEqual([
+ {id: "2548"}, {id: "8986"}, {id: "2986"}
+ ]);
+ });
- expect(subsonic.getRandomStarredSongs).toHaveBeenCalled();
- expect(notifications.updateMessage).toHaveBeenCalledWith('Error when contacting the Subsonic server. Required parameter is missing.', true);
- });
+ it("when I add songs, it adds the selected songs to the playing queue and notifies the user", function() {
+ scope.requestSongs(deferred.promise, 'add');
+ deferred.resolve(response);
+ scope.$apply();
- it("given that the Subsonic server is unreachable, when getting random starred songs, it notifies the user with the HTTP error code", function() {
- scope.getRandomStarredSongs('whatever action');
- deferred.reject({reason: 'Error when contacting the Subsonic server.',
- httpError: 404
- });
- $rootScope.$apply();
+ expect(player.queue).toEqual([
+ {id: "2548"}, {id: "8986"}, {id: "2986"}
+ ]);
+ expect(notifications.updateMessage).toHaveBeenCalledWith('3 Song(s) Added to Queue', true);
+ });
- expect(subsonic.getRandomStarredSongs).toHaveBeenCalled();
- expect(notifications.updateMessage).toHaveBeenCalledWith('Error when contacting the Subsonic server. HTTP error 404', true);
- });
- });
+ it("when I play songs, it plays the first selected song, empties the queue and fills it with the selected songs and it notifies the user", function() {
+ player.queue = [{id: "7666"}];
- describe("reorders playlists by drag and drop - ", function() {
- var mockUI;
- beforeEach(function() {
- scope.song = [{id: "1084"}, {id: "6810"}, {id: "214"}];
- mockUI = {
- item: {}
- };
- });
+ scope.requestSongs(deferred.promise, 'play');
+ deferred.resolve(response);
+ scope.$apply();
- it("given a song in a list of songs, when I start dragging it, it records what its starting position in the list was", function() {
- mockUI.item.index = jasmine.createSpy('index').and.returnValue('1');
- mockUI.item.data = jasmine.createSpy('data');
+ expect(player.playFirstSong).toHaveBeenCalled();
+ expect(player.queue).toEqual([
+ {id: "2548"}, {id: "8986"}, {id: "2986"}
+ ]);
+ expect(notifications.updateMessage).toHaveBeenCalledWith('3 Song(s) Added to Queue', true);
+ });
- scope.dragStart({}, mockUI);
+ it("when I request songs, it returns a promise so that I can chain it further", function() {
+ var success = jasmine.createSpy("success");
- expect(mockUI.item.index).toHaveBeenCalled();
- expect(mockUI.item.data).toHaveBeenCalledWith('start', '1');
- });
+ scope.requestSongs(deferred.promise, 'whatever action').then(success);
+ deferred.resolve(response);
+ scope.$apply();
- it("given a song in a list of songs that I started dragging, when I drop it, its position in the list of songs has changed", function() {
- mockUI.item.index = jasmine.createSpy('index').and.returnValue('0');
- mockUI.item.data = jasmine.createSpy('data').and.returnValue('1');
+ expect(success).toHaveBeenCalled();
+ });
- scope.dragEnd({}, mockUI);
+ it("given that I don't have any song in my library, when I request songs, it notifies the user with an error message, does not play a song and does not change the queue", function() {
+ player.queue = [{id: "7666"}];
- expect(mockUI.item.index).toHaveBeenCalled();
- expect(mockUI.item.data).toHaveBeenCalledWith('start');
- // The second song should now be first
- expect(scope.song).toEqual([
- {id: "6810"}, {id: "1084"}, {id: "214"}
- ]);
- });
- });
+ scope.requestSongs(deferred.promise, 'whatever action');
+ deferred.reject({reason: 'No songs found on the Subsonic server.'});
+ scope.$apply();
- //TODO: JMA: all starred
-});
\ No newline at end of file
+ expect(player.playFirstSong).not.toHaveBeenCalled();
+ expect(player.queue).toEqual([{id: "7666"}]);
+ expect(notifications.updateMessage).toHaveBeenCalledWith('No songs found on the Subsonic server.', true);
+ });
+
+ it("given that the Subsonic server returns an error, when I request songs, it notifies the user with the error message", function() {
+ scope.requestSongs(deferred.promise, 'whatever action');
+ deferred.reject({reason: 'Error when contacting the Subsonic server.',
+ subsonicError: {code: 10, message:'Required parameter is missing.'}
+ });
+ scope.$apply();
+
+ expect(notifications.updateMessage).toHaveBeenCalledWith('Error when contacting the Subsonic server. Required parameter is missing.', true);
+ });
+
+ it("given that the Subsonic server is unreachable, when I request songs, it notifies the user with the HTTP error code", function() {
+ scope.requestSongs(deferred.promise, 'whatever action');
+ deferred.reject({reason: 'Error when contacting the Subsonic server.',
+ httpError: 404
+ });
+ scope.$apply();
+
+ expect(notifications.updateMessage).toHaveBeenCalledWith('Error when contacting the Subsonic server. HTTP error 404', true);
+ });
+ });
+ });
+
+ describe("reorders playlists by drag and drop - ", function() {
+ var mockUI;
+ beforeEach(function() {
+ scope.song = [
+ {id: 1084},
+ {id: 6810},
+ {id: 214}
+ ];
+ mockUI = {
+ item: {}
+ };
+ });
+
+ it("given a song in a list of songs, when I start dragging it, it records what its starting position in the list was", function() {
+ mockUI.item.index = jasmine.createSpy('index').and.returnValue('1');
+ mockUI.item.data = jasmine.createSpy('data');
+
+ scope.dragStart({}, mockUI);
+
+ expect(mockUI.item.index).toHaveBeenCalled();
+ expect(mockUI.item.data).toHaveBeenCalledWith('start', '1');
+ });
+
+ it("given a song in a list of songs that I started dragging, when I drop it, its position in the list of songs has changed", function() {
+ mockUI.item.index = jasmine.createSpy('index').and.returnValue('0');
+ mockUI.item.data = jasmine.createSpy('data').and.returnValue('1');
+
+ scope.dragEnd({}, mockUI);
+
+ expect(mockUI.item.index).toHaveBeenCalled();
+ expect(mockUI.item.data).toHaveBeenCalledWith('start');
+ // The second song should now be first
+ expect(scope.song).toEqual([
+ {id: 6810},
+ {id: 1084},
+ {id: 214}
+ ]);
+ });
+ });
+
+ it("When I call playSong, it calls play in the player service", function() {
+ var fakeSong = {"id": 3572};
+
+ scope.playSong(fakeSong);
+
+ expect(player.play).toHaveBeenCalledWith(fakeSong);
+ });
+
+ //TODO: JMA: all starred
+});
diff --git a/bower.json b/bower.json
index 4601985..95c9223 100644
--- a/bower.json
+++ b/bower.json
@@ -1,6 +1,6 @@
{
"name": "jamstash",
- "version": "4.3",
+ "version": "4.4.0",
"description": "HTML5 Audio Streamer for Subsonic, Archive.org browsing and streaming",
"authors": [
"tsquillario (https://github.com/tsquillario)",
@@ -31,14 +31,15 @@
"angular-sanitize": "~1.2.0",
"angular-cookies": "~1.2.0",
"angular-resource": "~1.2.0",
- "jquery": "~2.0.3",
- "jquery-ui": "~1.10.3",
- "jplayer": "~2.8.4",
+ "jquery": "~2.0.0",
+ "jquery-ui": "~1.10.0",
+ "jplayer": "~2.9.0",
"fancybox": "~2.1.4",
"notify.js": "<=1.2.2",
"jquery.scrollTo": "~1.4.5",
"underscore": "~1.7.0",
- "angular-underscore": "~0.5.0"
+ "angular-underscore": "~0.5.0",
+ "angular-locker": "~1.0.2"
},
"overrides": {
"fancybox": {
@@ -50,7 +51,8 @@
},
"devDependencies": {
"angular-mocks": "~1.2.0",
- "jasmine-promise-matchers": "~0.0.3"
+ "jasmine-promise-matchers": "~0.0.3",
+ "jasmine-fixture": "~1.2.2"
},
"ignore": [
"bower_components",
@@ -58,4 +60,4 @@
],
"private": true,
"appPath": "app"
-}
\ No newline at end of file
+}
diff --git a/karma.conf.js b/karma.conf.js
index 85c3f11..9ce4127 100644
--- a/karma.conf.js
+++ b/karma.conf.js
@@ -32,8 +32,10 @@ module.exports = function(config) {
'bower_components/jquery.scrollTo/jquery.scrollTo.js',
'bower_components/underscore/underscore.js',
'bower_components/angular-underscore/angular-underscore.js',
+ 'bower_components/angular-locker/dist/angular-locker.min.js',
'bower_components/angular-mocks/angular-mocks.js',
'bower_components/jasmine-promise-matchers/dist/jasmine-promise-matchers.js',
+ 'bower_components/jasmine-fixture/dist/jasmine-fixture.js',
// endbower
'app/**/*.js',
'app/**/*_test.js'
diff --git a/manifest.json b/manifest.json
index 6e2f9de..33b1724 100644
--- a/manifest.json
+++ b/manifest.json
@@ -2,7 +2,7 @@
"manifest_version": 2,
"name": "Jamstash",
"description": "HTML5 Player for Subsonic & Archive.org",
- "version": "4.2.3",
+ "version": "4.4.0",
"app": {
"launch": {
"web_url": "http://jamstash.com"
diff --git a/package.json b/package.json
index 98e7dd6..b2ed8a6 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
{
"name": "jamstash",
- "version": "4.3",
+ "version": "4.4.0",
"description": "HTML5 Audio Streamer for Subsonic, Archive.org browsing and streaming",
"author": "Trevor Squillario (https://github.com/tsquillario)",
"contributors": [
+ 
+ 