From 26e36f58aad9475c11b9f766e448c4ce874cbaef Mon Sep 17 00:00:00 2001 From: Nathan Esquenazi Date: Sun, 2 Oct 2011 16:08:31 -0700 Subject: [PATCH] [fixtures] Add json sep to each Gemfile (okjson sucks) --- fixtures/padrino_test/Gemfile | 1 + fixtures/rails2/Gemfile | 1 + fixtures/rails3/Gemfile | 1 + fixtures/sinatra_test/Gemfile | 1 + fixtures/sinatra_test/app.rb | 1 + 5 files changed, 5 insertions(+) diff --git a/fixtures/padrino_test/Gemfile b/fixtures/padrino_test/Gemfile index 1451d003..aa14a7e1 100644 --- a/fixtures/padrino_test/Gemfile +++ b/fixtures/padrino_test/Gemfile @@ -13,4 +13,5 @@ gem 'rack-test', :require => "rack/test", :group => "test" # Padrino gem 'padrino', '0.10.2' +gem 'json' gem 'rabl', :path => File.expand_path(File.dirname(__FILE__) + "/../../") \ No newline at end of file diff --git a/fixtures/rails2/Gemfile b/fixtures/rails2/Gemfile index 88669f94..9903096e 100644 --- a/fixtures/rails2/Gemfile +++ b/fixtures/rails2/Gemfile @@ -1,6 +1,7 @@ source :gemcutter gem "rails", "~> 2.3.14" gem "sqlite3-ruby", :require => "sqlite3" +gem 'json' gem 'rabl', :path => File.expand_path(File.dirname(__FILE__) + "/../../") gem 'riot', :group => "test" diff --git a/fixtures/rails3/Gemfile b/fixtures/rails3/Gemfile index 7ade209e..aef2fbee 100644 --- a/fixtures/rails3/Gemfile +++ b/fixtures/rails3/Gemfile @@ -6,6 +6,7 @@ gem 'rails', '3.0.8' # gem 'rails', :git => 'git://github.com/rails/rails.git' gem 'sqlite3' +gem 'json' gem 'rabl', :path => File.expand_path(File.dirname(__FILE__) + "/../../") # TEST diff --git a/fixtures/sinatra_test/Gemfile b/fixtures/sinatra_test/Gemfile index 0b04d893..5c2b48e0 100644 --- a/fixtures/sinatra_test/Gemfile +++ b/fixtures/sinatra_test/Gemfile @@ -5,6 +5,7 @@ gem 'activerecord', :require => "active_record" gem 'sqlite3' gem 'sinatra', '>= 1.2.0' +gem 'json' gem 'rabl', :path => File.expand_path(File.dirname(__FILE__) + "/../../") # Test requirements diff --git a/fixtures/sinatra_test/app.rb b/fixtures/sinatra_test/app.rb index c8c2e9cd..e13decd6 100644 --- a/fixtures/sinatra_test/app.rb +++ b/fixtures/sinatra_test/app.rb @@ -3,6 +3,7 @@ require 'rabl' require 'active_support/core_ext' require 'active_support/inflector' +require 'active_record' require 'builder' ActiveRecord::Base.establish_connection(