saucy 0.15.2 → 0.16.0

data/spec/dummy/config/initializers/mime_types.rb

@@ -0,0 +1,5 @@
+# Be sure to restart your server when you modify this file.
+
+# Add new mime types for use in respond_to blocks:
+# Mime::Type.register "text/richtext", :rtf
+# Mime::Type.register_alias "text/html", :iphone

data/spec/dummy/config/initializers/secret_token.rb

@@ -0,0 +1,7 @@
+# Be sure to restart your server when you modify this file.
+
+# Your secret key for verifying the integrity of signed cookies.
+# If you change this key, all old signed cookies will become invalid!
+# Make sure the secret is at least 30 characters and all random,
+# no regular words or you'll be exposed to dictionary attacks.
+Dummy::Application.config.secret_token = '5a5796051b49ec05cbb9d33bafc982dcab004a668a44e3b85aa30865a8e779831eeb3e3ba4fe0de65320ccee091c1175ae5f45fa84d1ef00593d375463333016'

data/spec/dummy/config/initializers/session_store.rb

@@ -0,0 +1,8 @@
+# Be sure to restart your server when you modify this file.
+
+Dummy::Application.config.session_store :cookie_store, :key => '_dummy_session'
+
+# Use the database for sessions instead of the cookie-based default,
+# which shouldn't be used to store highly confidential information
+# (create the session table with "rails generate session_migration")
+# Dummy::Application.config.session_store :active_record_store

data/spec/dummy/config/initializers/wrap_parameters.rb

@@ -0,0 +1,14 @@
+# Be sure to restart your server when you modify this file.
+#
+# This file contains settings for ActionController::ParamsWrapper which
+# is enabled by default.
+
+# Enable parameter wrapping for JSON. You can disable this by setting :format to an empty array.
+ActiveSupport.on_load(:action_controller) do
+  wrap_parameters :format => [:json]
+end
+
+# Disable root element in JSON by default.
+ActiveSupport.on_load(:active_record) do
+  self.include_root_in_json = false
+end

data/spec/dummy/config/locales/en.yml

@@ -0,0 +1,5 @@
+# Sample localization file for English. Add more files in this directory for other locales.
+# See https://github.com/svenfuchs/rails-i18n/tree/master/rails%2Flocale for starting points.
+
+en:
+  hello: "Hello world"

data/spec/dummy/config/routes.rb

@@ -0,0 +1,59 @@
+Dummy::Application.routes.draw do
+  # The priority is based upon order of creation:
+  # first created -> highest priority.
+
+  # Sample of regular route:
+  #   match 'products/:id' => 'catalog#view'
+  # Keep in mind you can assign values other than :controller and :action
+
+  # Sample of named route:
+  #   match 'products/:id/purchase' => 'catalog#purchase', :as => :purchase
+  # This route can be invoked with purchase_url(:id => product.id)
+
+  # Sample resource route (maps HTTP verbs to controller actions automatically):
+  #   resources :products
+
+  # Sample resource route with options:
+  #   resources :products do
+  #     member do
+  #       get 'short'
+  #       post 'toggle'
+  #     end
+  #
+  #     collection do
+  #       get 'sold'
+  #     end
+  #   end
+
+  # Sample resource route with sub-resources:
+  #   resources :products do
+  #     resources :comments, :sales
+  #     resource :seller
+  #   end
+
+  # Sample resource route with more complex sub-resources
+  #   resources :products do
+  #     resources :comments
+  #     resources :sales do
+  #       get 'recent', :on => :collection
+  #     end
+  #   end
+
+  # Sample resource route within a namespace:
+  #   namespace :admin do
+  #     # Directs /admin/products/* to Admin::ProductsController
+  #     # (app/controllers/admin/products_controller.rb)
+  #     resources :products
+  #   end
+
+  # You can have the root of your site routed with "root"
+  # just remember to delete public/index.html.
+  # root :to => 'welcome#index'
+
+  # See how all your routes lay out with "rake routes"
+
+  # This is a legacy wild controller route that's not recommended for RESTful applications.
+  # Note: This route will make all actions in every controller accessible via GET requests.
+  # match ':controller(/:action(/:id(.:format)))'
+  root :to => "homes#show"
+end

data/spec/dummy/db/migrate/20120201000751_create_diesel_clearance_users.rb

@@ -0,0 +1,19 @@
+class CreateDieselClearanceUsers < ActiveRecord::Migration
+  def self.up
+    create_table(:users) do |t|
+      t.string   :email
+      t.string   :encrypted_password, :limit => 128
+      t.string   :salt,               :limit => 128
+      t.string   :confirmation_token, :limit => 128
+      t.string   :remember_token,     :limit => 128
+      t.timestamps
+    end
+
+    add_index :users, :email
+    add_index :users, :remember_token
+  end
+
+  def self.down
+    drop_table :users
+  end
+end

data/spec/dummy/db/migrate/20120201001546_create_saucy_tables.rb

@@ -0,0 +1,122 @@
+class CreateSaucyTables < ActiveRecord::Migration
+  def self.up
+    create_table :memberships do |table|
+      table.integer  :account_id
+      table.integer  :user_id
+      table.boolean  :admin, :null => false, :default => false
+      table.datetime :created_at
+      table.datetime :updated_at
+    end
+
+    add_index :memberships, [:account_id, :user_id], :unique => true
+
+    create_table :accounts do |table|
+      table.belongs_to :plan
+      table.belongs_to :coupon
+      table.string   :name
+      table.string   :keyword
+      table.datetime :created_at
+      table.datetime :updated_at
+      table.string   :customer_token
+      table.string   :subscription_token
+      table.string   :subscription_status
+      table.datetime :next_billing_date
+      table.boolean  :notified_of_disabling, :default => false, :null => false
+      table.boolean  :notified_of_expiration, :default => false, :null => false
+      table.boolean  :notified_of_completed_trial, :default => false, :null => false
+      table.boolean  :asked_to_activate, :default => false, :null => false
+      table.boolean  :activated, :default => false, :null => false
+      table.datetime :trial_expires_at
+    end
+    add_index :accounts, :plan_id
+    add_index :accounts, :coupon_id
+    add_index :accounts, :keyword, :unique => true
+    add_index :accounts, :next_billing_date
+    add_index :accounts, :created_at
+    add_index :accounts, :trial_expires_at
+
+    create_table :coupons, :force => true do |t|
+      t.string  :name,        :default => "", :null => false
+      t.integer :free_months, :default => 1,  :null => false
+    end
+
+    create_table :invitations do |table|
+      table.string   :email
+      table.integer  :account_id
+      table.integer  :sender_id
+      table.boolean  :admin, :null => false, :default => false
+      table.string   :code
+      table.boolean  :used, :default => false, :null => false
+      table.datetime :created_at
+      table.datetime :updated_at
+    end
+
+    add_index :invitations, [:account_id]
+
+    create_table :permissions do |table|
+      table.integer  :membership_id
+      table.integer  :user_id
+      table.integer  :project_id
+      table.datetime :created_at
+      table.datetime :updated_at
+    end
+
+    add_index :permissions, [:user_id, :project_id]
+    add_index :permissions, [:membership_id, :project_id], :name => [:membership_and_project], :unique => true
+
+    create_table :projects do |table|
+      table.string   :name
+      table.string   :keyword
+      table.integer  :account_id
+      table.boolean  :archived, :default => false, :null => false
+      table.datetime :created_at
+      table.datetime :updated_at
+    end
+    add_index :projects, [:keyword, :account_id], :unique => true
+    add_index :projects, :archived
+
+    change_table :users do |table|
+      table.string :name, :default => ""
+    end
+
+    create_table :plans do |t|
+      t.string :name
+      t.integer :price, :null => false, :default => 0
+      t.boolean :trial, :default => false, :null => false
+
+      t.timestamps
+    end
+
+    add_index :plans, :name
+
+    create_table :limits do |t|
+      t.belongs_to :plan
+      t.string :name
+      t.column :value, 'BIGINT UNSIGNED', :null => false, :default => 0
+      t.string  :value_type, :null => false, :default => "number"
+
+      t.timestamps
+    end
+
+    add_index :limits, :plan_id
+
+    create_table :invitations_projects, :id => false do |table|
+      table.integer :invitation_id, :null => false
+      table.integer :project_id, :null => false
+    end
+
+    add_index :invitations_projects, [:invitation_id, :project_id], :unique => true
+  end
+
+  def self.down
+    remove_column :users, :name
+    drop_table :invitations_projects
+    drop_table :plans
+    drop_table :projects
+    drop_table :permissions
+    drop_table :invitations
+    drop_table :accounts
+    drop_table :memberships
+  end
+end
+

data/spec/dummy/db/migrate/20120201001548_create_canceled_accounts.rb

@@ -0,0 +1,14 @@
+class CreateCanceledAccounts < ActiveRecord::Migration
+  def change
+    create_table :canceled_accounts do |t|
+      t.string     :name
+      t.string     :keyword
+      t.string     :billing_email
+      t.text       :memberships
+      t.belongs_to :plan
+      t.datetime   :started_at
+
+      t.timestamps
+    end
+  end
+end

data/spec/dummy/public/404.html

@@ -0,0 +1,26 @@
+<!DOCTYPE html>
+<html>
+<head>
+  <title>The page you were looking for doesn't exist (404)</title>
+  <style type="text/css">
+    body { background-color: #fff; color: #666; text-align: center; font-family: arial, sans-serif; }
+    div.dialog {
+      width: 25em;
+      padding: 0 4em;
+      margin: 4em auto 0 auto;
+      border: 1px solid #ccc;
+      border-right-color: #999;
+      border-bottom-color: #999;
+    }
+    h1 { font-size: 100%; color: #f00; line-height: 1.5em; }
+  </style>
+</head>
+
+<body>
+  <!-- This file lives in public/404.html -->
+  <div class="dialog">
+    <h1>The page you were looking for doesn't exist.</h1>
+    <p>You may have mistyped the address or the page may have moved.</p>
+  </div>
+</body>
+</html>

data/spec/dummy/public/422.html

@@ -0,0 +1,26 @@
+<!DOCTYPE html>
+<html>
+<head>
+  <title>The change you wanted was rejected (422)</title>
+  <style type="text/css">
+    body { background-color: #fff; color: #666; text-align: center; font-family: arial, sans-serif; }
+    div.dialog {
+      width: 25em;
+      padding: 0 4em;
+      margin: 4em auto 0 auto;
+      border: 1px solid #ccc;
+      border-right-color: #999;
+      border-bottom-color: #999;
+    }
+    h1 { font-size: 100%; color: #f00; line-height: 1.5em; }
+  </style>
+</head>
+
+<body>
+  <!-- This file lives in public/422.html -->
+  <div class="dialog">
+    <h1>The change you wanted was rejected.</h1>
+    <p>Maybe you tried to change something you didn't have access to.</p>
+  </div>
+</body>
+</html>

data/spec/dummy/public/500.html

@@ -0,0 +1,26 @@
+<!DOCTYPE html>
+<html>
+<head>
+  <title>We're sorry, but something went wrong (500)</title>
+  <style type="text/css">
+    body { background-color: #fff; color: #666; text-align: center; font-family: arial, sans-serif; }
+    div.dialog {
+      width: 25em;
+      padding: 0 4em;
+      margin: 4em auto 0 auto;
+      border: 1px solid #ccc;
+      border-right-color: #999;
+      border-bottom-color: #999;
+    }
+    h1 { font-size: 100%; color: #f00; line-height: 1.5em; }
+  </style>
+</head>
+
+<body>
+  <!-- This file lives in public/500.html -->
+  <div class="dialog">
+    <h1>We're sorry, but something went wrong.</h1>
+    <p>We've been notified about this issue and we'll take a look at it shortly.</p>
+  </div>
+</body>
+</html>

data/spec/dummy/script/rails

@@ -0,0 +1,6 @@
+#!/usr/bin/env ruby
+# This command will automatically be run when you run "rails" with Rails 3 gems installed from the root of your application.
+
+APP_PATH = File.expand_path('../../config/application',  __FILE__)
+require File.expand_path('../../config/boot',  __FILE__)
+require 'rails/commands'

data/spec/mailers/billing_mailer_spec.rb

@@ -4,8 +4,8 @@ describe "with an account and transaction" do
   let(:account) { Factory(:paid_account) }
 
   before do
-    subscription = FakeBraintree.subscriptions[account.subscription_token]
-    subscription["transactions"] = [FakeBraintree.generated_transaction]
+    subscription = FakeBraintree.registry.subscriptions[account.subscription_token]
+    subscription["transactions"] = [FakeBraintree.generate_transaction]
   end
 
   describe BillingMailer, "receipt" do
@@ -65,4 +65,14 @@ describe "with an account and transaction" do
       subject.body.should include(notice)
     end
   end
+
+  describe BillingMailer, "cancelation notification" do
+    let(:canceled_account) { CanceledAccount.create(:account => account) }
+
+    subject { BillingMailer.cancelation_notification(canceled_account) }
+
+    it "includes the billing email of the canceled account" do
+      subject.body.should include(account.billing_email)
+    end
+  end
 end

data/spec/models/canceled_account_spec.rb

@@ -12,9 +12,11 @@ describe CanceledAccount do
 end
 
 describe CanceledAccount, "given an account" do
-  let(:account) { Factory(:account, :billing_email => "billing@example.com", :subscription_token => "abc123") }
+  let(:account) { Factory(:account, :billing_email => "billing@example.com") }
+  let(:mail)    { stub('cancelation_notification', :deliver => true) }
 
   before do
+    BillingMailer.stubs(:cancelation_notification => mail)
     Factory(:membership, :account => account)
   end
 
@@ -30,11 +32,6 @@ describe CanceledAccount, "given an account" do
     subject.billing_email.should == account.customer.email
   end
 
-  it "populates its subscription_token from the given account" do
-    subject.subscription_token.should_not be_nil
-    subject.subscription_token.should == account.subscription_token
-  end
-
   it "saves the memberships and users as json from the given account" do
     memberships_json = account.memberships.to_json(:include => { :user => { :only => [:email, :name, :created_at]}}, :only => [:admin, :created_at])
     subject.memberships.should == memberships_json
@@ -49,4 +46,9 @@ describe CanceledAccount, "given an account" do
   it "populates the started_at from the given account's creation date" do
     subject.started_at.should == account.created_at
   end
+
+  it "sends a notification email" do
+    BillingMailer.should have_received(:cancelation_notification).with(subject)
+    mail.should have_received(:deliver)
+  end
 end

data/spec/models/subscription_spec.rb

@@ -14,56 +14,56 @@ describe Account do
   subject { Factory(:account) }
 
   it "manifests braintree processor_declined errors as errors on number and doesn't save" do
-    FakeBraintree.failures["4111111111111112"] = { "message" => "Do Not Honor", "code" => "2000", "status" => "processor_declined" }
+    FakeBraintree.registry.failures["4111111111111112"] = { "message" => "Do Not Honor", "code" => "2000", "status" => "processor_declined" }
     account = Factory.build(:paid_account,
                             :card_number => "4111111111111112",
                             :plan => Factory(:paid_plan))
     account.save.should_not be
-    FakeBraintree.customers.should be_empty
+    FakeBraintree.registry.customers.should be_empty
     account.persisted?.should_not be
     account.errors[:card_number].any? { |e| e =~ /denied/ }.should be
   end
 
   it "manifests braintree gateway_rejected errors as errors on number and doesn't save" do
-    FakeBraintree.failures["4111111111111112"] = { "message" => "Gateway Rejected: cvv", "code" => "N", "status" => "gateway_rejected" }
+    FakeBraintree.registry.failures["4111111111111112"] = { "message" => "Gateway Rejected: cvv", "code" => "N", "status" => "gateway_rejected" }
     account = Factory.build(:paid_account,
                             :card_number => "4111111111111112",
                             :plan => Factory(:paid_plan))
     account.save.should_not be
-    FakeBraintree.customers.should be_empty
+    FakeBraintree.registry.customers.should be_empty
     account.persisted?.should_not be
     account.errors[:verification_code].any? { |e| e =~ /did not match/ }.should be
    end
 
   it "manifests braintree gateway_rejected errors as errors on number and doesn't save" do
-    FakeBraintree.failures["4111111111111112"] = { "message" => "Credit card number is invalid.", "errors" => { "customer" => { "errors" => [], "credit-card" => { "errors" => [{ "message" => "Credit card number is invalid.", "code" => 81715, "attribute" => :number }] }}}}
+    FakeBraintree.registry.failures["4111111111111112"] = { "message" => "Credit card number is invalid.", "errors" => { "customer" => { "errors" => [], "credit-card" => { "errors" => [{ "message" => "Credit card number is invalid.", "code" => 81715, "attribute" => :number }] }}}}
     account = Factory.build(:paid_account,
                             :card_number => "4111111111111112",
                             :plan => Factory(:paid_plan))
     account.save.should_not be
-    FakeBraintree.customers.should be_empty
+    FakeBraintree.registry.customers.should be_empty
     account.persisted?.should_not be
     account.errors[:card_number].any? { |e| e =~ /is invalid/ }.should be
   end
 
   it "manifests braintree gateway_rejected unknown errors and doesn't save" do
-    FakeBraintree.failures["4111111111111112"] = { "message" => "Credit card number is invalid.", "errors" => { "customer" => { "errors" => [], "credit-card" => { "errors" => [{ "message" => "There was an unkown error.", "code" => 81715, "attribute" => :unknown }] }}}}
+    FakeBraintree.registry.failures["4111111111111112"] = { "message" => "Credit card number is invalid.", "errors" => { "customer" => { "errors" => [], "credit-card" => { "errors" => [{ "message" => "There was an unkown error.", "code" => 81715, "attribute" => :unknown }] }}}}
     account = Factory.build(:paid_account,
                             :card_number => "4111111111111112",
                             :plan => Factory(:paid_plan))
     account.save.should_not be
-    FakeBraintree.customers.should be_empty
+    FakeBraintree.registry.customers.should be_empty
     account.persisted?.should_not be
     account.errors[:card_number].any? { |e| e =~ /There was an unkown error./ }.should be
   end
 
   it "manifests braintree unknown status error" do
-    FakeBraintree.failures["4111111111111112"] = { "message" => "Do Not Honor", "code" => "2000", "status" => "unknown" }
+    FakeBraintree.registry.failures["4111111111111112"] = { "message" => "Do Not Honor", "code" => "2000", "status" => "unknown" }
     account = Factory.build(:paid_account,
                             :card_number => "4111111111111112",
                             :plan => Factory(:paid_plan))
     account.save.should_not be
-    FakeBraintree.customers.should be_empty
+    FakeBraintree.registry.customers.should be_empty
     account.persisted?.should_not be
     account.errors[:card_number].any? { |e| e =~ /unknown status/ }.should be
   end
@@ -84,8 +84,8 @@ describe Account, "given free and paid plans" do
     Saucy::Subscription::REQUIRED_CUSTOMER_ATTRIBUTES.each do |attribute|
       account.errors[attribute].should_not be_blank
     end
-    FakeBraintree.customers[account.customer_token].should_not be_nil
-    FakeBraintree.customers[account.customer_token]["credit_cards"].should be_blank
+    FakeBraintree.registry.customers[account.customer_token].should_not be_nil
+    FakeBraintree.registry.customers[account.customer_token]["credit_cards"].should be_blank
   end
 
   it "requires a billing email when upgrading to a paid plan" do
@@ -146,16 +146,16 @@ describe Account, "with a paid plan" do
   end
 
   it "creates a braintree customer, credit card, and subscription" do
-    FakeBraintree.customers[subject.customer_token].should_not be_nil
-    FakeBraintree.customers[subject.customer_token]["credit_cards"].first.should_not be_nil
-    FakeBraintree.subscriptions[subject.subscription_token].should_not be_nil
+    FakeBraintree.registry.customers[subject.customer_token].should_not be_nil
+    FakeBraintree.registry.customers[subject.customer_token]["credit_cards"].first.should_not be_nil
+    FakeBraintree.registry.subscriptions[subject.subscription_token].should_not be_nil
   end
 
   it "changes the subscription when the plan is changed" do
     new_plan = Factory(:paid_plan, :name => "New Plan", :price => 5)
     subject.save_customer_and_subscription!(:plan_id => new_plan.id)
-    FakeBraintree.subscriptions[subject.subscription_token]["plan_id"].should == new_plan.id
-    FakeBraintree.subscriptions[subject.subscription_token]["price"].should == "5"
+    FakeBraintree.registry.subscriptions[subject.subscription_token]["plan_id"].should == new_plan.id
+    FakeBraintree.registry.subscriptions[subject.subscription_token]["price"].should == "5"
   end
 
   context "updating customer credit card information when changed" do
@@ -232,7 +232,7 @@ describe Account, "with a paid plan" do
 
   it "deletes the customer when deleted" do
     subject.destroy
-    FakeBraintree.customers[subject.customer_token].should be_nil
+    FakeBraintree.registry.customers[subject.customer_token].should be_nil
   end
 end
 
@@ -266,21 +266,21 @@ describe Account, "with a free plan" do
   end
 
   it "creates a braintree customer" do
-    FakeBraintree.customers[subject.customer_token].should_not be_nil
+    FakeBraintree.registry.customers[subject.customer_token].should_not be_nil
   end
 
   it "doesn't create a credit card, and subscription" do
-    FakeBraintree.customers[subject.customer_token]["credit_cards"].should be_nil
-    FakeBraintree.subscriptions[subject.subscription_token].should be_nil
+    FakeBraintree.registry.customers[subject.customer_token]["credit_cards"].should be_empty
+    FakeBraintree.registry.subscriptions[subject.subscription_token].should be_nil
   end
 
   it "creates a credit card, subscription, and billing address when the plan is changed to a paid plan and the billing info is supplied" do
     new_plan = Factory(:paid_plan, :name => "New Plan")
     subject.save_customer_and_subscription!(Factory.attributes_for(:paid_account, :plan_id => new_plan.id))
 
-    FakeBraintree.customers[subject.customer_token]["credit_cards"].first.should_not be_nil
-    FakeBraintree.subscriptions[subject.subscription_token].should_not be_nil
-    FakeBraintree.subscriptions[subject.subscription_token]["plan_id"].should == new_plan.id
+    FakeBraintree.registry.customers[subject.customer_token]["credit_cards"].first.should_not be_nil
+    FakeBraintree.registry.subscriptions[subject.subscription_token].should_not be_nil
+    FakeBraintree.registry.subscriptions[subject.subscription_token]["plan_id"].should == new_plan.id
     subject.credit_card.should_not be_nil
     subject.subscription.should_not be_nil
     subject.billing_address.should_not be_nil
@@ -292,7 +292,7 @@ describe Account, "with a free plan" do
       new_plan = Factory(:paid_plan, :name => "New Plan")
       subject.save_customer_and_subscription!(Factory.attributes_for(:paid_account, :plan_id => new_plan.id))
 
-      FakeBraintree.subscriptions[subject.subscription_token]["merchant_account_id"].should == 'test'
+      FakeBraintree.registry.subscriptions[subject.subscription_token]["merchant_account_id"].should == 'test'
     ensure
       Saucy::Configuration.merchant_account_id = nil
     end
@@ -303,7 +303,7 @@ describe Account, "with a free plan" do
     new_plan = Factory(:paid_plan, :name => "New Plan")
     subject.save_customer_and_subscription!(Factory.attributes_for(:paid_account, :plan_id => new_plan.id))
 
-    FakeBraintree.subscriptions[subject.subscription_token].keys.should_not include("merchant_account_id")
+    FakeBraintree.registry.subscriptions[subject.subscription_token].keys.should_not include("merchant_account_id")
   end
 
   it "doesn't create a credit card, subscription, and billing address when the plan is changed to a different free plan" do
@@ -352,7 +352,7 @@ describe Account, "with a paid subscription" do
 
   it "gets marked as past due and updates its next_billing_date when subscriptions are updated and it has been rejected by the gateway" do
     next_billing_date_string = 2.months.from_now.to_s(:braintree_date)
-    subscription = FakeBraintree.subscriptions[subject.subscription_token]
+    subscription = FakeBraintree.registry.subscriptions[subject.subscription_token]
     subscription["status"] = Braintree::Subscription::Status::PastDue
     subscription["next_billing_date"] = next_billing_date_string
 
@@ -390,14 +390,13 @@ describe Account, "with a paid subscription" do
   end
 
   context "when billing didn't work" do
-    let(:subscription) { FakeBraintree.subscriptions[subject.subscription_token] }
+    let(:subscription) { FakeBraintree.registry.subscriptions[subject.subscription_token] }
 
     before do
       subscription["status"] = Braintree::Subscription::Status::PastDue
       subscription["next_billing_date"] = 2.months.from_now.to_s(:braintree_date)
-      FakeBraintree.transaction = { :status => Braintree::Transaction::Status::Failed,
-                                    :subscription_id => subject.subscription_token }
-      subscription["transactions"] = [FakeBraintree.generated_transaction]
+      subscription["transactions"] = [FakeBraintree.generate_transaction({ :status => Braintree::Transaction::Status::Failed,
+                                                                           :subscription_id => subject.subscription_token }) ]
     end
 
     it "receives a receipt email at it's billing email with a notice that it failed when billing didn't work" do
@@ -422,7 +421,7 @@ describe Account, "with a paid subscription" do
   end
 
   context "with multiple historical transactions and an active account" do
-    let(:subscription) { FakeBraintree.subscriptions[subject.subscription_token] }
+    let(:subscription) { FakeBraintree.registry.subscriptions[subject.subscription_token] }
 
     let!(:earlier_transaction_date) { 2.months.ago }
     let!(:later_transaction_date)   { 1.month.ago }
@@ -433,8 +432,7 @@ describe Account, "with a paid subscription" do
         :subscription_id => subject.subscription_token
       }
 
-      FakeBraintree.transaction = common_transaction_attributes.merge(attributes)
-      FakeBraintree.generated_transaction
+      FakeBraintree.generate_transaction(common_transaction_attributes.merge(attributes))
     end
 
     before do
@@ -461,9 +459,9 @@ describe Account, "with a paid subscription" do
 
   context "with a merchant account timezone different from the system timezone" do
     def build_subscription(account)
-      subscription = FakeBraintree.subscriptions[account.subscription_token]
+      subscription = FakeBraintree.registry.subscriptions[account.subscription_token]
       subscription["status"] = Braintree::Subscription::Status::Active
-      subscription["transactions"] = [FakeBraintree.generated_transaction]
+      subscription["transactions"] = [FakeBraintree.generate_transaction]
       subscription
     end
 
@@ -503,16 +501,15 @@ describe Account, "with a paid subscription" do
   end
 
   context "and an active subscription due 2 months from now" do
-    let(:subscription) { FakeBraintree.subscriptions[subject.subscription_token] }
+    let(:subscription) { FakeBraintree.registry.subscriptions[subject.subscription_token] }
     let(:next_billing_date_string) { 2.months.from_now.to_s(:braintree_date) }
     let(:zone) { ActiveSupport::TimeZone[Saucy::Configuration.merchant_account_time_zone] }
 
     before do
       subscription["status"] = Braintree::Subscription::Status::Active
       subscription["next_billing_date"] = next_billing_date_string
-      FakeBraintree.transaction = { :status => Braintree::Transaction::Status::Settled,
-                                    :subscription_id => subject.subscription_token }
-      subscription["transactions"] = [FakeBraintree.generated_transaction]
+      subscription["transactions"] = [FakeBraintree.generate_transaction({ :status => Braintree::Transaction::Status::Settled,
+                                                                           :subscription_id => subject.subscription_token })]
     end
 
     it "gets marked as not past due and updates its next_billing_date when the subscription is active after its billing date" do
@@ -572,7 +569,7 @@ describe Account, "with a paid subscription that is past due" do
   end
 
   before do
-    subscription = FakeBraintree.subscriptions[subject.subscription_token]
+    subscription = FakeBraintree.registry.subscriptions[subject.subscription_token]
     subscription["status"] = Braintree::Subscription::Status::PastDue
     subscription["next_billing_date"] = 2.months.from_now.to_s(:braintree_date)
 
@@ -586,12 +583,11 @@ describe Account, "with a paid subscription that is past due" do
 
   it "retries the subscription charge and updates the subscription when the billing information is correctly updated" do
     next_billing_date_string = 1.day.from_now.to_s(:braintree_date)
-    subscription = FakeBraintree.subscriptions[subject.subscription_token]
+    subscription = FakeBraintree.registry.subscriptions[subject.subscription_token]
     subscription["status"] = Braintree::Subscription::Status::Active
     subscription["next_billing_date"] = next_billing_date_string
-    FakeBraintree.transaction = { :status => Braintree::Transaction::Status::Settled,
-                                  :subscription_id => subject.subscription_token }
-    transaction = FakeBraintree.generated_transaction
+    transaction = FakeBraintree.generate_transaction({ :status => Braintree::Transaction::Status::Settled,
+                                                       :subscription_id => subject.subscription_token })
     subscription["transactions"] = [transaction]
 
     retry_transaction = stub(:id => "12345")
@@ -611,12 +607,11 @@ describe Account, "with a paid subscription that is past due" do
 
   it "retries the subscription charge and updates the subscription when the payment processing fails" do
     next_billing_date_string = 2.months.from_now.to_s(:braintree_date)
-    subscription = FakeBraintree.subscriptions[subject.subscription_token]
+    subscription = FakeBraintree.registry.subscriptions[subject.subscription_token]
     subscription["status"] = Braintree::Subscription::Status::PastDue
     subscription["next_billing_date"] = next_billing_date_string
-    FakeBraintree.transaction = { :status => Braintree::Transaction::Status::Failed,
-                                  :subscription_id => subject.subscription_token }
-    transaction = FakeBraintree.generated_transaction
+    transaction = FakeBraintree.generate_transaction({ :status => Braintree::Transaction::Status::Failed,
+                                                       :subscription_id => subject.subscription_token })
     subscription["transactions"] = [transaction]
 
     retry_transaction = stub(:id => "12345", :status => "processor_declined", "processor_response_text" => "no good")
@@ -637,12 +632,11 @@ describe Account, "with a paid subscription that is past due" do
 
   it "retries the subscription charge and updates the subscription when the settlement fails" do
     next_billing_date_string = 1.day.from_now.to_s(:braintree_date)
-    subscription = FakeBraintree.subscriptions[subject.subscription_token]
+    subscription = FakeBraintree.registry.subscriptions[subject.subscription_token]
     subscription["status"] = Braintree::Subscription::Status::PastDue
     subscription["next_billing_date"] = next_billing_date_string
-    FakeBraintree.transaction = { :status => Braintree::Transaction::Status::Failed,
-                                  :subscription_id => subject.subscription_token }
-    transaction = FakeBraintree.generated_transaction
+    transaction = FakeBraintree.generate_transaction({ :status => Braintree::Transaction::Status::Failed,
+                                                       :subscription_id => subject.subscription_token })
     subscription["transactions"] = [transaction]
 
     retry_transaction = stub(:id => "12345", :status => "")