Merge pull request #1346 from code-corps/fix-project-user-issue

Fix project user response
code-corps · Dec 27, 2017 · 810cc30 · 810cc30
2 parents 166ff1a + 70ff403
commit 810cc30
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/lib/code_corps_web/controllers/project_user_controller.ex b/lib/code_corps_web/controllers/project_user_controller.ex
@@ -43,7 +43,7 @@ defmodule CodeCorpsWeb.ProjectUserController do
          {:ok, %ProjectUser{} = updated_project_user} <- project_user |> ProjectUser.update_changeset(params) |> Repo.update,
          _ <- maybe_send_update_email(updated_project_user, project_user)
     do
-      conn |> render("show.json-api", data: project_user)
+      conn |> render("show.json-api", data: updated_project_user)
     end
   end
 

diff --git a/test/lib/code_corps_web/controllers/project_user_controller_test.exs b/test/lib/code_corps_web/controllers/project_user_controller_test.exs
@@ -2,8 +2,6 @@ defmodule CodeCorpsWeb.ProjectUserControllerTest do
   use CodeCorpsWeb.ApiCase, resource_name: :project_user
   use Bamboo.Test
 
-  @attrs %{role: "contributor"}
-
   describe "index" do
     test "lists all resources", %{conn: conn} do
       [record_1, record_2] = insert_pair(:project_user)
@@ -102,7 +100,10 @@ defmodule CodeCorpsWeb.ProjectUserControllerTest do
       record = insert(:project_user, project: project, role: "pending")
       insert(:project_user, project: project, user: current_user, role: "owner")
 
-      assert conn |> request_update(record, @attrs) |> json_response(200)
+      params = %{role: "contributor"}
+      json = conn |> request_update(record, params) |> json_response(200)
+
+      assert json["data"]["attributes"]["role"] == "contributor"
 
       user_id = current_user.id