Skip to content

Commit d41d2d0

Browse files
committed
Make the tests honest
1 parent 07204de commit d41d2d0

File tree

3 files changed

+8
-54
lines changed

3 files changed

+8
-54
lines changed

test/controllers/page_controller_test.exs

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,6 @@ defmodule Beanie.PageControllerTest do
33

44
test "GET /", %{conn: conn} do
55
conn = get conn, "/"
6-
assert html_response(conn, 200) =~ "Welcome to Phoenix!"
6+
assert html_response(conn, 200) =~ "Beanie"
77
end
88
end

test/controllers/repository_controller_test.exs

+7-28
Original file line numberDiff line numberDiff line change
@@ -3,31 +3,17 @@ defmodule Beanie.RepositoryControllerTest do
33

44
alias Beanie.Repository
55
@valid_attrs %{name: "some content"}
6-
@invalid_attrs %{}
6+
@invalid_attrs %{name: nil}
7+
8+
@valid_repository %Repository{name: "name"}
79

810
test "lists all entries on index", %{conn: conn} do
911
conn = get conn, repository_path(conn, :index)
1012
assert html_response(conn, 200) =~ "Listing repositories"
1113
end
1214

13-
test "renders form for new resources", %{conn: conn} do
14-
conn = get conn, repository_path(conn, :new)
15-
assert html_response(conn, 200) =~ "New repository"
16-
end
17-
18-
test "creates resource and redirects when data is valid", %{conn: conn} do
19-
conn = post conn, repository_path(conn, :create), repository: @valid_attrs
20-
assert redirected_to(conn) == repository_path(conn, :index)
21-
assert Repo.get_by(Repository, @valid_attrs)
22-
end
23-
24-
test "does not create resource and renders errors when data is invalid", %{conn: conn} do
25-
conn = post conn, repository_path(conn, :create), repository: @invalid_attrs
26-
assert html_response(conn, 200) =~ "New repository"
27-
end
28-
2915
test "shows chosen resource", %{conn: conn} do
30-
repository = Repo.insert! %Repository{}
16+
repository = Repo.insert! @valid_repository
3117
conn = get conn, repository_path(conn, :show, repository)
3218
assert html_response(conn, 200) =~ "Show repository"
3319
end
@@ -39,28 +25,21 @@ defmodule Beanie.RepositoryControllerTest do
3925
end
4026

4127
test "renders form for editing chosen resource", %{conn: conn} do
42-
repository = Repo.insert! %Repository{}
28+
repository = Repo.insert! @valid_repository
4329
conn = get conn, repository_path(conn, :edit, repository)
4430
assert html_response(conn, 200) =~ "Edit repository"
4531
end
4632

4733
test "updates chosen resource and redirects when data is valid", %{conn: conn} do
48-
repository = Repo.insert! %Repository{}
34+
repository = Repo.insert! @valid_repository
4935
conn = put conn, repository_path(conn, :update, repository), repository: @valid_attrs
5036
assert redirected_to(conn) == repository_path(conn, :show, repository)
5137
assert Repo.get_by(Repository, @valid_attrs)
5238
end
5339

5440
test "does not update chosen resource and renders errors when data is invalid", %{conn: conn} do
55-
repository = Repo.insert! %Repository{}
41+
repository = Repo.insert! @valid_repository
5642
conn = put conn, repository_path(conn, :update, repository), repository: @invalid_attrs
5743
assert html_response(conn, 200) =~ "Edit repository"
5844
end
59-
60-
test "deletes chosen resource", %{conn: conn} do
61-
repository = Repo.insert! %Repository{}
62-
conn = delete conn, repository_path(conn, :delete, repository)
63-
assert redirected_to(conn) == repository_path(conn, :index)
64-
refute Repo.get(Repository, repository.id)
65-
end
6645
end

web/controllers/repository_controller.ex

-25
Original file line numberDiff line numberDiff line change
@@ -19,19 +19,6 @@ defmodule Beanie.RepositoryController do
1919
end
2020
end
2121

22-
def create(conn, %{"repository" => repository_params}) do
23-
changeset = Repository.changeset(%Repository{}, repository_params)
24-
25-
case Repo.insert(changeset) do
26-
{:ok, _repository} ->
27-
conn
28-
|> put_flash(:info, "Repository created successfully.")
29-
|> redirect(to: repository_path(conn, :index))
30-
{:error, changeset} ->
31-
render(conn, "new.html", changeset: changeset)
32-
end
33-
end
34-
3522
def show(conn, params = %{"id" => id}) do
3623
repository = fetch_repository(id, params["update"])
3724
render(conn, "show.html", repository: repository)
@@ -57,18 +44,6 @@ defmodule Beanie.RepositoryController do
5744
end
5845
end
5946

60-
def delete(conn, %{"id" => id}) do
61-
repository = Repo.get!(Repository, id)
62-
63-
# Here we use delete! (with a bang) because we expect
64-
# it to always work (and if it does not, it will raise).
65-
Repo.delete!(repository)
66-
67-
conn
68-
|> put_flash(:info, "Repository deleted successfully.")
69-
|> redirect(to: repository_path(conn, :index))
70-
end
71-
7247
defp repository_list("true") do
7348
%{"repositories" => from_docker} = Beanie.RegistryAPI.catalog(Beanie.registry)
7449
Beanie.Repository.Query.update_list(from_docker)

0 commit comments

Comments
 (0)