spec_helper.rb in barista-1.3.0

- old
+ new

@@ -1,11 +1,22 @@
+require 'rubygems'
+
 ENV['RAILS_ENV'] ||= 'test'
+ENV['RAILS_ROOT'] ||= File.expand_path("..", __FILE__)
 
-require 'bundler/setup'
+require "action_controller/railtie"
+require "action_mailer/railtie"
+require "active_resource/railtie"
 
-spec_dir = Rails.root.join("spec")
+require 'rspec/rails'
 
-Dir[spec_dir.join("support/**/*.rb")].each { |f| require f }
+Bundler.require(:default, Rails.env) if defined?(Bundler)
 
+class Application < Rails::Application; end
+
+require 'barista'
+
 RSpec.configure do |config|
-  config.mock_with :rr
-end
\ No newline at end of file
+  config.mock_with :rspec
+  config.expect_with :rspec
+end
+