Metronome
@@ -64,6 +67,9 @@ MixerActions = @MixerActions
$mute = $root.find('.track-icon-mute')
$pan = $root.find('.track-icon-pan')
+ if @props.mode == MIX_MODES.MASTER
+ context.JK.helpBubble($root.find('.disabled-track-overlay'), 'master-metronome-notice')
+
context.JK.interactReactBubble(
$mute,
'SessionTrackVolumeHover',
diff --git a/web/app/assets/stylesheets/client/react-components/SessionTrack.css.scss b/web/app/assets/stylesheets/client/react-components/SessionTrack.css.scss
index 98ea20ae8..53892d87a 100644
--- a/web/app/assets/stylesheets/client/react-components/SessionTrack.css.scss
+++ b/web/app/assets/stylesheets/client/react-components/SessionTrack.css.scss
@@ -67,6 +67,7 @@
width: 100%;
height: 100%;
opacity:0.5;
+ z-index:1;
}
}
diff --git a/web/app/views/clients/_help.html.slim b/web/app/views/clients/_help.html.slim
index c9d01e4ff..45a34d785 100644
--- a/web/app/views/clients/_help.html.slim
+++ b/web/app/views/clients/_help.html.slim
@@ -310,3 +310,7 @@ script type="text/template" id="template-help-jamtrack-browse-master-mix"
script type="text/template" id="template-help-jamtrack-browse-cta"
.jamtrack-browse-cta.big-help
p Click to select your first free JamTrack!
+
+script type="text/template" id="template-help-master-metronome-notice"
+ .master-metronome-notice
+ p The metronome does not produce any sound in the master mix.
\ No newline at end of file
diff --git a/web/spec/features/find_sessions_spec.rb b/web/spec/features/find_sessions_spec.rb
index 56466f6ab..c6de9a4b6 100644
--- a/web/spec/features/find_sessions_spec.rb
+++ b/web/spec/features/find_sessions_spec.rb
@@ -25,6 +25,9 @@ describe "Find Session", :js => true, :type => :feature, :capybara_feature => tr
RsvpSlot.delete_all
Invitation.delete_all
MusicSession.delete_all
+ Score.delete_all
+ User.delete_all
+ Score.connection.execute('delete from current_network_scores').check
end
describe "basic" do
diff --git a/web/spec/features/oauth_spec.rb b/web/spec/features/oauth_spec.rb
index a24e6cfae..0ea9ac967 100644
--- a/web/spec/features/oauth_spec.rb
+++ b/web/spec/features/oauth_spec.rb
@@ -40,7 +40,7 @@ describe "OAuth", :slow=>true, :js=>true, :type=>:feature, :capybara_feature=>tr
end
it "client should authorize a google user" do
- authorize_google_user(@youtube_client, @user, "stinkyblueberryjam")
+ authorize_google_user(@youtube_client, @user, "filthyblueberryjam")
save_screenshot("working.png")
@user.reload
@user.user_authorizations.count.should eq(1)
diff --git a/web/spec/features/youtube_spec.rb b/web/spec/features/youtube_spec.rb
index 1fe81bf06..8ed7d8a4d 100644
--- a/web/spec/features/youtube_spec.rb
+++ b/web/spec/features/youtube_spec.rb
@@ -13,7 +13,7 @@ describe "YouTube", :slow=>true, :js=>true, :type => :feature, :capybara_feature
Capybara.run_server = false
@user=FactoryGirl.create(:user, :email => "jamkazamtest@gmail.com")
@youtube_client = GoogleClient.new()
- authorize_google_user(@youtube_client, @user, "stinkyblueberryjam")
+ authorize_google_user(@youtube_client, @user, "filthyblueberryjam")
google_auth = UserAuthorization.google_auth(@user).first # Consider returning this from above now that it is reliable
end
diff --git a/web/spec/support/utilities.rb b/web/spec/support/utilities.rb
index 7db351dda..4bc1f1ba5 100644
--- a/web/spec/support/utilities.rb
+++ b/web/spec/support/utilities.rb
@@ -88,7 +88,7 @@ def authorize_google_user(youtube_client, user, google_password)
end
url = youtube_client.get_login_url(user.email)
- #puts("Login URL: #{url}")
+ puts("Login URL: #{url}")
visit url
sleep(1)