<?xml version="1.0" encoding="UTF-8"?>
<commit>
  <added type="array"/>
  <modified type="array">
    <modified>
      <diff>@@ -131,7 +131,7 @@ module ActiveMerchant #:nodoc:
       
 	    self.money_format = :cents
       self.supported_countries = ['AU']
-      self.supported_cardtypes = [:visa, :master]
+      self.supported_cardtypes = [:visa, :master, :american_express]
       self.homepage_url = 'http://www.eway.com.au/'
       self.display_name = 'eWAY'
 	    </diff>
      <filename>lib/active_merchant/billing/gateways/eway.rb</filename>
    </modified>
    <modified>
      <diff>@@ -132,7 +132,11 @@ module ActiveMerchant #:nodoc:
           perform_non_referenced_credit(money, identification_or_credit_card, options)
         end
       end
-
+      
+      def test?
+        @options[:test] || super
+      end
+      
       private
       def reference_from(authorization)
         authorization.split(&quot;;&quot;).first</diff>
      <filename>lib/active_merchant/billing/gateways/ogone.rb</filename>
    </modified>
    <modified>
      <diff>@@ -182,7 +182,7 @@ module ActiveMerchant #:nodoc:
         {
           &quot;Content-Type&quot; =&gt; &quot;text/xml&quot;,
           &quot;Content-Length&quot; =&gt; content_length.to_s,
-      	  &quot;X-VPS-Timeout&quot; =&gt; timeout.to_s,
+      	  &quot;X-VPS-Client-Timeout&quot; =&gt; timeout.to_s,
       	  &quot;X-VPS-VIT-Integration-Product&quot; =&gt; &quot;ActiveMerchant&quot;,
       	  &quot;X-VPS-VIT-Runtime-Version&quot; =&gt; RUBY_VERSION,
       	  &quot;X-VPS-Request-ID&quot; =&gt; Utils.generate_unique_id</diff>
      <filename>lib/active_merchant/billing/gateways/payflow/payflow_common_api.rb</filename>
    </modified>
    <modified>
      <diff>@@ -8,7 +8,7 @@ module ActiveMerchant #:nodoc:
         base.cattr_accessor :signature
       end
       
-      API_VERSION = '52.0'
+      API_VERSION = '59.0'
       
       URLS = {
         :test =&gt; { :certificate =&gt; 'https://api.sandbox.paypal.com/2.0/',</diff>
      <filename>lib/active_merchant/billing/gateways/paypal/paypal_common_api.rb</filename>
    </modified>
    <modified>
      <diff>@@ -17,6 +17,10 @@ class OgoneTest &lt; Test::Unit::TestCase
       :description =&gt; 'Store Purchase'
     }
   end
+  
+  def teardown
+    Base.mode = :test
+  end
 
   def test_successful_authorize
     @gateway.expects(:ssl_post).returns(successful_purchase_response)
@@ -105,6 +109,19 @@ class OgoneTest &lt; Test::Unit::TestCase
     response = @gateway.purchase(@amount, @credit_card)
     assert_equal 'P', response.cvv_result['code']
   end
+  
+  def test_production_mode
+    Base.mode = :production
+    gateway = OgoneGateway.new(@credentials)
+    assert !gateway.test?
+  end
+
+  def test_test_mode
+    Base.mode = :production
+    @credentials[:test] = true
+    gateway = OgoneGateway.new(@credentials)
+    assert gateway.test?
+  end
 
   private
 </diff>
      <filename>test/unit/gateways/ogone_test.rb</filename>
    </modified>
  </modified>
  <removed type="array"/>
  <parents type="array">
    <parent>
      <id>168e7bfb17c278aba363c424effb3ee16e58076a</id>
    </parent>
    <parent>
      <id>55f765cbeba5079406503b1be99166e83428d331</id>
    </parent>
  </parents>
  <author>
    <name>Raymond Law</name>
    <email>rayvinly@gmail.com</email>
  </author>
  <url>http://github.com/rayvinly/active_merchant/commit/8898f726526c0cda324e7f1d4d9ac4c03eccdceb</url>
  <id>8898f726526c0cda324e7f1d4d9ac4c03eccdceb</id>
  <committed-date>2009-09-15T08:02:09-07:00</committed-date>
  <authored-date>2009-09-15T08:02:09-07:00</authored-date>
  <message>Merge branch 'master' of git://github.com/Shopify/active_merchant</message>
  <tree>75536cea7683a9ba7c5242024f1313a3bb530115</tree>
  <committer>
    <name>Raymond Law</name>
    <email>rayvinly@gmail.com</email>
  </committer>
</commit>
