Cleanup; upgrade deprecated gem. Attempt to fix intermittently failing test.

This commit is contained in:
Steven Miers 2015-01-16 18:00:44 -06:00
parent 3fb45c0dd0
commit 5f9f8a0cdd
5 changed files with 6 additions and 16 deletions

View File

@ -75,7 +75,7 @@ gem 'netaddr'
gem 'quiet_assets', :group => :development
gem 'bugsnag'
gem 'multi_json', '1.9.0'
gem 'rest_client'
gem 'rest-client'
gem 'iso-639'
gem 'language_list'
gem 'rubyzip'

View File

@ -103,9 +103,6 @@
return false;
})
context.JK.helpBubble($downloadedTrackHelp, 'downloaded-backingtrack', {}, {width:'400px'})
$downloadedTrackHelp.on('click', false)
context.JK.helpBubble($whatAreBackingTracks, 'no help yet for this topic', {}, {positions:['bottom'], offsetParent: $dialog})
$whatAreBackingTracks.on('click', false) // no help yet
}
@ -122,7 +119,6 @@
$tbody = $dialog.find('table.open-backing-tracks tbody');
$paginatorHolder = $dialog.find('.paginator-holder');
$templateOpenBackingTrackRow = $('#template-backing-track-row')
$downloadedTrackHelp = $dialog.find('.downloaded-backingtrack-help')
$whatAreBackingTracks = $dialog.find('.what-are-backingtracks')
registerStaticEvents();

View File

@ -15,10 +15,6 @@
}
}
.downloaded-backingtrack-help {
margin-left:15px;
}
.right {
margin-right:10px;
}

View File

@ -17,12 +17,6 @@
| PATH
th align="left"
| LENGTH
/ th align="left"
/ | ORIGINAL ARTIST
/ th align="left"
/ | DOWNLOADED
/ a.downloaded-backingtrack-help href="#"
/ | ?
tbody
br

View File

@ -9,6 +9,10 @@ describe "Find Session", :js => true, :type => :feature, :capybara_feature => tr
let(:dallas) { dallas_geoip }
let(:user) { FactoryGirl.create(:user, last_jam_locidispid: austin_geoip[:locidispid], last_jam_addr: austin_ip) }
let(:finder) { FactoryGirl.create(:user, last_jam_locidispid: dallas_geoip[:locidispid], last_jam_addr: dallas_ip) }
before(:all) do
Capybara.default_wait_time = 20
end
before(:each) do
@ -82,7 +86,7 @@ describe "Find Session", :js => true, :type => :feature, :capybara_feature => tr
# this should cause it to move to the scheduled session view; we'll check all the values again
ActiveMusicSession.delete_all
sleep(3)
verify_find_session_score(nil, '#sessions-scheduled', session1_creator, session1_creator)
fast_signout