Fixing linting and test cases

MeoMix · May 21, 2015 · db7cbd9 · db7cbd9
1 parent 6400f55
commit db7cbd9
Show file tree

Hide file tree

Showing 11 changed files with 35 additions and 11 deletions.
diff --git a/src/js/background/model/signInManager.js b/src/js/background/model/signInManager.js
@@ -24,7 +24,7 @@
         initialize: function() {
             this.on('change:signedInUser', this._onChangeSignedInUser);
             this.on('change:signInFailed', this._onChangeSignInFailed);
-            //this.listenTo(Streamus.channels.backgroundArea.vent, 'rendered', this._onBackgroundAreaRendered);
+            this.listenTo(Streamus.channels.backgroundArea.vent, 'rendered', this._onBackgroundAreaRendered);
             chrome.runtime.onMessage.addListener(this._onChromeRuntimeMessage.bind(this));
             chrome.runtime.onMessageExternal.addListener(this._onChromeRuntimeMessageExternal.bind(this));
             chrome.identity.onSignInChanged.addListener(this._onChromeIdentitySignInChanged.bind(this));

diff --git a/src/js/foreground/view/behavior/sortable.js b/src/js/foreground/view/behavior/sortable.js
@@ -163,7 +163,7 @@
                     index: placeholderIndex + response.minRenderIndex
                 });
 
-                //  The collection does not resort because the model's index was provided when calling addSongs 
+                //  The collection does not resort because the model's index was provided when calling addSongs
                 //  The CollectionView rendering the model is now incorrect because the collection's index does not correspond to the CollectionView's index.
                 //  Simply triggering a sort is the simplest solution as it forces the CollectionView to re-render its children.
                 this.view.collection.sort();

diff --git a/src/js/test/foreground/view/listItemButton/addPlaylistButtonView.spec.js b/src/js/test/foreground/view/listItemButton/addPlaylistButtonView.spec.js
@@ -4,13 +4,15 @@
     var AddPlaylistButtonView = require('foreground/view/listItemButton/addPlaylistButtonView');
     var Playlist = require('background/model/playlist');
     var StreamItems = require('background/collection/streamItems');
+    var ListItemButton = require('foreground/model/listItemButton/listItemButton');
     var viewTestUtility = require('test/foreground/view/viewTestUtility');
 
     describe('AddPlaylistButtonView', function() {
         beforeEach(function() {
             this.documentFragment = document.createDocumentFragment();
             this.view = new AddPlaylistButtonView({
-                model: new Playlist(),
+                model: new ListItemButton(),
+                playlist: new Playlist(),
                 streamItems: new StreamItems()
             });
         });

diff --git a/src/js/test/foreground/view/listItemButton/addSongButtonView.spec.js b/src/js/test/foreground/view/listItemButton/addSongButtonView.spec.js
@@ -4,13 +4,15 @@
     var AddSongButtonView = require('foreground/view/listItemButton/addSongButtonView');
     var Song = require('background/model/song');
     var StreamItems = require('background/collection/streamItems');
+    var ListItemButton = require('foreground/model/listItemButton/listItemButton');
     var viewTestUtility = require('test/foreground/view/viewTestUtility');
 
     describe('AddSongButtonView', function() {
         beforeEach(function() {
             this.documentFragment = document.createDocumentFragment();
             this.view = new AddSongButtonView({
-                model: new Song(),
+                model: new ListItemButton(),
+                song: new Song(),
                 streamItems: new StreamItems()
             });
         });

diff --git a/src/js/test/foreground/view/listItemButton/deleteListItemButtonView.spec.js b/src/js/test/foreground/view/listItemButton/deleteListItemButtonView.spec.js
@@ -3,13 +3,15 @@
 
     var DeleteListItemButtonView = require('foreground/view/listItemButton/deleteListItemButtonView');
     var PlaylistItem = require('background/model/playlistItem');
+    var ListItemButton = require('foreground/model/listItemButton/listItemButton');
     var viewTestUtility = require('test/foreground/view/viewTestUtility');
 
     describe('DeleteListItemButtonView', function() {
         beforeEach(function() {
             this.documentFragment = document.createDocumentFragment();
             this.view = new DeleteListItemButtonView({
-                model: new PlaylistItem()
+                model: new ListItemButton(),
+                playlistItem: new PlaylistItem()
             });
         });
 

diff --git a/src/js/test/foreground/view/listItemButton/deletePlaylistButtonView.spec.js b/src/js/test/foreground/view/listItemButton/deletePlaylistButtonView.spec.js
@@ -3,13 +3,15 @@
 
     var DeletePlaylistButtonView = require('foreground/view/listItemButton/deletePlaylistButtonView');
     var Playlist = require('background/model/playlist');
+    var ListItemButton = require('foreground/model/listItemButton/listItemButton');
     var viewTestUtility = require('test/foreground/view/viewTestUtility');
 
     describe('DeletePlaylistButtonView', function() {
         beforeEach(function() {
             this.documentFragment = document.createDocumentFragment();
             this.view = new DeletePlaylistButtonView({
-                model: new Playlist()
+                model: new ListItemButton(),
+                playlist: new Playlist()
             });
         });
 

diff --git a/src/js/test/foreground/view/listItemButton/playPauseSongButtonView.spec.js b/src/js/test/foreground/view/listItemButton/playPauseSongButtonView.spec.js
@@ -4,6 +4,7 @@
     var PlayPauseSongButtonView = require('foreground/view/listItemButton/playPauseSongButtonView');
     var StreamItems = require('background/collection/streamItems');
     var Player = require('background/model/player');
+    var ListItemButton = require('foreground/model/listItemButton/listItemButton');
     var Settings = require('background/model/settings');
     var YouTubePlayer = require('background/model/youTubePlayer');
     var Song = require('background/model/song');
@@ -13,7 +14,8 @@
         beforeEach(function() {
             this.documentFragment = document.createDocumentFragment();
             this.view = new PlayPauseSongButtonView({
-                model: new Song(),
+                model: new ListItemButton(),
+                song: new Song(),
                 streamItems: new StreamItems(),
                 player: new Player({
                     settings: new Settings(),

diff --git a/src/js/test/foreground/view/listItemButton/playPlaylistButtonView.spec.js b/src/js/test/foreground/view/listItemButton/playPlaylistButtonView.spec.js
@@ -3,14 +3,16 @@
 
     var PlayPlaylistButtonView = require('foreground/view/listItemButton/playPlaylistButtonView');
     var Playlist = require('background/model/playlist');
+    var ListItemButton = require('foreground/model/listItemButton/listItemButton');
     var StreamItems = require('background/collection/streamItems');
     var viewTestUtility = require('test/foreground/view/viewTestUtility');
 
     describe('PlayPlaylistButtonView', function() {
         beforeEach(function() {
             this.documentFragment = document.createDocumentFragment();
             this.view = new PlayPlaylistButtonView({
-                model: new Playlist(),
+                model: new ListItemButton(),
+                playlist: new Playlist(),
                 streamItems: new StreamItems()
             });
         });

diff --git a/src/js/test/foreground/view/listItemButton/playlistOptionsButtonView.spec.js b/src/js/test/foreground/view/listItemButton/playlistOptionsButtonView.spec.js
@@ -2,12 +2,17 @@
     'use strict';
 
     var PlaylistOptionsButtonView = require('foreground/view/listItemButton/playlistOptionsButtonView');
+    var ListItemButton = require('foreground/model/listItemButton/listItemButton');
+    var Playlist = require('background/model/playlist');
     var viewTestUtility = require('test/foreground/view/viewTestUtility');
 
     describe('PlaylistOptionsButtonView', function() {
         beforeEach(function() {
             this.documentFragment = document.createDocumentFragment();
-            this.view = new PlaylistOptionsButtonView();
+            this.view = new PlaylistOptionsButtonView({
+                model: new ListItemButton(),
+                playlist: new Playlist()
+            });
         });
 
         afterEach(function() {

diff --git a/src/js/test/foreground/view/listItemButton/saveSongButtonView.spec.js b/src/js/test/foreground/view/listItemButton/saveSongButtonView.spec.js
@@ -4,13 +4,15 @@
     var SaveSongButtonView = require('foreground/view/listItemButton/saveSongButtonView');
     var Song = require('background/model/song');
     var SignInManager = require('background/model/signInManager');
+    var ListItemButton = require('foreground/model/listItemButton/listItemButton');
     var viewTestUtility = require('test/foreground/view/viewTestUtility');
 
     describe('SaveSongButtonView', function() {
         beforeEach(function() {
             this.documentFragment = document.createDocumentFragment();
             this.view = new SaveSongButtonView({
-                model: new Song(),
+                model: new ListItemButton(),
+                song: new Song(),
                 signInManager: new SignInManager()
             });
         });

diff --git a/src/js/test/foreground/view/listItemButton/songOptionsButtonView.spec.js b/src/js/test/foreground/view/listItemButton/songOptionsButtonView.spec.js
@@ -2,12 +2,17 @@
     'use strict';
 
     var SongOptionsButtonView = require('foreground/view/listItemButton/songOptionsButtonView');
+    var ListItemButton = require('foreground/model/listItemButton/listItemButton');
+    var Song = require('background/model/song');
     var viewTestUtility = require('test/foreground/view/viewTestUtility');
 
     describe('SongOptionsButtonView', function() {
         beforeEach(function() {
             this.documentFragment = document.createDocumentFragment();
-            this.view = new SongOptionsButtonView();
+            this.view = new SongOptionsButtonView({
+                model: new ListItemButton(),
+                song: new Song()
+            });
         });
 
         afterEach(function() {