seth
/
jam-cloud
mirror of https://bitbucket.org/jamkazam/jam-cloud.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

* test fixes

This commit is contained in:
Seth Call 2015-07-19 09:57:40 -05:00
parent 35e07c3d7f
commit f6d54a57f5
4 changed files with 15 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ruby/spec/jam_ruby/models/band_filter_search_spec.rb
View File

@ -3,6 +3,7 @@ require 'spec_helper'
describe 'Band search' do
before(:all) do
Recording.delete_all
Band.delete_all
end

12
web/app/views/clients/_account_profile_interests.html.erb
View File

@ -52,14 +52,14 @@
<div class="clearall"></div>
<div>
<div class="left interest-options">
<div class="left interest-options traditional-band">
<label>I would like to join a traditional band <a class="help" help-topic="profile-interests-traditional-band">[?]</a></label>
<div class="yes-no-options">
<div class="option">
<div class="option yes-option">
<input type="radio" name="traditional_band" id="traditional-band-yes" class="dependent-master" value="true" />
<label for="traditional-band-yes">Yes</label>
</div>
<div class="option">
<div class="option no-option">
<input type="radio" name="traditional_band" id="traditional-band-no" class="dependent-master" value="false" />
<label for="traditional-band-no">No</label>
</div>
@ -92,14 +92,14 @@
<div class="clearall"></div>
<div>
<div class="left interest-options">
<div class="left interest-options paid-sessions">
<label>I am available to play in paid sessions <a class="help" help-topic="profile-interests-paid-sessions">[?]</a></label>
<div class="yes-no-options">
<div class="option">
<div class="option yes-option">
<input type="radio" name="paid_sessions" id="paid-sessions-yes" class="dependent-master" value="true" />
<label for="paid-sessions-yes">Yes</label>
</div>
<div class="option">
<div class="option no-option">
<input type="radio" name="paid_sessions" id="paid-sessions-no" class="dependent-master" value="false" />
<label for="paid-sessions-no">No</label>
</div>

4
web/lib/google_client.rb
View File

@ -328,7 +328,11 @@ module JamRuby
self.socket.print response
self.socket.close
socket=nil
else
puts "WHY WOULD THIS EVER HAPPEN?"
raise "WHY WOULD THIS EVER HAPPEN?"
end
}
end

6
web/spec/features/account_spec.rb
View File

@ -4,7 +4,7 @@ describe "Account", :js => true, :type => :feature, :capybara_feature => true do
subject { page }
let(:user) { FactoryGirl.create(:user) }
let(:user) { FactoryGirl.create(:user, traditional_band: true,paid_sessions: true, paid_sessions_hourly_rate: 1, paid_sessions_daily_rate:1 ) }
let(:jam_track) {FactoryGirl.create(:jam_track)}
before(:each) do
@ -94,7 +94,7 @@ describe "Account", :js => true, :type => :feature, :capybara_feature => true do
it {
user.subscribe_email.should be_true # we haven't user.reload yet
should have_selector('h2', text: 'edit profile: musical experience')
find('h2', text: 'edit profile: musical experience')
user.reload
user.subscribe_email.should be_false
user.first_name.should == "Bobby"
@ -110,7 +110,9 @@ describe "Account", :js => true, :type => :feature, :capybara_feature => true do
find("#account-edit-profile-form .account-edit-profile-submit").trigger(:click)
find('label', text: 'Concert Gigs Played')
find("#account-edit-profile-experience-form .account-edit-profile-submit").trigger(:click)
find('.interest-options.traditional-band .yes-option ins.iCheck-helper').trigger(:click)
find('label', text: 'Touring Option')
find('.interest-options.paid-sessions .yes-option ins.iCheck-helper').trigger(:click)
fill_in "paid_sessions_hourly_rate", with: "1.00"
fill_in "paid_sessions_daily_rate", with: "1.00"