* fix metronome personal/master bug; try to fix intermittent fail

ruby/spec/jam_ruby/models/musician_search_spec.rb

@@ -237,7 +237,7 @@ describe 'Musician Search Model' do
       results = search.do_search
       expect(results[0].id).to eq(@user1.id)
       expect(results[1].id).to eq(@user2.id)
-      expect(results[2].id).to eq(@user3.id)
+      expect(results[2].id).to eq(@user3.id) # HAS FAILED INTERMITTENTLY
       expect(results[3].id).to eq(@user4.id)
     end
 

web/Gemfile

@@ -98,6 +98,9 @@ source 'https://rails-assets.org' do
   gem 'rails-assets-classnames'
 end
 
+group :development, :production do
+  gem 'rack-timeout'
+end
 group :development, :test do
   gem 'rspec-rails', '2.14.2'
   gem "activerecord-import", "~> 0.4.1"

web/app/assets/javascripts/playbackControls.js

@@ -152,7 +152,6 @@
         }
 
         $playButton.on('click', function(e) {
-          console.log("CLICKED PLAY")
           startPlay();
           return false;
         });

web/app/assets/javascripts/react-components/SessionMetronome.js.jsx.coffee

@@ -4,17 +4,19 @@ MixerActions = @MixerActions
 
 @SessionMetronome = React.createClass({
 
+  mixins: [@MasterPersonalMixersMixin]
+
   handleMute: (e) ->
     e.preventDefault()
 
     muting = $(e.currentTarget).is('.enabled')
 
-    MixerActions.mute([this.props.mixers.mixer], muting)
+    MixerActions.mute([@mixer()], muting)
 
   render: () ->
 
     # today, all mixers are the same for a remote participant; so just grab the 1st
-    mixers = @props.mixers
+    mixers = @mixers()
 
     muteMixer = mixers.muteMixer
     vuMixer = mixers.vuMixer
@@ -66,7 +68,7 @@ MixerActions = @MixerActions
       $mute,
       'SessionTrackVolumeHover',
       () =>
-        {mixers:@props.mixers}
+        {mixers:@mixers()}
       ,
       {width:235, positions:['right', 'left'], offsetParent:$root.closest('.top-parent')})
 
@@ -74,7 +76,7 @@ MixerActions = @MixerActions
       $pan,
       'SessionTrackPanHover',
       () =>
-        {mixers:@props.mixers}
+        {mixers:@mixers()}
       ,
       {width:331, positions:['right', 'left'], offsetParent:$root.closest('.top-parent')})
 

web/app/assets/javascripts/react-components/helpers/MixerHelper.js.coffee

@@ -398,19 +398,16 @@ MIX_MODES = context.JK.MIX_MODES;
     recordedTracks
 
   resolveMetronome: () ->
-    metronome = null
 
-    return metronome if @metronomeTrackMixers.length == 0
+    return null if @metronomeTrackMixers.length == 0
 
     mixer = @metronomeTrackMixers[0]
 
     instrumentIcon = "/assets/content/icon_metronome.png"
 
-    oppositeMixer  = @getMixerByResourceId(mixer.rid, MIX_MODES.PERSONAL);
-
     metronome =
       instrumentIcon: instrumentIcon
-      mixers:  {mixer: mixer, oppositeMixer: oppositeMixer, vuMixer: mixer, muteMixer: mixer}
+      mixers:  @mediaMixers(mixer, true)
 
     metronome
 

web/spec/features/session_detail_spec.rb

@@ -16,6 +16,7 @@ describe "Session Detail", :js => true, :type => :feature, :capybara_feature =>
     RsvpSlot.delete_all
     Invitation.delete_all
     MusicSession.delete_all
+    User.delete_all
 
     stub_const("APP_CONFIG", web_config)
   end