API tools faq
paste
Advertisement
Guest User

Untitled

a guest
Sep 1st, 2017
454
0
Never
Add comment
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
text 12.81 KB | None | 0 0
raw download clone embed print report
  1. diff --git a/test/controllers/admin/admin_stats_controller_test.exs b/test/controllers/admin/admin_stats_controller_test.exs
  2. index f3cbd21..7f7f79a 100644
  3. --- a/test/controllers/admin/admin_stats_controller_test.exs
  4. +++ b/test/controllers/admin/admin_stats_controller_test.exs
  5. @@ -58,4 +58,4 @@ defmodule Api.AdminStatsControllerTest do
  6. }
  7. }
  8. end
  9. -end
  10. \ No newline at end of file
  11. +end
  12. diff --git a/test/controllers/admin/admin_team_controller_test.exs b/test/controllers/admin/admin_team_controller_test.exs
  13. index 0086fef..e9153f1 100644
  14. --- a/test/controllers/admin/admin_team_controller_test.exs
  15. +++ b/test/controllers/admin/admin_team_controller_test.exs
  16. @@ -28,7 +28,7 @@ defmodule Api.Admin.TeamControllerTest do
  17. test "shows chosen team", %{conn: conn, admin: admin, jwt: jwt} do
  18. team = create_team(admin)
  19. |> Repo.preload([:members, :project, :invites])
  20. -
  21. +
  22. conn = conn
  23. |> put_req_header("authorization", "Bearer #{jwt}")
  24. |> get(admin_team_path(conn, :show, team))
  25. @@ -88,7 +88,7 @@ defmodule Api.Admin.TeamControllerTest do
  26. conn = conn
  27. |> put_req_header("authorization", "Bearer #{jwt}")
  28. |> delete(admin_team_path(conn, :delete, team))
  29. -
  30. +
  31. assert response(conn, 204)
  32. refute Repo.get(Team, team.id)
  33. end
  34. @@ -101,17 +101,17 @@ defmodule Api.Admin.TeamControllerTest do
  35. conn = conn
  36. |> put_req_header("authorization", "Bearer #{jwt}")
  37. |> delete(admin_team_path(conn, :remove, team, admin.id))
  38. -
  39. +
  40. assert response(conn, 204)
  41. end
  42.  
  43. test "can't remove membership if user isn't in the DB", %{conn: conn, jwt: jwt, admin: admin} do
  44. team = create_team(admin)
  45. -
  46. +
  47. conn = conn
  48. |> put_req_header("authorization", "Bearer #{jwt}")
  49. |> delete(admin_team_path(conn, :remove, team, Ecto.UUID.generate()))
  50. -
  51. +
  52. assert response(conn, 422)
  53. assert json_response(conn, 422)["errors"] == "User not found"
  54. end
  55. @@ -124,7 +124,7 @@ defmodule Api.Admin.TeamControllerTest do
  56.  
  57. conn = conn
  58. |> delete(admin_team_path(conn, :remove, team, member.id))
  59. -
  60. +
  61. assert response(conn, 401)
  62. assert json_response(conn, 401)["errors"] == "Authentication required"
  63. end
  64. @@ -132,12 +132,12 @@ defmodule Api.Admin.TeamControllerTest do
  65. test "can't remove membership if user isn't in the team", %{conn: conn, jwt: jwt, admin: admin} do
  66. random_user = create_user(%{email: "user@example.com", password: "thisisapassword"})
  67. team = create_team(admin)
  68. -
  69. +
  70. conn = conn
  71. |> put_req_header("authorization", "Bearer #{jwt}")
  72. |> delete(admin_team_path(conn, :remove, team, random_user.id))
  73. -
  74. +
  75. assert response(conn, 422)
  76. assert json_response(conn, 422)["errors"] == "User isn't a member of team"
  77. end
  78. -end
  79. \ No newline at end of file
  80. +end
  81. diff --git a/test/controllers/admin/admin_user_controller_test.exs b/test/controllers/admin/admin_user_controller_test.exs
  82. index 122d4bc..c101d9d 100644
  83. --- a/test/controllers/admin/admin_user_controller_test.exs
  84. +++ b/test/controllers/admin/admin_user_controller_test.exs
  85. @@ -80,7 +80,7 @@ defmodule Api.AdminUserControllerTest do
  86. conn = conn
  87. |> put_req_header("authorization", "Bearer #{jwt}")
  88. |> get(admin_user_path(conn, :show, admin))
  89. -
  90. +
  91. assert json_response(conn, 200)["data"] == %{
  92. "id" => admin.id,
  93. "first_name" => admin.first_name,
  94. diff --git a/test/controllers/admin/admin_workshop_controller_test.exs b/test/controllers/admin/admin_workshop_controller_test.exs
  95. index 955a4e5..1724a4f 100644
  96. --- a/test/controllers/admin/admin_workshop_controller_test.exs
  97. +++ b/test/controllers/admin/admin_workshop_controller_test.exs
  98. @@ -2,7 +2,7 @@ defmodule Api.Admin.WorkshopControllerTest do
  99. use Api.ConnCase
  100.  
  101. alias Api.{Workshop, User}
  102. -
  103. +
  104. @valid_attrs %{
  105. slug: "some-content",
  106. name: "some content",
  107. @@ -137,7 +137,7 @@ defmodule Api.Admin.WorkshopControllerTest do
  108. conn = conn
  109. |> put_req_header("authorization", "Bearer #{jwt}")
  110. |> delete(admin_workshop_path(conn, :delete, workshop))
  111. -
  112. +
  113. assert response(conn, 204)
  114. refute Repo.get_by(Workshop, slug: @valid_attrs.slug)
  115. end
  116. diff --git a/test/controllers/invite_controller_test.exs b/test/controllers/invite_controller_test.exs
  117. index 7be3c58..e33abd5 100644
  118. --- a/test/controllers/invite_controller_test.exs
  119. +++ b/test/controllers/invite_controller_test.exs
  120. @@ -212,7 +212,7 @@ defmodule Api.InviteControllerTest do
  121. conn = conn
  122. |> put_req_header("authorization", "Bearer #{jwt}")
  123. |> delete(invite_path(conn, :delete, invite))
  124. -
  125. +
  126. assert response(conn, 204)
  127. refute Repo.get(Invite, invite.id)
  128. end
  129. @@ -229,5 +229,5 @@ defmodule Api.InviteControllerTest do
  130. |> post(invite_path(conn, :invite_to_slack, %{email: "error@example.com"}))
  131.  
  132. assert json_response(conn, 422)["errors"]["email"] == ["is already in the team"]
  133. - end
  134. + end
  135. end
  136. diff --git a/test/controllers/project_controller_test.exs b/test/controllers/project_controller_test.exs
  137. index d127b41..b650233 100644
  138. --- a/test/controllers/project_controller_test.exs
  139. +++ b/test/controllers/project_controller_test.exs
  140. @@ -2,7 +2,7 @@ defmodule Api.ProjectControllerTest do
  141. use Api.ConnCase
  142.  
  143. alias Api.Project
  144. -
  145. +
  146. @valid_attrs %{
  147. description: "some content",
  148. name: "some content",
  149. @@ -106,7 +106,7 @@ defmodule Api.ProjectControllerTest do
  150. conn = conn
  151. |> put_req_header("authorization", "Bearer #{jwt}")
  152. |> delete(project_path(conn, :delete, project))
  153. -
  154. +
  155. assert response(conn, 204)
  156. refute Repo.get(Project, project.id)
  157. end
  158. diff --git a/test/controllers/session_controller_test.exs b/test/controllers/session_controller_test.exs
  159. index 2bb200b..e1c7dad 100644
  160. --- a/test/controllers/session_controller_test.exs
  161. +++ b/test/controllers/session_controller_test.exs
  162. @@ -75,7 +75,7 @@ defmodule Api.SessionControllerTest do
  163. Repo.insert! %WorkshopAttendance{user_id: user.id, workshop_id: workshop.id}
  164.  
  165. {:ok, jwt, _} = Guardian.encode_and_sign(user)
  166. -
  167. +
  168. conn = conn
  169. |> put_req_header("authorization", "Bearer #{jwt}")
  170. |> get(session_path(conn, :me))
  171. @@ -121,7 +121,7 @@ defmodule Api.SessionControllerTest do
  172. end
  173.  
  174. test "jwt checking returns 401 without token", %{conn: conn} do
  175. - conn = conn
  176. + conn = conn
  177. |> get(session_path(conn, :me))
  178.  
  179. assert json_response(conn, 401)["errors"] == "Authentication required"
  180. @@ -131,7 +131,7 @@ defmodule Api.SessionControllerTest do
  181. create_user
  182.  
  183. conn = post(conn, session_path(conn, :create, @invalid_credentials))
  184. -
  185. +
  186. assert json_response(conn, 422)["errors"] == "Wrong email or password"
  187. end
  188. -end
  189. \ No newline at end of file
  190. +end
  191. diff --git a/test/controllers/team_controller_test.exs b/test/controllers/team_controller_test.exs
  192. index 2df9f53..8e96da2 100644
  193. --- a/test/controllers/team_controller_test.exs
  194. +++ b/test/controllers/team_controller_test.exs
  195. @@ -35,7 +35,7 @@ defmodule Api.TeamControllerTest do
  196. test "shows chosen team", %{conn: conn, user: user} do
  197. team = create_team(user)
  198. |> Repo.preload([:members, :project, :invites])
  199. -
  200. +
  201. conn = get conn, team_path(conn, :show, team)
  202. assert json_response(conn, 200)["data"] == %{
  203. "id" => team.id,
  204. @@ -157,7 +157,7 @@ defmodule Api.TeamControllerTest do
  205. conn = conn
  206. |> put_req_header("authorization", "Bearer #{jwt}")
  207. |> delete(team_path(conn, :delete, team))
  208. -
  209. +
  210. assert response(conn, 204)
  211. refute Repo.get(Team, team.id)
  212. end
  213. @@ -169,7 +169,7 @@ defmodule Api.TeamControllerTest do
  214. conn = conn
  215. |> put_req_header("authorization", "Bearer #{jwt}")
  216. |> delete(team_path(conn, :delete, team))
  217. -
  218. +
  219. assert json_response(conn, 401)
  220. assert Repo.get(Team, team.id)
  221. end
  222. @@ -182,7 +182,7 @@ defmodule Api.TeamControllerTest do
  223. conn = conn
  224. |> put_req_header("authorization", "Bearer #{jwt}")
  225. |> delete(team_path(conn, :remove, team, team_member.id))
  226. -
  227. +
  228. assert response(conn, 204)
  229. end
  230.  
  231. @@ -194,7 +194,7 @@ defmodule Api.TeamControllerTest do
  232. conn = conn
  233. |> put_req_header("authorization", "Bearer #{jwt}")
  234. |> delete(team_path(conn, :remove, team, user.id))
  235. -
  236. +
  237. assert response(conn, 204)
  238. end
  239.  
  240. @@ -207,18 +207,18 @@ defmodule Api.TeamControllerTest do
  241. conn = conn
  242. |> put_req_header("authorization", "Bearer #{jwt}")
  243. |> delete(team_path(conn, :remove, team, member.id))
  244. -
  245. +
  246. assert response(conn, 401)
  247. assert json_response(conn, 401)["errors"] == "Unauthorized"
  248. end
  249.  
  250. test "can't remove membership if user isn't in the DB", %{conn: conn, jwt: jwt, user: user} do
  251. team = create_team(user)
  252. -
  253. +
  254. conn = conn
  255. |> put_req_header("authorization", "Bearer #{jwt}")
  256. |> delete(team_path(conn, :remove, team, Ecto.UUID.generate()))
  257. -
  258. +
  259. assert response(conn, 422)
  260. assert json_response(conn, 422)["errors"] == "User not found"
  261. end
  262. @@ -231,7 +231,7 @@ defmodule Api.TeamControllerTest do
  263.  
  264. conn = conn
  265. |> delete(team_path(conn, :remove, team, member.id))
  266. -
  267. +
  268. assert response(conn, 401)
  269. assert json_response(conn, 401)["errors"] == "Authentication required"
  270. end
  271. @@ -239,11 +239,11 @@ defmodule Api.TeamControllerTest do
  272. test "can't remove membership if user isn't in the team", %{conn: conn, jwt: jwt, user: user} do
  273. random_user = create_user(%{email: "user@example.com", password: "thisisapassword"})
  274. team = create_team(user)
  275. -
  276. +
  277. conn = conn
  278. |> put_req_header("authorization", "Bearer #{jwt}")
  279. |> delete(team_path(conn, :remove, team, random_user.id))
  280. -
  281. +
  282. assert response(conn, 422)
  283. assert json_response(conn, 422)["errors"] == "User isn't a member of team"
  284. end
  285. @@ -253,12 +253,12 @@ defmodule Api.TeamControllerTest do
  286. member = create_user(%{email: "user@example.com", password: "thisisapassword"})
  287. team = create_team(user, %{name: "awesome team", applied: true})
  288. Repo.insert! %TeamMember{user_id: member.id, team_id: team.id}
  289. -
  290. +
  291. conn = conn
  292. |> put_req_header("authorization", "Bearer #{jwt}")
  293. |> delete(team_path(conn, :remove, team, member.id))
  294. -
  295. +
  296. assert response(conn, 422)
  297. assert json_response(conn, 422)["errors"] == "Can't remove users after applying to the event"
  298. end
  299. -end
  300. \ No newline at end of file
  301. +end
  302. diff --git a/test/controllers/user_controller_test.exs b/test/controllers/user_controller_test.exs
  303. index 532ca7f..aad9485 100644
  304. --- a/test/controllers/user_controller_test.exs
  305. +++ b/test/controllers/user_controller_test.exs
  306. @@ -34,7 +34,7 @@ defmodule Api.UserControllerTest do
  307. team = create_team(user)
  308.  
  309. conn = get conn, user_path(conn, :show, user)
  310. -
  311. +
  312. assert json_response(conn, 200)["data"] == %{
  313. "id" => user.id,
  314. "first_name" => user.first_name,
  315. @@ -66,7 +66,7 @@ defmodule Api.UserControllerTest do
  316. Repo.insert! %TeamMember{user_id: team_member.id, team_id: team.id}
  317.  
  318. conn = get conn, user_path(conn, :show, team_member)
  319. -
  320. +
  321. assert json_response(conn, 200)["data"] == %{
  322. "id" => team_member.id,
  323. "first_name" => team_member.first_name,
  324. @@ -161,7 +161,7 @@ defmodule Api.UserControllerTest do
  325. test "doesn't update user when data is invalid", %{conn: conn} do
  326. user = Repo.insert! %User{}
  327. {:ok, jwt, _} = Guardian.encode_and_sign(user)
  328. -
  329. +
  330. conn = conn
  331. |> put_req_header("authorization", "Bearer #{jwt}")
  332. |> put(user_path(conn, :update, user), user: @invalid_attrs)
  333. @@ -171,7 +171,7 @@ defmodule Api.UserControllerTest do
  334.  
  335. test "doesn't update user when user is unauthenticated", %{conn: conn} do
  336. user = Repo.insert! %User{}
  337. -
  338. +
  339. conn = put(conn, user_path(conn, :update, user), user: @invalid_attrs)
  340.  
  341. assert json_response(conn, 401)["errors"] == "Authentication required"
  342. @@ -207,9 +207,9 @@ defmodule Api.UserControllerTest do
  343.  
  344. test "doesn't delete when request is unauthenticated", %{conn: conn} do
  345. user = Repo.insert! %User{}
  346. -
  347. +
  348. conn = delete(conn, user_path(conn, :delete, user))
  349.  
  350. assert json_response(conn, 401)["errors"] == "Authentication required"
  351. - end
  352. + end
  353. end
  354. diff --git a/test/controllers/workshop_controller_test.exs b/test/controllers/workshop_controller_test.exs
  355. index 28c4df0..9ac2260 100644
  356. --- a/test/controllers/workshop_controller_test.exs
  357. +++ b/test/controllers/workshop_controller_test.exs
  358. @@ -108,4 +108,4 @@ defmodule Api.WorkshopControllerTest do
  359.  
  360. assert response(conn, 422)
  361. end
  362. -end
  363. \ No newline at end of file
  364. +end
  365. diff --git a/test/test_helper.exs b/test/test_helper.exs
  366. index 162722c..4a16a15 100644
  367. --- a/test/test_helper.exs
  368. +++ b/test/test_helper.exs
  369. @@ -27,7 +27,7 @@ defmodule Api.TestHelper do
  370.  
  371. def create_admin(params \\ @valid_user_attrs) do
  372. user_params = Kernel.struct(User, Map.merge(params, %{role: "admin"}))
  373. -
  374. +
  375. user_params
  376. |> Repo.insert!
  377. end
  378. @@ -53,4 +53,4 @@ defmodule Api.TestHelper do
  379. |> Invite.changeset(params)
  380. |> Repo.insert!
  381. end
  382. -end
  383. \ No newline at end of file
  384. +end
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement
Public Pastes
Advertisement
We use cookies for various purposes including analytics. By continuing to use Pastebin, you agree to our use of cookies as described in the Cookies Policy.  OK, I Understand
Not a member of Pastebin yet?
Sign Up, it unlocks many cool features!