Merge branch 'master' into paypalrecurring

tests/acceptance/environment.rb

@@ -1,9 +1,12 @@
 require_relative '../environment'
 
+require 'capybara'
+require 'capybara/dsl'
+require 'capybara/poltergeist'
+require 'rack_session_access/capybara'
+
 Capybara.app = Sinatra::Application
 
 def teardown
   Capybara.reset_sessions!
 end
-
-Capybara.default_wait_time = 5

tests/environment.rb

@@ -4,7 +4,7 @@ raise 'Forget it.' if ENV['RACK_ENV'] == 'production'
 require 'coveralls'
 require 'simplecov'
 
-SimpleCov.formatter = SimpleCov::Formatter::MultiFormatter[
+SimpleCov.formatters = [
   SimpleCov::Formatter::HTMLFormatter,
   Coveralls::SimpleCov::Formatter
 ]
@@ -35,9 +35,6 @@ Sinatra::Application.configure do |app|
   app.use RackSessionAccess::Middleware
 end
 
-require 'capybara/poltergeist'
-require 'rack_session_access/capybara'
-
 Site.bcrypt_cost = BCrypt::Engine::MIN_COST
 
 MiniTest::Reporters.use! MiniTest::Reporters::SpecReporter.new