Merge branch 'develop' into feature/billing-no-authenticated-payments

Conflicts:
	billing/config/locales/en.yml

1 files changed, 16 insertions, 0 deletions

diff --git a/billing/test/functional/subscriptions_controller_test.rb b/billing/test/functional/subscriptions_controller_test.rb
new file mode 100644
index 0000000..a6a1057
--- /dev/null
+++ b/billing/test/functional/subscriptions_controller_test.rb
@@ -0,0 +1,16 @@
+require 'test_helper'
+require 'fake_braintree'
+
+class SubscriptionsControllerTest < ActionController::TestCase
+  include CustomerTestHelper
+
+  test "destroy cancels subscription" do
+    customer = stub_customer
+    login customer.user
+    result = Braintree::Subscription.create plan_id: 'my_plan',
+      payment_method_token: customer.braintree_customer.credit_cards.first.token
+    subscription = result.subscription
+    delete :destroy, id: subscription.id, user_id: customer.user.id
+    assert_equal "Canceled", Braintree::Subscription.find(subscription.id).status
+  end
+end