From 00b170eed2485adb1d4a4f15f94af489a1bd7770 Mon Sep 17 00:00:00 2001
From: Jeff Dutil <jdutil@burlingtonwebapps.com>
Date: Mon, 26 Nov 2012 22:01:24 -0500
Subject: [PATCH] Fix calls for spree root url. [fix #102]

---
 app/controllers/spree/checkout_controller_decorator.rb | 4 ++--
 spec/support/url_helpers.rb                            | 7 -------
 2 files changed, 2 insertions(+), 9 deletions(-)
 delete mode 100644 spec/support/url_helpers.rb

diff --git a/app/controllers/spree/checkout_controller_decorator.rb b/app/controllers/spree/checkout_controller_decorator.rb
index 0c34e7c..f1290b4 100644
--- a/app/controllers/spree/checkout_controller_decorator.rb
+++ b/app/controllers/spree/checkout_controller_decorator.rb
@@ -320,7 +320,7 @@ module Spree
       if stage == "checkout"
         opts[:handling] = 0
 
-        opts[:callback_url] = spree_root_url + "paypal_express_callbacks/#{order.number}"
+        opts[:callback_url] = spree.root_url + "paypal_express_callbacks/#{order.number}"
         opts[:callback_timeout] = 3
       elsif stage == "payment"
         #hack to add float rounding difference in as handling fee - prevents PayPal from rejecting orders
@@ -353,7 +353,7 @@ module Spree
       end
 
       {
-        :callback_url      => spree_root_url + "paypal_shipping_update",
+        :callback_url      => spree.root_url + "paypal_shipping_update",
         :callback_timeout  => 6,
         :callback_version  => '61.0',
         :shipping_options  => shipping_default
diff --git a/spec/support/url_helpers.rb b/spec/support/url_helpers.rb
deleted file mode 100644
index 0be58fa..0000000
--- a/spec/support/url_helpers.rb
+++ /dev/null
@@ -1,7 +0,0 @@
-module Spree
-  module UrlHelpers
-    def spree
-      Spree::Core::Engine.routes.url_helpers
-    end
-  end
-end