From bb8bedad630de2c2abe6958d78099c16616327d0 Mon Sep 17 00:00:00 2001
From: Ryunosuke SATO <tricknotes.rs@gmail.com>
Date: Mon, 8 Sep 2014 18:59:00 +0900
Subject: [PATCH 1/2] Fix to run tests

---
 active_model_serializers.gemspec | 1 +
 test/test_helper.rb              | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/active_model_serializers.gemspec b/active_model_serializers.gemspec
index 1d30e1c4..c5724df9 100644
--- a/active_model_serializers.gemspec
+++ b/active_model_serializers.gemspec
@@ -20,4 +20,5 @@ Gem::Specification.new do |gem|
   gem.add_dependency 'activemodel', '>= 3.0'
   gem.add_development_dependency "rails", ">= 3.0"
   gem.add_development_dependency "pry"
+  gem.add_development_dependency "minitest"
 end
diff --git a/test/test_helper.rb b/test/test_helper.rb
index ecee123c..e36c3700 100644
--- a/test/test_helper.rb
+++ b/test/test_helper.rb
@@ -5,7 +5,7 @@ require "pry"
 
 require "active_model_serializers"
 require "active_support/json"
-require "test/unit"
+require "minitest/autorun"
 
 require 'rails'
 

From f77362e9d642c566d6a08d7f5ce1dd0f18037d14 Mon Sep 17 00:00:00 2001
From: Ryunosuke SATO <tricknotes.rs@gmail.com>
Date: Mon, 8 Sep 2014 19:09:07 +0900
Subject: [PATCH 2/2] Disabled `protect_from_forgery`

Because of the following error:
```
ActionController::InvalidCrossOriginRequest: Security warning: an
embedded <script> tag on another site requested protected JavaScript. If
you know what you're doing, go ahead and disable forgery protection on
this action to permit cross-origin JavaScript embedding.
```
---
 test/serialization_test.rb | 2 --
 1 file changed, 2 deletions(-)

diff --git a/test/serialization_test.rb b/test/serialization_test.rb
index c5e1bbe3..a9285820 100644
--- a/test/serialization_test.rb
+++ b/test/serialization_test.rb
@@ -84,8 +84,6 @@ class RenderJsonTest < ActionController::TestCase
   end
 
   class TestController < ActionController::Base
-    protect_from_forgery
-
     serialization_scope :current_user
     attr_reader :current_user