Merge pull request #1236 from YaleSTC/1235_fix_empty_cart_redirect

[1235] Empty cart redirects to the previous page

app/controllers/reservations_controller.rb

@@ -107,7 +107,7 @@ def new # rubocop:disable MethodLength, PerceivedComplexity
     if cart.items.empty?
       flash[:error] = 'You need to add items to your cart before making a '\
         'reservation.'
-      redirect_to catalog_path
+      redirect_to :back
     else
       # error handling
       @errors = cart.validate_all

spec/controllers/reservations_controller_spec.rb

@@ -234,13 +234,16 @@
     end
 
     context 'when accessed by a non-banned user' do
-      before(:each) { sign_in @user }
+      before(:each) do
+        sign_in @user
+        request.env['HTTP_REFERER'] = 'where_i_came_from'
+      end
 
       context 'with an empty cart' do
         before(:each) do
           get :new
         end
-        it { expect(response).to be_redirect }
+        it { expect(response).to redirect_to('where_i_came_from') }
         it { is_expected.to set_flash }
       end