adding fastclick, better person removal for tokenfield

skipping specs where we send sms to admins
smartchicago · May 15, 2016 · ebb1a0a · ebb1a0a
1 parent 42af5f2
commit ebb1a0a
Show file tree

Hide file tree

Showing 4 changed files with 851 additions and 3 deletions.
diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js
@@ -12,6 +12,7 @@
 //
 //= require jquery
 //= require jquery_ujs
+//= require fastclick/fastclick
 //= require best_in_place
 //= require twitter/bootstrap
 //= require twitter/typeahead.min
@@ -27,6 +28,7 @@
 //= require_tree .
 
 $(document).on('ready page:load',function() {
+  FastClick.attach(document.body);
   /* Activating Best In Place */
   jQuery(".best_in_place").best_in_place();
 

diff --git a/app/assets/javascripts/tokenfield.js b/app/assets/javascripts/tokenfield.js
@@ -75,8 +75,12 @@ $(document).on('ready page:load',function() {
         var index = old_values.indexOf(e.attrs.id);
         old_values.splice(index, 1);
         $.unique(old_values);
-        $(hiddenInput).val(old_values.toString());
-        $.ajax('/v2/cart/delete/' + e.attrs.id);
+        $.ajax('/v2/cart/delete/' + e.attrs.id)
+          .done(function(){
+            // we successfully removed the person from the cart
+            $(hiddenInput).val(old_values.toString());
+            return true;
+          }).error(function(){return false;})
       }
     });
 
@@ -94,7 +98,6 @@ $(document).on('ready page:load',function() {
         });
          arr = $.map(arr,function(n){return parseInt(n)});
          arr = $.unique(arr);
-         console.log(arr);
         return arr;
       }
     }

diff --git a/spec/controllers/v2/sms_reservations_controller_spec.rb b/spec/controllers/v2/sms_reservations_controller_spec.rb
@@ -50,6 +50,7 @@
         end
 
         it 'sends out a confirmation sms for the admin user' do
+          skip('We do not send sms to admin users')
           subject
           open_last_text_message_for ENV['TWILIO_SCHEDULING_NUMBER']
           expected = "A #{event_invitation.duration / 60} minute interview has been booked for #{selected_time}, with #{event.user.name}. \nTheir number is #{event.user.phone_number}\n. You'll get a reminder that morning."
@@ -68,6 +69,7 @@
         end
 
         it 'sends out a confirmation email for the admin user' do
+          skip('We do not send sms to admin users')
           subject
           open_last_text_message_for ENV['TWILIO_SCHEDULING_NUMBER']
           expected = "#{research_subject.full_name} has declined the invitation for event #{event.id}. "