From 5f9f8a0cddb47b7af06bee03baee91abe1ea0aa4 Mon Sep 17 00:00:00 2001
From: Steven Miers <steven.miers@gmail.com>
Date: Fri, 16 Jan 2015 18:00:44 -0600
Subject: [PATCH] Cleanup; upgrade deprecated gem.  Attempt to fix
 intermittently failing test.

---
 web/Gemfile                                                 | 2 +-
 web/app/assets/javascripts/dialog/openBackingTrackDialog.js | 4 ----
 .../stylesheets/dialogs/openBackingTrackDialog.css.scss     | 4 ----
 web/app/views/dialogs/_openBackingTrackDialog.html.slim     | 6 ------
 web/spec/features/find_sessions_spec.rb                     | 6 +++++-
 5 files changed, 6 insertions(+), 16 deletions(-)

diff --git a/web/Gemfile b/web/Gemfile
index e5c3f1583..ebd231f77 100644
--- a/web/Gemfile
+++ b/web/Gemfile
@@ -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'
diff --git a/web/app/assets/javascripts/dialog/openBackingTrackDialog.js b/web/app/assets/javascripts/dialog/openBackingTrackDialog.js
index 905d6d9e9..2bb5f796f 100644
--- a/web/app/assets/javascripts/dialog/openBackingTrackDialog.js
+++ b/web/app/assets/javascripts/dialog/openBackingTrackDialog.js
@@ -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();
diff --git a/web/app/assets/stylesheets/dialogs/openBackingTrackDialog.css.scss b/web/app/assets/stylesheets/dialogs/openBackingTrackDialog.css.scss
index a4770e627..830d5c61c 100644
--- a/web/app/assets/stylesheets/dialogs/openBackingTrackDialog.css.scss
+++ b/web/app/assets/stylesheets/dialogs/openBackingTrackDialog.css.scss
@@ -15,10 +15,6 @@
     }
   }
 
-  .downloaded-backingtrack-help {
-    margin-left:15px;
-  }
-
   .right {
     margin-right:10px;
   }
diff --git a/web/app/views/dialogs/_openBackingTrackDialog.html.slim b/web/app/views/dialogs/_openBackingTrackDialog.html.slim
index 3c2d422e8..dec11d179 100644
--- a/web/app/views/dialogs/_openBackingTrackDialog.html.slim
+++ b/web/app/views/dialogs/_openBackingTrackDialog.html.slim
@@ -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
 
diff --git a/web/spec/features/find_sessions_spec.rb b/web/spec/features/find_sessions_spec.rb
index 5853c13ce..cb6d15ba2 100644
--- a/web/spec/features/find_sessions_spec.rb
+++ b/web/spec/features/find_sessions_spec.rb
@@ -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