From 7933a1796b8b0e8178b54a2a12f4244064e4c457 Mon Sep 17 00:00:00 2001 From: John Allen Date: Thu, 16 May 2013 09:56:13 -0400 Subject: [PATCH] Spec setup updates, almost passing --- spec/grape_ams_spec.rb | 1 + spec/spec_helper.rb | 3 +++ 2 files changed, 4 insertions(+) diff --git a/spec/grape_ams_spec.rb b/spec/grape_ams_spec.rb index d7845fa..c9f90b5 100644 --- a/spec/grape_ams_spec.rb +++ b/spec/grape_ams_spec.rb @@ -1,5 +1,6 @@ require 'spec_helper' require 'spec_fakes' +require "grape-active_model_serializers" # require 'active_model' describe Grape::ActiveModelSerializers do diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb index d92f000..93ff130 100644 --- a/spec/spec_helper.rb +++ b/spec/spec_helper.rb @@ -5,11 +5,14 @@ require 'bundler' Bundler.setup :default, :test require 'active_support/core_ext/hash/conversions' +require 'active_record' require 'active_model' require "active_model_serializers" require "active_support/json" require 'rspec' require 'rack/test' + +ActiveRecord::Base.establish_connection :adapter => :nulldb, :schema => 'db/schema.rb' require 'nulldb_rspec' include NullDB::RSpec::NullifiedDatabase