diff --git a/ruby/lib/jam_ruby/models/recording.rb b/ruby/lib/jam_ruby/models/recording.rb index 926144983..25bd1628c 100644 --- a/ruby/lib/jam_ruby/models/recording.rb +++ b/ruby/lib/jam_ruby/models/recording.rb @@ -33,7 +33,7 @@ module JamRuby dependent: :destroy validate :not_already_recording, :on => :create - validate :not_still_finalizing_previous, :on => :create + #validate :not_still_finalizing_previous, :on => :create validate :not_playback_recording, :on => :create validate :already_stopped_recording validate :only_one_mix diff --git a/ruby/spec/jam_ruby/models/recording_spec.rb b/ruby/spec/jam_ruby/models/recording_spec.rb index 5c9696f51..a68c16f8b 100644 --- a/ruby/spec/jam_ruby/models/recording_spec.rb +++ b/ruby/spec/jam_ruby/models/recording_spec.rb @@ -533,7 +533,11 @@ describe Recording do @user.first_recording_at.should_not be_nil end - describe "chance for everyone to keep or discard" do + #NOTE: change in recording flow. Now after stopping the recording we no longer ask + #user to save or discard the recording, instead the app saves the recording to user's + #computer and opens the file explorer to that folder. + #therefore following scenario is no longer valid; hence skipping it. + xdescribe "chance for everyone to keep or discard" do before(:each) do @user2 = FactoryGirl.create(:user) @connection2 = FactoryGirl.create(:connection, :user => @user2, :music_session => @music_session) diff --git a/web/app/assets/javascripts/react-components/PopupRecordingStartStop.js.jsx.coffee b/web/app/assets/javascripts/react-components/PopupRecordingStartStop.js.jsx.coffee index 568455641..350c4e939 100644 --- a/web/app/assets/javascripts/react-components/PopupRecordingStartStop.js.jsx.coffee +++ b/web/app/assets/javascripts/react-components/PopupRecordingStartStop.js.jsx.coffee @@ -57,7 +57,7 @@ if accessOpener $root.find('#recording-input-audio').iCheck('check').attr('checked', true) onMixersChanged: (mixers) -> - this.setState(chatMixer: mixers.chatMixer) + this.setState(chatMixer: mixers.chatMixer) onRecordingStateChanged: (recordingState) -> if @unloaded