diff --git a/Gemfile b/Gemfile
index 2562fc9..9bab50d 100644
--- a/Gemfile
+++ b/Gemfile
@@ -11,6 +11,7 @@ gem 'sqlite3'
 gem 'turbolinks'
 gem 'uglifier', '>= 1.3.0'
 gem 'symmetric-encryption', '~> 3.8.1'
+gem 'stripe'
 
 gem 'quiet_assets', group: :development
 
diff --git a/Gemfile.lock b/Gemfile.lock
index 5381d6d..09c6a17 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -36,7 +36,7 @@ GEM
       minitest (~> 5.1)
       thread_safe (~> 0.3, >= 0.3.4)
       tzinfo (~> 1.1)
-    addressable (2.3.8)
+    addressable (2.4.0)
     arel (6.0.2)
     bcrypt (3.1.10)
     binding_of_caller (0.7.2)
@@ -50,7 +50,7 @@ GEM
       rack (>= 1.0.0)
       rack-test (>= 0.5.4)
       xpath (~> 2.0)
-    childprocess (0.5.6)
+    childprocess (0.5.9)
       ffi (~> 1.0, >= 1.0.11)
     cliver (0.3.2)
     coderay (1.1.0)
@@ -64,7 +64,7 @@ GEM
       execjs
     coffee-script-source (1.9.1.1)
     columnize (0.9.0)
-    cookiejar (0.3.2)
+    cookiejar (0.3.0)
     crack (0.4.2)
       safe_yaml (~> 1.0.0)
     database_cleaner (1.4.1)
@@ -79,13 +79,15 @@ GEM
       thread_safe (~> 0.1)
       warden (~> 1.2.3)
     diff-lcs (1.2.5)
-    em-http-request (1.1.2)
+    domain_name (0.5.25)
+      unf (>= 0.0.5, < 1.0.0)
+    em-http-request (1.1.3)
       addressable (>= 2.3.4)
-      cookiejar
+      cookiejar (<= 0.3.0)
       em-socksify (>= 0.3)
       eventmachine (>= 1.0.3)
       http_parser.rb (>= 0.6.0)
-    em-socksify (0.3.0)
+    em-socksify (0.3.1)
       eventmachine (>= 1.0.0.beta.4)
     em-synchrony (1.0.4)
       eventmachine (>= 1.0.0.beta.1)
@@ -93,7 +95,7 @@ GEM
       launchy (~> 2.1)
       mail (~> 2.2)
     erubis (2.7.0)
-    eventmachine (1.0.7)
+    eventmachine (1.0.9.1)
     eventmachine_httpserver (0.2.1)
     execjs (2.5.2)
     factory_girl (4.5.0)
@@ -105,6 +107,8 @@ GEM
     globalid (0.3.5)
       activesupport (>= 4.1.0)
     hike (1.2.3)
+    http-cookie (1.0.2)
+      domain_name (~> 0.5)
     http_parser.rb (0.6.0)
     i18n (0.7.0)
     interception (0.5)
@@ -124,6 +128,7 @@ GEM
     mini_portile (0.6.2)
     minitest (5.7.0)
     multi_json (1.11.2)
+    netrc (0.11.0)
     nokogiri (1.6.6.2)
       mini_portile (~> 0.6.0)
     orm_adapter (0.5.0)
@@ -144,11 +149,11 @@ GEM
     pry-stack_explorer (0.4.9.2)
       binding_of_caller (>= 0.7)
       pry (>= 0.9.11)
-    puffing-billy (0.5.1)
+    puffing-billy (0.6.2)
       addressable
       em-http-request (~> 1.1.0)
       em-synchrony
-      eventmachine
+      eventmachine (~> 1.0.4)
       eventmachine_httpserver
       http_parser.rb (~> 0.6.0)
       multi_json
@@ -184,6 +189,10 @@ GEM
     rake (10.4.2)
     responders (2.1.0)
       railties (>= 4.2.0, < 5)
+    rest-client (1.8.0)
+      http-cookie (>= 1.0.2, < 2.0)
+      mime-types (>= 1.16, < 3.0)
+      netrc (~> 0.7)
     rspec-core (3.3.2)
       rspec-support (~> 3.3.0)
     rspec-expectations (3.3.1)
@@ -209,7 +218,7 @@ GEM
       sass (~> 3.2.2)
       sprockets (~> 2.8, < 3.0)
       sprockets-rails (~> 2.0)
-    selenium-webdriver (2.46.2)
+    selenium-webdriver (2.49.0)
       childprocess (~> 0.5)
       multi_json (~> 1.0)
       rubyzip (~> 1.0)
@@ -230,6 +239,9 @@ GEM
       activesupport (>= 3.0)
       sprockets (>= 2.8, < 4.0)
     sqlite3 (1.3.10)
+    stripe (1.34.0)
+      json (~> 1.8.1)
+      rest-client (~> 1.4)
     symmetric-encryption (3.8.1)
       coercible (~> 1.0)
     thor (0.19.1)
@@ -242,6 +254,9 @@ GEM
     uglifier (2.7.1)
       execjs (>= 0.3.0)
       json (>= 1.8.0)
+    unf (0.1.4)
+      unf_ext
+    unf_ext (0.0.7.1)
     vcr (2.9.3)
     warden (1.2.3)
       rack (>= 1.0)
@@ -288,6 +303,7 @@ DEPENDENCIES
   spring
   spring-commands-rspec
   sqlite3
+  stripe
   symmetric-encryption (~> 3.8.1)
   turbolinks
   uglifier (>= 1.3.0)
diff --git a/README.md b/README.md
index daef333..dc99754 100644
--- a/README.md
+++ b/README.md
@@ -52,6 +52,7 @@ Hopefully this will be of help to those of you learning RSpec and Rails. If ther
   - [Routing Specs & Docs](#routing-specs--docs)
 - [Enable Spring for RSpec](#enable-spring-for-rspec)
 - [Automated Continuous Integration with Travis CI](#automated-continuous-integration-with-travis-ci)
+- [Stripe](#stripe)
 - [Contributors](#contributors)
 
 <!-- /MarkdownTOC -->
@@ -168,10 +169,11 @@ Capybara configuration how-to and examples:
 If you need to debug Puffing Billy, refer to its output in `log/test.log`.
 
 Puffing Billy configuration how-to and examples:
-- [spec/support/puffing_billy.rb](spec/support/puffing_billy.rb)
+- [spec/support/puffing_billy.rb](spec/support/puffing_billy.rb) - see comments on recording responses with `RECORD` environment variable
+- [spec/features/user_upgrades_spec.rb](spec/features/user_upgrades_spec.rb)
 - [spec/features/share_page_spec.rb](spec/features/share_page_spec.rb)
 - [Cache options](https://github.com/oesmith/puffing-billy#caching)
-- [Cached responses in spec/support/http_cache/billy](spec/support/http_cache/billy)
+- [Cached responses in spec/support/http_cache/browser](spec/support/http_cache/browser)
 
 
 # Shoulda-Matchers Examples
@@ -311,6 +313,19 @@ Travis CI configuration how-to and example:
 - [Our Travis CI build!](https://travis-ci.org/eliotsykes/rspec-rails-examples)
 - Our Travis CI badge (hopefully its green): [![Build Status](https://travis-ci.org/eliotsykes/rspec-rails-examples.svg?branch=master)](https://travis-ci.org/eliotsykes/rspec-rails-examples)
 
+
+# Stripe
+
+The app uses Stripe to handle payments for users wishing to upgrade their membership from standard to premium.
+
+You can test Stripe's JavaScript integration without being dependent on Stripe's test environment network availability. For reliable, faster tests, its usually a good idea to make your tests work independently of any 3rd party environments.
+
+To remove the dependency on Stripe's environment, the test suite relies on Puffing Billy mocking the Stripe HTTP responses in the browser.
+
+- [spec/features/user_upgrades_spec.rb](spec/features/user_upgrades_spec.rb)
+- [spec/support/http_cache/frontend/](spec/support/http_cache/frontend/) stores Stripe cached HTTP responses for Puffing Billy
+- [Stripe testing guide](https://stripe.com/docs/testing) with card numbers for testing different error states
+
 ---
 
 # Contributors
diff --git a/app/models/user.rb b/app/models/user.rb
index f010337..63f6ea2 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -5,9 +5,27 @@ class User < ActiveRecord::Base
          :recoverable, :rememberable, :trackable, :validatable,
          :confirmable, :lockable
 
+  STANDARD = 'standard'
+  PREMIUM = 'premium'
+  ROLES = [STANDARD, PREMIUM].freeze
+
+  validates_inclusion_of :role, in: ROLES
+
   has_many :access_tokens, dependent: :destroy
 
   def issue_access_token
     access_tokens.create!
   end
+  
+  def upgradeable?
+    standard?
+  end
+  
+  def standard?
+    STANDARD == role
+  end
+  
+  def upgrade
+    update!(role: PREMIUM)
+  end
 end
diff --git a/app/views/pages/index.html.erb b/app/views/pages/index.html.erb
index a76228c..f3f26e1 100644
--- a/app/views/pages/index.html.erb
+++ b/app/views/pages/index.html.erb
@@ -3,6 +3,19 @@
 <% if user_signed_in? %>
   <p>Hello, <%= current_user.email %></p>
   <nav><%= button_to "Log out", destroy_user_session_path, method: :delete %></nav>
+
+  <%= form_tag "/charge" do %>
+    <script
+      src="https://checkout.stripe.com/checkout.js" class="stripe-button"
+      data-key="<%= Rails.application.secrets.stripe_publishable_key %>"
+      data-label="Upgrade Membership"
+      data-name="RSpec Rails Examples"
+      data-description="Member Upgrade"
+      data-currency="usd"
+      data-amount="999">
+    </script>
+  <% end %>
+
 <% else %>
   <p>Not registered? <%= link_to "Sign up", new_user_registration_path %></p>
   <nav>
diff --git a/config/initializers/stripe.rb b/config/initializers/stripe.rb
new file mode 100644
index 0000000..24f7daf
--- /dev/null
+++ b/config/initializers/stripe.rb
@@ -0,0 +1 @@
+Stripe.api_key = Rails.application.secrets.stripe_secret_key
\ No newline at end of file
diff --git a/db/migrate/20151206175412_add_role_to_users.rb b/db/migrate/20151206175412_add_role_to_users.rb
new file mode 100644
index 0000000..5ab6afe
--- /dev/null
+++ b/db/migrate/20151206175412_add_role_to_users.rb
@@ -0,0 +1,5 @@
+class AddRoleToUsers < ActiveRecord::Migration
+  def change
+    add_column :users, :role, :string, default: "standard", null: false
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
index a6cc0ce..d7c1032 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -11,7 +11,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 20151024100339) do
+ActiveRecord::Schema.define(version: 20151206175412) do
 
   create_table "access_tokens", force: :cascade do |t|
     t.string   "locator",          null: false
@@ -47,12 +47,12 @@
   add_index "subscriptions", ["email"], name: "index_subscriptions_on_email", unique: true
 
   create_table "users", force: :cascade do |t|
-    t.string   "email",                  default: "", null: false
-    t.string   "encrypted_password",     default: "", null: false
+    t.string   "email",                  default: "",         null: false
+    t.string   "encrypted_password",     default: "",         null: false
     t.string   "reset_password_token"
     t.datetime "reset_password_sent_at"
     t.datetime "remember_created_at"
-    t.integer  "sign_in_count",          default: 0,  null: false
+    t.integer  "sign_in_count",          default: 0,          null: false
     t.datetime "current_sign_in_at"
     t.datetime "last_sign_in_at"
     t.string   "current_sign_in_ip"
@@ -61,11 +61,12 @@
     t.datetime "confirmed_at"
     t.datetime "confirmation_sent_at"
     t.string   "unconfirmed_email"
-    t.integer  "failed_attempts",        default: 0,  null: false
+    t.integer  "failed_attempts",        default: 0,          null: false
     t.string   "unlock_token"
     t.datetime "locked_at"
     t.datetime "created_at"
     t.datetime "updated_at"
+    t.string   "role",                   default: "standard", null: false
   end
 
   add_index "users", ["confirmation_token"], name: "index_users_on_confirmation_token", unique: true
diff --git a/db/seeds.rb b/db/seeds.rb
index 4edb1e8..54e9f51 100644
--- a/db/seeds.rb
+++ b/db/seeds.rb
@@ -1,7 +1,3 @@
-# This file should contain all the record creation needed to seed the database with its default values.
-# The data can then be loaded with the rake db:seed (or created alongside the db with db:setup).
-#
-# Examples:
-#
-#   cities = City.create([{ name: 'Chicago' }, { name: 'Copenhagen' }])
-#   Mayor.create(name: 'Emanuel', city: cities.first)
+if Rails.env.development?
+  User.create_with(password: 'password', confirmed_at: Time.zone.now).find_or_create_by!(email: 'a@a.a')
+end
diff --git a/spec/features/user_login_and_logout_spec.rb b/spec/features/user_login_and_logout_spec.rb
index ea5aede..a3870ab 100644
--- a/spec/features/user_login_and_logout_spec.rb
+++ b/spec/features/user_login_and_logout_spec.rb
@@ -62,12 +62,4 @@
 
   end
 
-  private
-
-  def login(email, password)
-    fill_in "Email", with: email
-    fill_in "Password", with: password
-    click_button "Log in"
-  end
-
 end
diff --git a/spec/features/user_upgrades_spec.rb b/spec/features/user_upgrades_spec.rb
new file mode 100644
index 0000000..2010132
--- /dev/null
+++ b/spec/features/user_upgrades_spec.rb
@@ -0,0 +1,32 @@
+require "rails_helper"
+
+feature "User upgrades", js: true do
+
+  scenario "successfully" do
+    with_browser_responses('stripe checkout') do
+      user = create(:user, role: "standard")
+
+      visit new_user_session_path
+      login user
+      click_button "Upgrade Membership"
+
+      Capybara.using_wait_time 5.seconds do
+        within_frame 'stripe_checkout_app' do
+          fill_in "Email", with: user.email
+          fill_in_stripe_field "#card_number", with: "4242 4242 4242 4242"
+          fill_in_stripe_field "#cc-exp", with: "12/22"
+          fill_in "CVC", with: '123'
+          click_button "Pay $9.99"
+        end
+        expect(page).to have_no_button "Upgrade Membership"
+      end
+      
+      expect(page).to have_content "Charged!"
+      expect(page).to have_content "Thank you for upgrading your membership!"
+      expect(user.reload.premium?).to eq true
+    end
+  end
+
+  xscenario "unsuccessfully"
+
+end
diff --git a/spec/models/user_spec.rb b/spec/models/user_spec.rb
index edcad0a..21cd85e 100644
--- a/spec/models/user_spec.rb
+++ b/spec/models/user_spec.rb
@@ -2,18 +2,19 @@
 
 describe User do
 
-  context 'validations' do
+  describe 'validations' do
     it { should validate_presence_of :email }
     it { should validate_presence_of :password }
     it { should validate_confirmation_of :password }
     it { should validate_uniqueness_of(:email).case_insensitive }
+    it { should validate_inclusion_of(:role).in_array(["standard", "premium"]) }
   end
 
-  context 'associations' do
+  describe 'associations' do
     it { should have_many(:access_tokens).dependent(:destroy) }
   end
 
-  context '#issue_access_token' do
+  describe '#issue_access_token' do
     it 'creates access token belonging to user' do
       user = create(:user)
 
@@ -26,4 +27,47 @@
     end
   end
 
+  describe '#role' do
+    it 'defaults to standard' do
+      expect(User.new.role).to eq "standard"
+    end
+  end
+  
+  describe '#upgradeable?' do
+    it 'returns true for standard user' do
+      standard_user = User.new(role: 'standard')
+      expect(standard_user.upgradeable?).to eq true
+    end
+    
+    it 'returns false for premium user' do
+      premium_user = User.new(role: 'premium')
+      expect(premium_user.upgradeable?).to eq false
+    end
+  end
+  
+  describe '#standard?' do
+    it 'returns true for standard user' do
+      standard_user = User.new(role: 'standard')
+      expect(standard_user.standard?).to eq true
+    end
+    
+    it 'returns false for premium user' do
+      premium_user = User.new(role: 'premium')
+      expect(premium_user.standard?).to eq false
+    end
+  end
+  
+  describe '#upgrade' do
+    it 'upgrades standard user to premium' do
+      user = create(:user, role: 'standard')
+      user.upgrade
+      expect(user.reload.role).to eq 'premium'
+    end
+    
+    it 'does not change premium user role' do
+      user = create(:user, role: 'premium')
+      user.upgrade
+      expect(user.reload.role).to eq 'premium'
+    end
+  end
 end
diff --git a/spec/support/capybara.rb b/spec/support/capybara.rb
index ff4d247..3cb25cb 100644
--- a/spec/support/capybara.rb
+++ b/spec/support/capybara.rb
@@ -28,4 +28,4 @@
 # --------------
 # http://www.rubydoc.info/github/jnicklas/capybara/master
 # Cheatsheet: https://gist.github.com/zhengjia/428105
-# Capybara matchers: http://www.rubydoc.info/github/jnicklas/capybara/master/Capybara/Node/Matchers
\ No newline at end of file
+# Capybara matchers: http://www.rubydoc.info/github/jnicklas/capybara/master/Capybara/Node/Matchers
diff --git a/spec/support/http_cache/billy/get_eliotsykes.github.io_14d848c4b4914df4e7ab6e2e3e4e4ec3ad51c16b.yml b/spec/support/http_cache/browser/get_eliotsykes.github.io_14d848c4b4914df4e7ab6e2e3e4e4ec3ad51c16b.yml
similarity index 100%
rename from spec/support/http_cache/billy/get_eliotsykes.github.io_14d848c4b4914df4e7ab6e2e3e4e4ec3ad51c16b.yml
rename to spec/support/http_cache/browser/get_eliotsykes.github.io_14d848c4b4914df4e7ab6e2e3e4e4ec3ad51c16b.yml
diff --git a/spec/support/http_cache/vcr/news_page.yml b/spec/support/http_cache/server/news_page.yml
similarity index 100%
rename from spec/support/http_cache/vcr/news_page.yml
rename to spec/support/http_cache/server/news_page.yml
diff --git a/spec/support/http_record.rb b/spec/support/http_record.rb
new file mode 100644
index 0000000..d3241d7
--- /dev/null
+++ b/spec/support/http_record.rb
@@ -0,0 +1,13 @@
+# To enable recording HTTP interactions temporarily, run the 
+# individual spec and prepend with RECORD set to true, e.g.:
+# RECORD=true bin/rspec spec/features/user_upgrades_spec.rb
+
+module HttpRecord
+  def self.off?
+    !on?
+  end
+  
+  def self.on?
+    'true' == ENV['RECORD']
+  end
+end
diff --git a/spec/support/login_helper.rb b/spec/support/login_helper.rb
new file mode 100644
index 0000000..1b74cc6
--- /dev/null
+++ b/spec/support/login_helper.rb
@@ -0,0 +1,23 @@
+module LoginHelper
+
+  def login(*args)
+    if args.size == 1 && args[0].is_a?(User)
+      user = args[0]
+      email = user.email
+      password = user.password
+    elsif args.size == 2
+      email, password = args
+    else
+      raise "Unable to handle args #{args.inspect}"
+    end
+
+    fill_in "Email", with: email
+    fill_in "Password", with: password
+    click_button "Log in"
+  end
+
+end
+
+RSpec.configure do |config|
+  config.include LoginHelper, type: :feature
+end
diff --git a/spec/support/puffing_billy.rb b/spec/support/puffing_billy.rb
index ea81ace..4c20a91 100644
--- a/spec/support/puffing_billy.rb
+++ b/spec/support/puffing_billy.rb
@@ -4,49 +4,118 @@
 #
 # 1. Puffing Billy depends on Capybara. Install Capybara as explained
 #    in spec/support/capybara.rb
-# 
+#
 # 2. Add puffing-billy to Gemfile:
 #
 # group :development, :test do
 #   gem 'puffing-billy'
 # end
-# 
-# 3. Create a file like this one you're reading in spec/support/puffing_billy.rb:
+#
+# 3. Create a file like this one you're reading in spec/support/puffing_billy.rb.
 require 'billy/rspec'
 
-# 4. Configure cache to behave as required. See all available options at:
+# 4. Copy the files in spec/support/ named below into your project:
+require_relative 'http_record'
+require_relative 'puffing_billy_extensions'
+
+# 5. Configure cache to behave as required. See all available options at:
 #    https://github.com/oesmith/puffing-billy#caching
 Billy.configure do |c|
+  stripe_urls_with_ignorable_query_string_params = [
+    'https://q.stripe.com/',
+    'https://api.stripe.com/v1/tokens'
+  ]
+
+  c.ignore_params += stripe_urls_with_ignorable_query_string_params
+  
+  stripe_html_url_pattern = %r{https://checkout\.stripe\.com(:443)?/v3/\w+\.html\?distinct_id=.+}
+  firefox_url_pattern = %r{\.mozilla\.com}
+  mixpanel_analytics_url_pattern = %r{api\.mixpanel\.com}
+  
+  # merge_cached_responses_whitelist are URI regex patterns for responses
+  # that will be merged into a single cached response. Useful for analytics,
+  # social buttons with minor URL variations. A response will be recorded
+  # once and reused.
+  c.merge_cached_responses_whitelist = [
+    stripe_html_url_pattern,
+    firefox_url_pattern,
+    mixpanel_analytics_url_pattern
+  ]
+  
   c.cache = true
   c.cache_request_headers = false
+  
+  fix_cors_header = proc do |_request, response|
+    allowed_origins = response[:headers]['Access-Control-Allow-Origin']
+    if allowed_origins.present?
+      localhost_port_pattern = %r{(?<=http://127\.0\.0\.1:)(\d+)}
+      allowed_origins.sub!(
+        localhost_port_pattern, Capybara.current_session.server.port.to_s
+      )
+    end
+  end
+  c.after_cache_handles_request = fix_cors_header
+  
   c.persist_cache = true
   c.non_successful_cache_disabled = false
   c.non_successful_error_level = :warn
 
   # cache_path is where responses from external URLs will be saved as YAML.
-  c.cache_path = "spec/support/http_cache/billy/"  
+  c.cache_path = "spec/support/http_cache/browser/"
 
   # Avoid having tests dependent on external URLs.
   #
-  # Only set non_whitelisted_requests_disabled **temporarily**
-  # to false when first recording a 3rd party interaction. After
-  # the recording has been stored to cache_path, then set
-  # non_whitelisted_requests_disabled back to true.
-  c.non_whitelisted_requests_disabled = true
+  # To enable recording new responses temporarily, run the individual spec
+  # and prepend with RECORD set to true:
+  # RECORD=true bin/rspec spec/features/user_upgrades_spec.rb
+  c.non_whitelisted_requests_disabled = HttpRecord.off?
 end
 
-# 5. Uncomment the *_billy driver for your desired browser:
+# VCR configured to ignore HTTP interactions handled by Puffing Billy
+if defined?(VCR)
+  VCR.configure do |config|
+    config.ignore_request { |request| handled_by_billy?(request) }
+  end
+
+  def handled_by_billy?(request)
+    browser_user_agent?(request) && puffing_billy_driver_active?
+  end
+
+  def browser_user_agent?(request)
+    user_agent = request.headers["User-Agent"].try(:first)
+    /Firefox/ === user_agent
+  end
+
+  def puffing_billy_driver_active?
+    /_billy\z/ === Capybara.current_driver
+  end
+
+end
+
+# 6. Uncomment the *_billy driver for your desired browser:
 Capybara.javascript_driver = :selenium_billy # Uses Firefox
 # Capybara.javascript_driver = :selenium_chrome_billy
 # Capybara.javascript_driver = :webkit_billy
 # Capybara.javascript_driver = :poltergeist_billy
 
-# 6. Start using Puffing Billy. See spec/features/share_page_spec.rb for an example,
-#    and find your cached responses in spec/support/http_cache/billy
+module BillyCache
+  # Use with_browser_responses('describe interactions here') do ... end
+  # in feature spec scenarios.
+  def with_browser_responses(scope, &block)
+    proxy.cache.with_scope(scope, &block)
+  end
+end
+
+RSpec.configure do |config|
+  config.include BillyCache, type: :feature
+end
+
+# 7. Start using Puffing Billy. See spec/features/share_page_spec.rb and
+#    spec/features/user_upgrades_spec.rb for sample usage,
+#    and find your cached responses in spec/support/http_cache/browser
 
 # Suggested docs
 # --------------
 # https://github.com/oesmith/puffing-billy
 # https://github.com/oesmith/puffing-billy#rspec-usage
 # https://github.com/oesmith/puffing-billy#caching
-
diff --git a/spec/support/puffing_billy_extensions.rb b/spec/support/puffing_billy_extensions.rb
new file mode 100644
index 0000000..abfc5ee
--- /dev/null
+++ b/spec/support/puffing_billy_extensions.rb
@@ -0,0 +1,31 @@
+# See https://github.com/oesmith/puffing-billy/issues/139
+module Billy
+  # puffing-billy/lib/billy/config.rb
+  class Config
+    attr_accessor :after_cache_handles_request
+  end
+
+  # puffing-billy/lib/billy/handlers/cache_handler.rb
+  class CacheHandler
+    def handle_request(method, url, headers, body)
+      method = method.downcase
+      if handles_request?(method, url, headers, body)
+        if (response = cache.fetch(method, url, body))
+          Billy.log(:info, "puffing-billy: CACHE #{method} for '#{url}'")
+
+          if Billy.config.dynamic_jsonp
+            replace_response_callback(response, url)
+          end
+          
+          if Billy.config.after_cache_handles_request
+            request = { method: method, url: url, headers: headers, body: body }
+            Billy.config.after_cache_handles_request.call(request, response)
+          end
+          
+          return response
+        end
+      end
+      nil
+    end
+  end  
+end
diff --git a/spec/support/stripe_helper.rb b/spec/support/stripe_helper.rb
new file mode 100644
index 0000000..e524ebd
--- /dev/null
+++ b/spec/support/stripe_helper.rb
@@ -0,0 +1,13 @@
+module StripeHelper
+
+  def fill_in_with_force(locator, options)
+    page.execute_script "$('#{locator}').val('#{options[:with]}');"
+  end
+
+  alias_method :fill_in_stripe_field, :fill_in_with_force
+
+end
+
+RSpec.configure do |config|
+  config.include StripeHelper, type: :feature
+end
diff --git a/spec/support/vcr.rb b/spec/support/vcr.rb
index 78522b6..4dfc743 100644
--- a/spec/support/vcr.rb
+++ b/spec/support/vcr.rb
@@ -9,19 +9,40 @@
 #   gem 'webmock'
 # end
 
-# 2. Create a file like this one you're reading in spec/support/vcr.rb
+# 2. Copy spec/support/webmock.rb into your project:
+require_relative 'webmock'
+
+# 3. Create a file like this one you're reading in spec/support/vcr.rb
 VCR.configure do |config|
-  config.cassette_library_dir = "spec/support/http_cache/vcr"
+  # To enable recording new responses temporarily, run the individual spec
+  # and prepend with RECORD set to true:
+  # RECORD=true bin/rspec spec/features/user_upgrades_spec.rb
+  record_mode = HttpRecord.on? ? :once : :none
+  config.default_cassette_options = {
+    decode_compressed_response: true,
+    allow_unused_http_interactions: false,
+    match_requests_on: [:method, :uri, :body],
+    record: record_mode
+  }
+  config.cassette_library_dir = "spec/support/http_cache/server"
   config.hook_into :webmock
 
   # Only want VCR to intercept requests to external URLs.
   config.ignore_localhost = true
+  
+  config.allow_http_connections_when_no_cassette = false
+  
+  # Temporarily enable config.debug_logger when debugging VCR:
+  config.debug_logger = File.open(Rails.root.join('log', 'vcr.log'), 'w')
 end
 
-# 3. Start using VCR. See example use in spec/jobs/headline_scraper_job_spec.rb.
-#    Cassettes will be stored as .yml files in cassette_library_dir specified above.
+# 4. Start using VCR. See example use in spec/jobs/headline_scraper_job_spec.rb,
+#    spec/features/user_upgrades_spec.rb.
+#
+#    Cassettes will be stored as .yml files in cassette_library_dir 
+#    specified above.
 
 # Suggested docs
 # --------------
 # https://relishapp.com/vcr/vcr/docs
-# http://www.rubydoc.info/gems/vcr/frames
\ No newline at end of file
+# http://www.rubydoc.info/gems/vcr/frames
diff --git a/spec/support/webmock.rb b/spec/support/webmock.rb
new file mode 100644
index 0000000..9f15344
--- /dev/null
+++ b/spec/support/webmock.rb
@@ -0,0 +1,6 @@
+require 'webmock/rspec'
+
+# 2. Copy spec/support/http_record.rb into your project:
+require_relative 'http_record'
+
+WebMock.disable_net_connect!(allow_localhost: true) if HttpRecord.off?