ditkrg/active_model_serializers
4
0
Fork 0
mirror of https://github.com/ditkrg/active_model_serializers.git synced 2026-01-22 22:06:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #644 from tricknotes/fix-0.8-tests

Browse Source 
Fix to run 0.8-stable's tests
This commit is contained in:
Steve Klabnik 2014-09-20 17:46:30 -04:00
commit d996d136e4
3 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
active_model_serializers.gemspec
View File

@ -20,4 +20,5 @@ Gem::Specification.new do |gem|
gem.add_dependency 'activemodel', '>= 3.0' gem.add_dependency 'activemodel', '>= 3.0'
gem.add_development_dependency "rails", ">= 3.0" gem.add_development_dependency "rails", ">= 3.0"
gem.add_development_dependency "pry" gem.add_development_dependency "pry"
gem.add_development_dependency "minitest"
end end

2
test/serialization_test.rb
View File

@ -84,8 +84,6 @@ class RenderJsonTest < ActionController::TestCase
end end
class TestController < ActionController::Base class TestController < ActionController::Base
protect_from_forgery
serialization_scope :current_user serialization_scope :current_user
attr_reader :current_user attr_reader :current_user

2
test/test_helper.rb
View File

@ -5,7 +5,7 @@ require "pry"
require "active_model_serializers" require "active_model_serializers"
require "active_support/json" require "active_support/json"
require "test/unit" require "minitest/autorun"
require 'rails' require 'rails'