Adds serializer to activity controller, and unit tests to activity and user controllers

app/controllers/api/v1/activities_controller.rb

@@ -3,11 +3,11 @@ class Api::V1::ActivitiesController < ApplicationController
   before_action :check_login
 
   def index
-    render json: Activity.all
+    render json: ActivitySerializer.new(Activity.all).serializable_hash.to_json
   end
 
   def show
-    render json: Activity.find(params[:id])
+    render json: ActivitySerializer.new(@activity).serializable_hash.to_json
   end
 
   def create
@@ -17,7 +17,7 @@ class Api::V1::ActivitiesController < ApplicationController
         user_id: current_user.id,
         activity_id: activity.id
       )
-      render json: activity, status: :created
+      render json: ActivitySerializer.new(activity).serializable_hash.to_json, status: :created
     else
       render json: { errors: activity.errors }, status: :unprocessable_entity
     end
@@ -25,7 +25,7 @@ class Api::V1::ActivitiesController < ApplicationController
 
   def update
     if @activity.update(activity_params)
-      render json: @activity
+      render json: ActivitySerializer.new(@activity).serializable_hash.to_json
     else
       render json: @activity.errors, status: :unprocessable_entity
     end

app/serializers/activity_serializer.rb

@@ -0,0 +1,4 @@
+class ActivitySerializer
+  include JSONAPI::Serializer
+  attributes :name, :author_id, :description, :client
+end

test/controllers/api/v1/activities_controller_test.rb

@@ -25,6 +25,12 @@ class Api::V1::ActivitiesControllerTest < ActionDispatch::IntegrationTest
     headers: { Authorization: JsonWebToken.encode(user_id: @activity.author_id) },
     as: :json
     assert_response :success
+
+    json_response = JSON.parse(self.response.body)
+    assert_equal @activity.name, json_response['data']['attributes']['name']
+    assert_equal @activity.author_id, json_response['data']['attributes']['author_id']
+    assert_equal @activity.description, json_response['data']['attributes']['description']
+    assert_equal @activity.client, json_response['data']['attributes']['client']
   end
 
   test "should not access show" do

test/controllers/api/v1/users_controller_test.rb

@@ -10,8 +10,10 @@ class Api::V1::UsersControllerTest < ActionDispatch::IntegrationTest
     get api_v1_user_url(@user), as: :json
     assert_response :success
     # Test to ensure response contains the correct email
+
     json_response = JSON.parse(self.response.body)
     assert_equal @user.email, json_response['data']['attributes']['email']
+    assert_equal @user.username, json_response['data']['attributes']['username']
   end
 
   #CREATE