From 6e8757dd88d6b15addf7dbc1531120ef67fe6db3 Mon Sep 17 00:00:00 2001
From: Ignat Zakrevsky <iezakrevsky@gmail.com>
Date: Mon, 17 Nov 2014 12:04:36 +0300
Subject: [PATCH] Tests fixing.

---
 .../formatter_spec.rb                         |  2 +-
 spec/old_grape_ams_spec.rb                    | 21 ++++++++++---------
 2 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/spec/grape-active_model_serializers/formatter_spec.rb b/spec/grape-active_model_serializers/formatter_spec.rb
index 0529e9d..5c29ec9 100644
--- a/spec/grape-active_model_serializers/formatter_spec.rb
+++ b/spec/grape-active_model_serializers/formatter_spec.rb
@@ -48,7 +48,7 @@ describe Grape::Formatter::ActiveModelSerializers do
     it { should be_a UserSerializer }
 
     it 'should have correct scope set' do
-      expect(subject.scope).to eq(endpoint.current_user)
+      expect(subject.scope.current_user).to eq(endpoint.current_user)
     end
   end
 end
diff --git a/spec/old_grape_ams_spec.rb b/spec/old_grape_ams_spec.rb
index 5df8c6d..28ce100 100644
--- a/spec/old_grape_ams_spec.rb
+++ b/spec/old_grape_ams_spec.rb
@@ -7,6 +7,7 @@ require "grape-active_model_serializers"
 
 describe Grape::ActiveModelSerializers do
   let(:app) { Class.new(Grape::API) }
+  subject { last_response.body }
 
   before do
     app.format :json
@@ -19,7 +20,7 @@ describe Grape::ActiveModelSerializers do
       User.new
     end
     get("/home/users")
-    last_response.headers["Content-Type"].should == "application/json"
+    expect(last_response.headers["Content-Type"]).to eql "application/json"
   end
 
   context 'serializer is set to nil' do
@@ -28,9 +29,9 @@ describe Grape::ActiveModelSerializers do
         {user: {first_name: "JR", last_name: "HE"}}
       end
     end
-    it 'uses the built in grape serializer' do 
+    it 'uses the built in grape serializer' do
       get("/home")
-      last_response.body.should == "{\"user\":{\"first_name\":\"JR\",\"last_name\":\"HE\"}}"
+      expect(subject).to eql "{\"user\":{\"first_name\":\"JR\",\"last_name\":\"HE\"}}"
     end
   end
 
@@ -43,7 +44,7 @@ describe Grape::ActiveModelSerializers do
 
     it 'infers the serializer' do
       get "/home"
-      last_response.body.should == "{\"user\":{\"first_name\":\"JR\",\"last_name\":\"HE\"}}"
+      expect(subject).to eql "{\"user\":{\"first_name\":\"JR\",\"last_name\":\"HE\"}}"
     end
   end
 
@@ -54,7 +55,7 @@ describe Grape::ActiveModelSerializers do
     end
 
     get "/users"
-    last_response.body.should == "{\"users\":[{\"first_name\":\"JR\",\"last_name\":\"HE\"},{\"first_name\":\"JR\",\"last_name\":\"HE\"}]}"
+    expect(subject).to eql "{\"users\":[{\"first_name\":\"JR\",\"last_name\":\"HE\"},{\"first_name\":\"JR\",\"last_name\":\"HE\"}]}"
   end
 
   context "models with compound names" do
@@ -64,7 +65,7 @@ describe Grape::ActiveModelSerializers do
       end
 
       get "/home"
-      last_response.body.should == "{\"blog_post\":{\"title\":\"Grape AM::S Rocks!\",\"body\":\"Really, it does.\"}}"
+      expect(subject).to eql "{\"blog_post\":{\"title\":\"Grape AM::S Rocks!\",\"body\":\"Really, it does.\"}}"
     end
 
     it "generates the proper 'root' node for serialized arrays" do
@@ -74,7 +75,7 @@ describe Grape::ActiveModelSerializers do
       end
 
       get "/blog_posts"
-      last_response.body.should == "{\"blog_posts\":[{\"title\":\"Grape AM::S Rocks!\",\"body\":\"Really, it does.\"},{\"title\":\"Grape AM::S Rocks!\",\"body\":\"Really, it does.\"}]}"
+      expect(subject).to eql "{\"blog_posts\":[{\"title\":\"Grape AM::S Rocks!\",\"body\":\"Really, it does.\"},{\"title\":\"Grape AM::S Rocks!\",\"body\":\"Really, it does.\"}]}"
     end
   end
 
@@ -86,7 +87,7 @@ describe Grape::ActiveModelSerializers do
     end
 
     get "/admin/jeff"
-    last_response.body.should == "{\"user\":{\"first_name\":\"Jeff\",\"last_name\":null}}"
+    expect(subject).to eql "{\"user\":{\"first_name\":\"Jeff\",\"last_name\":null}}"
   end
 
   context 'route is in a namespace' do
@@ -99,7 +100,7 @@ describe Grape::ActiveModelSerializers do
       end
 
       get "/admin/jeff"
-      last_response.body.should == "{\"admin\":[{\"first_name\":\"Jeff\",\"last_name\":null},{\"first_name\":\"Jeff\",\"last_name\":null}]}"
+      expect(subject).to eql "{\"admin\":[{\"first_name\":\"Jeff\",\"last_name\":null},{\"first_name\":\"Jeff\",\"last_name\":null}]}"
     end
   end
 
@@ -111,7 +112,7 @@ describe Grape::ActiveModelSerializers do
       end
 
       get "/people"
-      last_response.body.should == "{\"people\":[{\"first_name\":\"Jeff\",\"last_name\":null},{\"first_name\":\"Jeff\",\"last_name\":null}]}"
+      expect(subject).to eql "{\"people\":[{\"first_name\":\"Jeff\",\"last_name\":null},{\"first_name\":\"Jeff\",\"last_name\":null}]}"
     end
   end
 end