Merge pull request #2 from janjiss/master

Added request_id for redirect_url
ebeigarts · Jan 8, 2013 · a814ac6 · a814ac6
2 parents 2edd9df + 2c43815
commit a814ac6
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 2 deletions.
diff --git a/lib/active_merchant/billing/first_data_gateway.rb b/lib/active_merchant/billing/first_data_gateway.rb
@@ -280,8 +280,10 @@ def endpoint_url
         test? ? test_url : live_url
       end
 
-      def redirect_url
-        test? ? test_redirect_url : live_redirect_url
+      def redirect_url(trans_id = nil)
+        url = test? ? test_redirect_url : live_redirect_url
+        url += "?trans_id=#{CGI.escape trans_id}" if trans_id
+        url
       end
 
       private

diff --git a/spec/active_merchant/billing/first_data_gateway_spec.rb b/spec/active_merchant/billing/first_data_gateway_spec.rb
@@ -685,6 +685,13 @@
       end
     end
 
+    it "26) return correct redirect url with transaction id" do
+      @gateway.redirect_url.should == @gateway.test_redirect_url
+    end
+
+    it "27) return correct redirect url without transaction id" do
+      @gateway.redirect_url("2SGip+TK/dVYe+XMSeQuECMs//S=").should == @gateway.test_redirect_url + "?trans_id=2SGip%2BTK%2FdVYe%2BXMSeQuECMs%2F%2FS%3D"
+    end
   end
 
   def submit_form(url, params, cassette_prefix)