Merge fb4dc6a into fc37fa2

spec/controllers/password_resets_controller_spec.rb

@@ -26,7 +26,7 @@
 
       it "renders a success notice" do
         post :create, params
-        expect(JSON.parse(response.body)).to eq(["reset sent"])
+        expect(json).to eq(["reset sent"])
       end
     end
 
@@ -40,7 +40,7 @@
 
       it "renders an error" do
         post :create, params
-        expect(JSON.parse(response.body)).to eq(["reset failed"])
+        expect(json).to eq(["reset failed"])
       end
     end
   end
@@ -81,7 +81,7 @@
 
       it "renders a success notice" do
         patch :update, params
-        expect(JSON.parse(response.body)).to eq(["password updated"])
+        expect(json).to eq(["password updated"])
       end
     end
 
@@ -95,7 +95,7 @@
 
       it "renders an error" do
         patch :update, params
-        expect(JSON.parse(response.body)).to eq(["update failed"])
+        expect(json).to eq(["update failed"])
       end
     end
   end

spec/controllers/users_controller_spec.rb

@@ -1,5 +1,3 @@
-include Helpers
-
 RSpec.describe UsersController do
   let(:user) { create(:unconfirmed_user) }
 
@@ -73,7 +71,7 @@
       it "returns an error" do
         user.errors.add(:email, "error")
         post :create, params
-        expect(JSON.parse(response.body)).to eq("email" => ["error"])
+        expect(json["email"]).to eq(["error"])
       end
     end
   end
@@ -109,7 +107,7 @@
 
       it "render the user as JSON" do
         get :show, params
-        expect(response.body).to eq(user.to_json)
+        expect(serialize(user)).to eq(response.body)
       end
     end
 

spec/rails_helper.rb

@@ -57,6 +57,9 @@
   # arbitrary gems may also be filtered via:
   # config.filter_gems_from_backtrace("gem name")
   config.include FactoryGirl::Syntax::Methods
+
+  # include custom helpers for authentication, json formatting, etc.
+  config.include RequestHelpers
 end
 
 require "simplecov"

spec/support/request_helpers.rb

@@ -0,0 +1,14 @@
+module RequestHelpers
+  def json
+    JSON.parse(response.body)
+  end
+
+  def authenticate
+    token = Knock::AuthToken.new(payload: { sub: user.id }).token
+    request.env["HTTP_AUTHORIZATION"] = "bearer #{token}"
+  end
+
+  def serialize(resource)
+    ActiveModel::SerializableResource.new(resource).to_json
+  end
+end