sjs/grape-active_model_serializers
1
0
Fork 0
mirror of https://github.com/samsonjs/grape-active_model_serializers.git synced 2026-04-27 14:57:43 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #8 from blackxored/small-fixes

Browse source 
Fixes the build and upgrades the locked gems
This commit is contained in:
jrhe 2013-08-10 16:12:30 -07:00
commit e3fa92406b
2 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
Gemfile.lock
View file

@ -2,7 +2,7 @@ PATH
remote: . remote: .
specs: specs:
grape-active_model_serializers (0.1.0) grape-active_model_serializers (0.1.0)
active_model_serializers (~> 0.8.0) active_model_serializers (>= 0.8.1)
grape (~> 0.3) grape (~> 0.3)
GEM GEM
@ -24,11 +24,11 @@ GEM
i18n (= 0.6.1) i18n (= 0.6.1)
multi_json (~> 1.0) multi_json (~> 1.0)
arel (3.0.2) arel (3.0.2)
backports (2.6.7) backports (3.3.3)
builder (3.0.4) builder (3.0.4)
descendants_tracker (0.0.1) descendants_tracker (0.0.1)
diff-lcs (1.1.3) diff-lcs (1.1.3)
grape (0.4.1) grape (0.5.0)
activesupport activesupport
builder builder
hashie (>= 1.2.0) hashie (>= 1.2.0)
@ -41,7 +41,7 @@ GEM
hashie (2.0.5) hashie (2.0.5)
i18n (0.6.1) i18n (0.6.1)
multi_json (1.7.3) multi_json (1.7.3)
multi_xml (0.5.3) multi_xml (0.5.4)
rack (1.5.2) rack (1.5.2)
rack-accept (0.4.5) rack-accept (0.4.5)
rack (>= 0.4) rack (>= 0.4)
@ -59,8 +59,8 @@ GEM
diff-lcs (~> 1.1.3) diff-lcs (~> 1.1.3)
rspec-mocks (2.12.2) rspec-mocks (2.12.2)
tzinfo (0.3.37) tzinfo (0.3.37)
virtus (0.5.4) virtus (0.5.5)
backports (~> 2.6.1) backports (~> 3.3)
descendants_tracker (~> 0.0.1) descendants_tracker (~> 0.0.1)
PLATFORMS PLATFORMS

4
spec/grape_ams_spec.rb
View file

@ -28,8 +28,8 @@ describe Grape::ActiveModelSerializers do
end end
it "should respond with proper content-type" do it "should respond with proper content-type" do
subject.get("/home/users", :serializer => "user") do subject.get("/home/users", :serializer => UserSerializer) do
{user: {first_name: "JR", last_name: "HE"}} User.new
end end
get("/home/users") get("/home/users")
last_response.headers["Content-Type"].should == "application/json" last_response.headers["Content-Type"].should == "application/json"