regression test + hash syntax

test/recurring_application_charge_test.rb

@@ -3,7 +3,7 @@ require 'test_helper'
 class RecurringApplicationChargeTest < Test::Unit::TestCase
 
   def test_recurring_application_charges_create
-    fake "recurring_application_charges", :method => :post, :status => 201, :body => load_fixture('recurring_application_charge')
+    fake "recurring_application_charges", method: :post, status: 201, body: load_fixture('recurring_application_charge')
 
     charge = ShopifyAPI::RecurringApplicationCharge.create(
       name: "Default Plan",
@@ -15,7 +15,7 @@ class RecurringApplicationChargeTest < Test::Unit::TestCase
   end
 
   def test_get_recurring_application_charges
-    fake "recurring_application_charges/654381177", :method => :get, :status => 201, :body => load_fixture('recurring_application_charge')
+    fake "recurring_application_charges/654381177", method: :get, status: 201, body: load_fixture('recurring_application_charge')
 
     charge = ShopifyAPI::RecurringApplicationCharge.find(654381177)
 
@@ -23,7 +23,7 @@ class RecurringApplicationChargeTest < Test::Unit::TestCase
   end
 
   def test_list_recurring_application_charges
-    fake "recurring_application_charges", :method => :get, :status => 201, :body => load_fixture('recurring_application_charges')
+    fake "recurring_application_charges", method: :get, status: 201, body: load_fixture('recurring_application_charges')
 
     charge = ShopifyAPI::RecurringApplicationCharge.find(:all)
 
@@ -31,23 +31,23 @@ class RecurringApplicationChargeTest < Test::Unit::TestCase
   end
 
   def test_list_since_recurring_application_charges
-    fake "recurring_application_charges.json?since_id=64512345",:extension => false, :method => :get, :status => 201, :body => load_fixture('recurring_application_charges')
+    fake "recurring_application_charges.json?since_id=64512345",extension: false, method: :get, status: 201, body: load_fixture('recurring_application_charges')
 
-    charge = ShopifyAPI::RecurringApplicationCharge.find(:all, :params => {:since_id => '64512345'})
+    charge = ShopifyAPI::RecurringApplicationCharge.find(:all, params: { since_id: '64512345' })
 
     assert_equal "Super Mega Plan", charge.last.name
   end
 
   def test_list_fields_recurring_application_charges
-    fake "recurring_application_charges.json?fields=name",:extension => false, :method => :get, :status => 201, :body => load_fixture('recurring_application_charges')
+    fake "recurring_application_charges.json?fields=name",extension: false, method: :get, status: 201, body: load_fixture('recurring_application_charges')
 
-    charge = ShopifyAPI::RecurringApplicationCharge.find(:all, :params => {:fields => 'name'})
+    charge = ShopifyAPI::RecurringApplicationCharge.find(:all, params: { fields: 'name' })
 
     assert_equal "Super Mega Plan", charge.last.name
   end
 
   def test_pending_recurring_application_charge
-    fake "recurring_application_charges", :method => :get, :status => 201, :body => load_fixture('recurring_application_charges')
+    fake "recurring_application_charges", method: :get, status: 201, body: load_fixture('recurring_application_charges')
 
     charge = ShopifyAPI::RecurringApplicationCharge.pending
 
@@ -55,7 +55,7 @@ class RecurringApplicationChargeTest < Test::Unit::TestCase
   end
 
   def test_cancelled_recurring_application_charge
-    fake "recurring_application_charges", :method => :get, :status => 201, :body => load_fixture('recurring_application_charges')
+    fake "recurring_application_charges", method: :get, status: 201, body: load_fixture('recurring_application_charges')
 
     charge = ShopifyAPI::RecurringApplicationCharge.cancelled
 
@@ -63,7 +63,7 @@ class RecurringApplicationChargeTest < Test::Unit::TestCase
   end
 
   def test_accepted_recurring_application_charge
-    fake "recurring_application_charges", :method => :get, :status => 201, :body => load_fixture('recurring_application_charges')
+    fake "recurring_application_charges", method: :get, status: 201, body: load_fixture('recurring_application_charges')
 
     charge = ShopifyAPI::RecurringApplicationCharge.accepted
 
@@ -72,7 +72,7 @@ class RecurringApplicationChargeTest < Test::Unit::TestCase
   end
 
   def test_declined_recurring_application_charge
-    fake "recurring_application_charges", :method => :get, :status => 201, :body => load_fixture('recurring_application_charges')
+    fake "recurring_application_charges", method: :get, status: 201, body: load_fixture('recurring_application_charges')
 
     charge = ShopifyAPI::RecurringApplicationCharge.declined
 
@@ -80,8 +80,8 @@ class RecurringApplicationChargeTest < Test::Unit::TestCase
   end
 
   def test_activate_recurring_application_charge
-    fake "recurring_application_charges", :method => :get, :status => 201, :body => load_fixture('recurring_application_charges')
-    fake "recurring_application_charges/455696199/activate", :method => :post, :status => 200, :body => "{}"
+    fake "recurring_application_charges", method: :get, status: 201, body: load_fixture('recurring_application_charges')
+    fake "recurring_application_charges/455696199/activate", method: :post, status: 200, body: "{}"
 
     charge = ShopifyAPI::RecurringApplicationCharge.accepted
 
@@ -98,13 +98,33 @@ class RecurringApplicationChargeTest < Test::Unit::TestCase
   end
 
   def test_cancel_recurring_application_charge
-    fake "recurring_application_charges", :method => :get, :status => 201, :body => load_fixture('recurring_application_charges')
-    fake "recurring_application_charges/455696194", :method => :delete, :status => 200, :body => "{}"
+    fake "recurring_application_charges", method: :get, status: 201, body: load_fixture('recurring_application_charges')
+    fake "recurring_application_charges/455696194", method: :delete, status: 200, body: "{}"
 
     charge = ShopifyAPI::RecurringApplicationCharge.current
     assert charge.cancel
   end
 
+  def test_usage_charges_recurring_application_charge_found
+    fake "recurring_application_charges/654381177", method: :get, status: 201, body: load_fixture('recurring_application_charge')
+    fake "recurring_application_charges/654381177/usage_charges", method: :get, status: 201, body: load_fixture('usage_charges')
+
+    charge = ShopifyAPI::RecurringApplicationCharge.find(654381177)
+    usage_charges = charge.usage_charges
+
+    assert_equal 2, usage_charges.length
+  end
+
+  def test_usage_charges_recurring_application_charge_not_found
+    fake "recurring_application_charges/654381177", method: :get, status: 201, body: load_fixture('recurring_application_charge')
+    fake "recurring_application_charges/654381177/usage_charges", method: :get, status: 201, body: "[]"
+
+    charge = ShopifyAPI::RecurringApplicationCharge.find(654381177)
+    usage_charges = charge.usage_charges
+
+    assert_equal 0, usage_charges.length
+  end
+
   def test_no_recurring_application_charge_found
     fake "recurring_application_charges", body: {recurring_application_charges: []}.to_json
 
@@ -114,7 +134,7 @@ class RecurringApplicationChargeTest < Test::Unit::TestCase
   end
 
   def test_recurring_application_charge_not_found_error
-    fake "recurring_application_charges", :body => '{"errors":"Not Found"}', :status => 404
+    fake "recurring_application_charges", body: '{"errors":"Not Found"}', status: 404
 
     all_application_charges = ShopifyAPI::RecurringApplicationCharge.all
     if ActiveResource::VERSION::MAJOR >= 4 && ActiveResource::VERSION::MINOR >= 2
@@ -126,5 +146,4 @@ class RecurringApplicationChargeTest < Test::Unit::TestCase
     assert_equal nil, ShopifyAPI::RecurringApplicationCharge.current
     assert_equal [],  ShopifyAPI::RecurringApplicationCharge.pending
   end
-
 end

test/usage_charge_test.rb

@@ -11,19 +11,11 @@ class UsageChargeTest < Test::Unit::TestCase
   end
 
   def test_get_usage_charges
-    fake "recurring_application_charges/654381177/usage_charges/359376002", :method => :get, :status => 201, :body => load_fixture('usage_charge')
+    fake "recurring_application_charges/654381177/usage_charges/359376002", method: :get, status: 201, body: load_fixture('usage_charge')
 
     usage_charge = ShopifyAPI::UsageCharge.find(359376002, params: {recurring_application_charge_id: 654381177})
 
     assert_equal "1000 emails", usage_charge.description
   end
 
-  def test_list_usage_charges
-    fake "recurring_application_charges/654381177/usage_charges", :method => :get, :status => 201, :body => load_fixture('usage_charges')
-
-    usage_charges = ShopifyAPI::UsageCharge.find(:all, params: {recurring_application_charge_id: 654381177})
-
-    assert_equal 2, usage_charges.length
-  end
-
 end