Browse Source

Fixed failing tests on ruby 1.8.7

Dennis O'Connor 13 years ago
parent
commit
5b0c3037f4
3 changed files with 4 additions and 3 deletions
  1. 2 1
      test/detailed_log_subscriber_test.rb
  2. 1 1
      test/product_test.rb
  3. 1 1
      test/shop_test.rb

+ 2 - 1
test/detailed_log_subscriber_test.rb

@@ -27,7 +27,8 @@ class LogSubscriberTest < Test::Unit::TestCase
     assert_equal "GET http://localhost:80/admin/pages/1.json",                  @logger.logged(:info)[0]
     assert_match /\-\-\> 200/,                                                  @logger.logged(:info)[1]
     assert_equal "Headers: {\"Accept\"=>\"application/json\"}",                 @logger.logged(:info)[2]
-    assert_equal "Response:\n{\"page\":{\"id\":1,\"title\":\"Shopify API\"}}",  @logger.logged(:info)[3]
+    assert_match /Response:\n\{\"page\"\:\{((\"id\"\:1)|(\"title\"\:\"Shopify API\")),((\"id\"\:1)|(\"title\"\:\"Shopify API\"))\}\}/,  @logger.logged(:info)[3]
+
   end
 
   test "logging on #find with an error" do

+ 1 - 1
test/product_test.rb

@@ -12,7 +12,7 @@ class ProductTest < Test::Unit::TestCase
     fake "products/632910392/metafields", :method => :post, :status => 201, :body => load_fixture('metafield')
 
     field = @product.add_metafield(ShopifyAPI::Metafield.new(:namespace => "contact", :key => "email", :value => "123@example.com", :value_type => "string"))
-    assert_equal '{"metafield":{"namespace":"contact","key":"email","value":"123@example.com","value_type":"string"}}', FakeWeb.last_request.body
+    assert_equal ActiveSupport::JSON.decode('{"metafield":{"namespace":"contact","key":"email","value":"123@example.com","value_type":"string"}}'), ActiveSupport::JSON.decode(FakeWeb.last_request.body)
     assert !field.new_record?
     assert_equal "contact", field.namespace
     assert_equal "email", field.key

+ 1 - 1
test/shop_test.rb

@@ -29,7 +29,7 @@ class ShopTest < Test::Unit::TestCase
     fake "metafields", :method => :post, :status => 201, :body =>load_fixture('metafield')
 
     field = @shop.add_metafield(ShopifyAPI::Metafield.new(:namespace => "contact", :key => "email", :value => "123@example.com", :value_type => "string"))
-    assert_equal '{"metafield":{"namespace":"contact","key":"email","value":"123@example.com","value_type":"string"}}', FakeWeb.last_request.body
+    assert_equal ActiveSupport::JSON.decode('{"metafield":{"namespace":"contact","key":"email","value":"123@example.com","value_type":"string"}}'), ActiveSupport::JSON.decode(FakeWeb.last_request.body)
     assert !field.new_record?
     assert_equal "contact", field.namespace
     assert_equal "email", field.key