-
-
Save pkoch/5d30ec04344d5072da7cf2477008429e to your computer and use it in GitHub Desktop.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/test/controllers/admin/admin_stats_controller_test.exs b/test/controllers/admin/admin_stats_controller_test.exs | |
index f3cbd21..7f7f79a 100644 | |
--- a/test/controllers/admin/admin_stats_controller_test.exs | |
+++ b/test/controllers/admin/admin_stats_controller_test.exs | |
@@ -58,4 +58,4 @@ defmodule Api.AdminStatsControllerTest do | |
} | |
} | |
end | |
-end | |
\ No newline at end of file | |
+end | |
diff --git a/test/controllers/admin/admin_team_controller_test.exs b/test/controllers/admin/admin_team_controller_test.exs | |
index 0086fef..e9153f1 100644 | |
--- a/test/controllers/admin/admin_team_controller_test.exs | |
+++ b/test/controllers/admin/admin_team_controller_test.exs | |
@@ -28,7 +28,7 @@ defmodule Api.Admin.TeamControllerTest do | |
test "shows chosen team", %{conn: conn, admin: admin, jwt: jwt} do | |
team = create_team(admin) | |
|> Repo.preload([:members, :project, :invites]) | |
- | |
+ | |
conn = conn | |
|> put_req_header("authorization", "Bearer #{jwt}") | |
|> get(admin_team_path(conn, :show, team)) | |
@@ -88,7 +88,7 @@ defmodule Api.Admin.TeamControllerTest do | |
conn = conn | |
|> put_req_header("authorization", "Bearer #{jwt}") | |
|> delete(admin_team_path(conn, :delete, team)) | |
- | |
+ | |
assert response(conn, 204) | |
refute Repo.get(Team, team.id) | |
end | |
@@ -101,17 +101,17 @@ defmodule Api.Admin.TeamControllerTest do | |
conn = conn | |
|> put_req_header("authorization", "Bearer #{jwt}") | |
|> delete(admin_team_path(conn, :remove, team, admin.id)) | |
- | |
+ | |
assert response(conn, 204) | |
end | |
test "can't remove membership if user isn't in the DB", %{conn: conn, jwt: jwt, admin: admin} do | |
team = create_team(admin) | |
- | |
+ | |
conn = conn | |
|> put_req_header("authorization", "Bearer #{jwt}") | |
|> delete(admin_team_path(conn, :remove, team, Ecto.UUID.generate())) | |
- | |
+ | |
assert response(conn, 422) | |
assert json_response(conn, 422)["errors"] == "User not found" | |
end | |
@@ -124,7 +124,7 @@ defmodule Api.Admin.TeamControllerTest do | |
conn = conn | |
|> delete(admin_team_path(conn, :remove, team, member.id)) | |
- | |
+ | |
assert response(conn, 401) | |
assert json_response(conn, 401)["errors"] == "Authentication required" | |
end | |
@@ -132,12 +132,12 @@ defmodule Api.Admin.TeamControllerTest do | |
test "can't remove membership if user isn't in the team", %{conn: conn, jwt: jwt, admin: admin} do | |
random_user = create_user(%{email: "user@example.com", password: "thisisapassword"}) | |
team = create_team(admin) | |
- | |
+ | |
conn = conn | |
|> put_req_header("authorization", "Bearer #{jwt}") | |
|> delete(admin_team_path(conn, :remove, team, random_user.id)) | |
- | |
+ | |
assert response(conn, 422) | |
assert json_response(conn, 422)["errors"] == "User isn't a member of team" | |
end | |
-end | |
\ No newline at end of file | |
+end | |
diff --git a/test/controllers/admin/admin_user_controller_test.exs b/test/controllers/admin/admin_user_controller_test.exs | |
index 122d4bc..c101d9d 100644 | |
--- a/test/controllers/admin/admin_user_controller_test.exs | |
+++ b/test/controllers/admin/admin_user_controller_test.exs | |
@@ -80,7 +80,7 @@ defmodule Api.AdminUserControllerTest do | |
conn = conn | |
|> put_req_header("authorization", "Bearer #{jwt}") | |
|> get(admin_user_path(conn, :show, admin)) | |
- | |
+ | |
assert json_response(conn, 200)["data"] == %{ | |
"id" => admin.id, | |
"first_name" => admin.first_name, | |
diff --git a/test/controllers/admin/admin_workshop_controller_test.exs b/test/controllers/admin/admin_workshop_controller_test.exs | |
index 955a4e5..1724a4f 100644 | |
--- a/test/controllers/admin/admin_workshop_controller_test.exs | |
+++ b/test/controllers/admin/admin_workshop_controller_test.exs | |
@@ -2,7 +2,7 @@ defmodule Api.Admin.WorkshopControllerTest do | |
use Api.ConnCase | |
alias Api.{Workshop, User} | |
- | |
+ | |
@valid_attrs %{ | |
slug: "some-content", | |
name: "some content", | |
@@ -137,7 +137,7 @@ defmodule Api.Admin.WorkshopControllerTest do | |
conn = conn | |
|> put_req_header("authorization", "Bearer #{jwt}") | |
|> delete(admin_workshop_path(conn, :delete, workshop)) | |
- | |
+ | |
assert response(conn, 204) | |
refute Repo.get_by(Workshop, slug: @valid_attrs.slug) | |
end | |
diff --git a/test/controllers/invite_controller_test.exs b/test/controllers/invite_controller_test.exs | |
index 7be3c58..e33abd5 100644 | |
--- a/test/controllers/invite_controller_test.exs | |
+++ b/test/controllers/invite_controller_test.exs | |
@@ -212,7 +212,7 @@ defmodule Api.InviteControllerTest do | |
conn = conn | |
|> put_req_header("authorization", "Bearer #{jwt}") | |
|> delete(invite_path(conn, :delete, invite)) | |
- | |
+ | |
assert response(conn, 204) | |
refute Repo.get(Invite, invite.id) | |
end | |
@@ -229,5 +229,5 @@ defmodule Api.InviteControllerTest do | |
|> post(invite_path(conn, :invite_to_slack, %{email: "error@example.com"})) | |
assert json_response(conn, 422)["errors"]["email"] == ["is already in the team"] | |
- end | |
+ end | |
end | |
diff --git a/test/controllers/project_controller_test.exs b/test/controllers/project_controller_test.exs | |
index d127b41..b650233 100644 | |
--- a/test/controllers/project_controller_test.exs | |
+++ b/test/controllers/project_controller_test.exs | |
@@ -2,7 +2,7 @@ defmodule Api.ProjectControllerTest do | |
use Api.ConnCase | |
alias Api.Project | |
- | |
+ | |
@valid_attrs %{ | |
description: "some content", | |
name: "some content", | |
@@ -106,7 +106,7 @@ defmodule Api.ProjectControllerTest do | |
conn = conn | |
|> put_req_header("authorization", "Bearer #{jwt}") | |
|> delete(project_path(conn, :delete, project)) | |
- | |
+ | |
assert response(conn, 204) | |
refute Repo.get(Project, project.id) | |
end | |
diff --git a/test/controllers/session_controller_test.exs b/test/controllers/session_controller_test.exs | |
index 2bb200b..e1c7dad 100644 | |
--- a/test/controllers/session_controller_test.exs | |
+++ b/test/controllers/session_controller_test.exs | |
@@ -75,7 +75,7 @@ defmodule Api.SessionControllerTest do | |
Repo.insert! %WorkshopAttendance{user_id: user.id, workshop_id: workshop.id} | |
{:ok, jwt, _} = Guardian.encode_and_sign(user) | |
- | |
+ | |
conn = conn | |
|> put_req_header("authorization", "Bearer #{jwt}") | |
|> get(session_path(conn, :me)) | |
@@ -121,7 +121,7 @@ defmodule Api.SessionControllerTest do | |
end | |
test "jwt checking returns 401 without token", %{conn: conn} do | |
- conn = conn | |
+ conn = conn | |
|> get(session_path(conn, :me)) | |
assert json_response(conn, 401)["errors"] == "Authentication required" | |
@@ -131,7 +131,7 @@ defmodule Api.SessionControllerTest do | |
create_user | |
conn = post(conn, session_path(conn, :create, @invalid_credentials)) | |
- | |
+ | |
assert json_response(conn, 422)["errors"] == "Wrong email or password" | |
end | |
-end | |
\ No newline at end of file | |
+end | |
diff --git a/test/controllers/team_controller_test.exs b/test/controllers/team_controller_test.exs | |
index 2df9f53..8e96da2 100644 | |
--- a/test/controllers/team_controller_test.exs | |
+++ b/test/controllers/team_controller_test.exs | |
@@ -35,7 +35,7 @@ defmodule Api.TeamControllerTest do | |
test "shows chosen team", %{conn: conn, user: user} do | |
team = create_team(user) | |
|> Repo.preload([:members, :project, :invites]) | |
- | |
+ | |
conn = get conn, team_path(conn, :show, team) | |
assert json_response(conn, 200)["data"] == %{ | |
"id" => team.id, | |
@@ -157,7 +157,7 @@ defmodule Api.TeamControllerTest do | |
conn = conn | |
|> put_req_header("authorization", "Bearer #{jwt}") | |
|> delete(team_path(conn, :delete, team)) | |
- | |
+ | |
assert response(conn, 204) | |
refute Repo.get(Team, team.id) | |
end | |
@@ -169,7 +169,7 @@ defmodule Api.TeamControllerTest do | |
conn = conn | |
|> put_req_header("authorization", "Bearer #{jwt}") | |
|> delete(team_path(conn, :delete, team)) | |
- | |
+ | |
assert json_response(conn, 401) | |
assert Repo.get(Team, team.id) | |
end | |
@@ -182,7 +182,7 @@ defmodule Api.TeamControllerTest do | |
conn = conn | |
|> put_req_header("authorization", "Bearer #{jwt}") | |
|> delete(team_path(conn, :remove, team, team_member.id)) | |
- | |
+ | |
assert response(conn, 204) | |
end | |
@@ -194,7 +194,7 @@ defmodule Api.TeamControllerTest do | |
conn = conn | |
|> put_req_header("authorization", "Bearer #{jwt}") | |
|> delete(team_path(conn, :remove, team, user.id)) | |
- | |
+ | |
assert response(conn, 204) | |
end | |
@@ -207,18 +207,18 @@ defmodule Api.TeamControllerTest do | |
conn = conn | |
|> put_req_header("authorization", "Bearer #{jwt}") | |
|> delete(team_path(conn, :remove, team, member.id)) | |
- | |
+ | |
assert response(conn, 401) | |
assert json_response(conn, 401)["errors"] == "Unauthorized" | |
end | |
test "can't remove membership if user isn't in the DB", %{conn: conn, jwt: jwt, user: user} do | |
team = create_team(user) | |
- | |
+ | |
conn = conn | |
|> put_req_header("authorization", "Bearer #{jwt}") | |
|> delete(team_path(conn, :remove, team, Ecto.UUID.generate())) | |
- | |
+ | |
assert response(conn, 422) | |
assert json_response(conn, 422)["errors"] == "User not found" | |
end | |
@@ -231,7 +231,7 @@ defmodule Api.TeamControllerTest do | |
conn = conn | |
|> delete(team_path(conn, :remove, team, member.id)) | |
- | |
+ | |
assert response(conn, 401) | |
assert json_response(conn, 401)["errors"] == "Authentication required" | |
end | |
@@ -239,11 +239,11 @@ defmodule Api.TeamControllerTest do | |
test "can't remove membership if user isn't in the team", %{conn: conn, jwt: jwt, user: user} do | |
random_user = create_user(%{email: "user@example.com", password: "thisisapassword"}) | |
team = create_team(user) | |
- | |
+ | |
conn = conn | |
|> put_req_header("authorization", "Bearer #{jwt}") | |
|> delete(team_path(conn, :remove, team, random_user.id)) | |
- | |
+ | |
assert response(conn, 422) | |
assert json_response(conn, 422)["errors"] == "User isn't a member of team" | |
end | |
@@ -253,12 +253,12 @@ defmodule Api.TeamControllerTest do | |
member = create_user(%{email: "user@example.com", password: "thisisapassword"}) | |
team = create_team(user, %{name: "awesome team", applied: true}) | |
Repo.insert! %TeamMember{user_id: member.id, team_id: team.id} | |
- | |
+ | |
conn = conn | |
|> put_req_header("authorization", "Bearer #{jwt}") | |
|> delete(team_path(conn, :remove, team, member.id)) | |
- | |
+ | |
assert response(conn, 422) | |
assert json_response(conn, 422)["errors"] == "Can't remove users after applying to the event" | |
end | |
-end | |
\ No newline at end of file | |
+end | |
diff --git a/test/controllers/user_controller_test.exs b/test/controllers/user_controller_test.exs | |
index 532ca7f..aad9485 100644 | |
--- a/test/controllers/user_controller_test.exs | |
+++ b/test/controllers/user_controller_test.exs | |
@@ -34,7 +34,7 @@ defmodule Api.UserControllerTest do | |
team = create_team(user) | |
conn = get conn, user_path(conn, :show, user) | |
- | |
+ | |
assert json_response(conn, 200)["data"] == %{ | |
"id" => user.id, | |
"first_name" => user.first_name, | |
@@ -66,7 +66,7 @@ defmodule Api.UserControllerTest do | |
Repo.insert! %TeamMember{user_id: team_member.id, team_id: team.id} | |
conn = get conn, user_path(conn, :show, team_member) | |
- | |
+ | |
assert json_response(conn, 200)["data"] == %{ | |
"id" => team_member.id, | |
"first_name" => team_member.first_name, | |
@@ -161,7 +161,7 @@ defmodule Api.UserControllerTest do | |
test "doesn't update user when data is invalid", %{conn: conn} do | |
user = Repo.insert! %User{} | |
{:ok, jwt, _} = Guardian.encode_and_sign(user) | |
- | |
+ | |
conn = conn | |
|> put_req_header("authorization", "Bearer #{jwt}") | |
|> put(user_path(conn, :update, user), user: @invalid_attrs) | |
@@ -171,7 +171,7 @@ defmodule Api.UserControllerTest do | |
test "doesn't update user when user is unauthenticated", %{conn: conn} do | |
user = Repo.insert! %User{} | |
- | |
+ | |
conn = put(conn, user_path(conn, :update, user), user: @invalid_attrs) | |
assert json_response(conn, 401)["errors"] == "Authentication required" | |
@@ -207,9 +207,9 @@ defmodule Api.UserControllerTest do | |
test "doesn't delete when request is unauthenticated", %{conn: conn} do | |
user = Repo.insert! %User{} | |
- | |
+ | |
conn = delete(conn, user_path(conn, :delete, user)) | |
assert json_response(conn, 401)["errors"] == "Authentication required" | |
- end | |
+ end | |
end | |
diff --git a/test/controllers/workshop_controller_test.exs b/test/controllers/workshop_controller_test.exs | |
index 28c4df0..9ac2260 100644 | |
--- a/test/controllers/workshop_controller_test.exs | |
+++ b/test/controllers/workshop_controller_test.exs | |
@@ -108,4 +108,4 @@ defmodule Api.WorkshopControllerTest do | |
assert response(conn, 422) | |
end | |
-end | |
\ No newline at end of file | |
+end | |
diff --git a/test/test_helper.exs b/test/test_helper.exs | |
index 162722c..4a16a15 100644 | |
--- a/test/test_helper.exs | |
+++ b/test/test_helper.exs | |
@@ -27,7 +27,7 @@ defmodule Api.TestHelper do | |
def create_admin(params \\ @valid_user_attrs) do | |
user_params = Kernel.struct(User, Map.merge(params, %{role: "admin"})) | |
- | |
+ | |
user_params | |
|> Repo.insert! | |
end | |
@@ -53,4 +53,4 @@ defmodule Api.TestHelper do | |
|> Invite.changeset(params) | |
|> Repo.insert! | |
end | |
-end | |
\ No newline at end of file | |
+end |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment