* VRFS-3347 - disable metronome in master mix view (still can't get helpbubble to show), update password of google account

This commit is contained in:
Seth Call 2015-07-20 11:38:04 -05:00
parent e53af19dc6
commit 2171f06685
8 changed files with 20 additions and 5 deletions

View File

@ -17,7 +17,8 @@ describe 'Musician Search Model' do
describe "creates search obj" do
before(:all) do
User.delete_all
Score.delete_all
Score.connection.execute('delete from current_network_scores').check
Score.connection.execute('delete from scores').check
end
it "associates to user" do

View File

@ -1,6 +1,7 @@
context = window
logger = context.JK.logger
MixerActions = @MixerActions
MIX_MODES = context.JK.MIX_MODES
@SessionMetronome = React.createClass({
@ -31,6 +32,7 @@ MixerActions = @MixerActions
componentClasses = classNames({
"session-track" : true
"metronome" : true
"no-mixer" : @props.mode == MIX_MODES.MASTER # show it as disabled if in master mode
})
pan = if mixers.mixer? then mixers.mixer?.pan else 0
@ -41,6 +43,7 @@ MixerActions = @MixerActions
}
`<div className={componentClasses}>
<div className="disabled-track-overlay" />
<div className="session-track-contents">
<div className="name">Metronome</div>
<div className="track-controls">
@ -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',

View File

@ -67,6 +67,7 @@
width: 100%;
height: 100%;
opacity:0.5;
z-index:1;
}
}

View File

@ -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.

View File

@ -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

View File

@ -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)

View File

@ -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

View File

@ -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)