Compare commits
12 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 90b0eb71ed | |||
| 5eff7426b7 | |||
| 124e9f3c75 | |||
| 11c09ebf49 | |||
| cca9829a24 | |||
| 3f26bb457e | |||
| 24c6700f73 | |||
| 0a308ea429 | |||
| fd655391e0 | |||
| cacab2541d | |||
| 6c3cc84f7a | |||
| 96161f979b |
38
.build.yml
38
.build.yml
@@ -1,6 +1,34 @@
|
||||
image: alpine/edge
|
||||
image: debian/stable
|
||||
packages:
|
||||
- build-essential
|
||||
- git
|
||||
- elixir
|
||||
- erlang
|
||||
secrets:
|
||||
- bc0d4073-54cf-45ae-9542-6dd201b189e4
|
||||
sources:
|
||||
- git@git.broccoli.town:dp/wish
|
||||
tasks:
|
||||
- say-hello: |
|
||||
echo hello
|
||||
- say-world: |
|
||||
echo world
|
||||
- setup: |
|
||||
cd wish
|
||||
mix local.hex --force
|
||||
mix local.rebar --force
|
||||
mix deps.get
|
||||
- test: |
|
||||
cd wish
|
||||
mix test
|
||||
- deploy: |
|
||||
if [ $GIT_REF = "refs/heads/ci" ]; then
|
||||
curl -L https://fly.io/install.sh | sh
|
||||
export FLYCTL_INSTALL="/home/build/.fly"
|
||||
export PATH="$FLYCTL_INSTALL/bin:$PATH"
|
||||
|
||||
set +x
|
||||
export FLY_ACCESS_TOKEN=$(cat ~/.fly_secret_key)
|
||||
set -x
|
||||
|
||||
cd wish
|
||||
flyctl status
|
||||
else
|
||||
echo "nothing to do"
|
||||
fi
|
||||
|
||||
@@ -10,7 +10,7 @@ defmodule Wish.Wishlist.Item do
|
||||
field :desire, :integer
|
||||
field :image_url, :string
|
||||
field :price, :integer
|
||||
field :visible, :boolean
|
||||
field :visible, :boolean, default: true
|
||||
|
||||
timestamps(type: :utc_datetime)
|
||||
end
|
||||
|
||||
@@ -10,14 +10,20 @@
|
||||
<.table
|
||||
id="items"
|
||||
rows={@streams.items}
|
||||
row_click={fn {_id, item} -> JS.navigate(~p"/items/#{item}/show/edit") end}
|
||||
row_click={fn {_id, item} -> JS.patch(~p"/items/#{item}/show/edit") end}
|
||||
>
|
||||
<:col :let={{_id, item}} label="Title"><%= item.title %></:col>
|
||||
<:col :let={{_id, item}} label="Description"><%= item.description %></:col>
|
||||
<:col :let={{_id, item}} label="Price"><%= item.price %></:col>
|
||||
<:col :let={{_id, item}} label="Desire"><%= item.desire %></:col>
|
||||
<:action :let={{_id, item}}>
|
||||
<div class="sr-only">
|
||||
<.link patch={~p"/items/#{item.id}/show/edit"}>Edit</.link>
|
||||
</div>
|
||||
</:action>
|
||||
<:action :let={{id, item}}>
|
||||
<.link
|
||||
id={"delete-#{id}"}
|
||||
phx-click={JS.push("delete", value: %{id: item.id}) |> hide("##{id}")}
|
||||
data-confirm="Are you sure?"
|
||||
>
|
||||
|
||||
@@ -40,9 +40,12 @@ defmodule WishWeb.ItemLive.Show do
|
||||
defp save_item(socket, :edit, item_params) do
|
||||
case Wishlist.update_item(socket.assigns.item, item_params) do
|
||||
{:ok, item} ->
|
||||
changeset = Wishlist.change_item(item)
|
||||
|
||||
{:noreply,
|
||||
socket
|
||||
|> assign(:item, item)
|
||||
|> assign_form(changeset)
|
||||
|> put_flash(:info, "Item updated successfully")}
|
||||
|
||||
{:error, %Ecto.Changeset{} = changeset} ->
|
||||
|
||||
@@ -60,7 +60,7 @@ defmodule WishWeb.Router do
|
||||
|
||||
live_session :redirect_if_user_is_authenticated,
|
||||
on_mount: [{WishWeb.UserAuth, :redirect_if_user_is_authenticated}] do
|
||||
# live "/users/register", UserRegistrationLive, :new
|
||||
live "/users/register", UserRegistrationLive, :new
|
||||
live "/users/log_in", UserLoginLive, :new
|
||||
live "/users/reset_password", UserForgotPasswordLive, :new
|
||||
live "/users/reset_password/:token", UserResetPasswordLive, :edit
|
||||
|
||||
@@ -1,8 +0,0 @@
|
||||
defmodule WishWeb.PageControllerTest do
|
||||
use WishWeb.ConnCase
|
||||
|
||||
test "GET /", %{conn: conn} do
|
||||
conn = get(conn, ~p"/")
|
||||
assert html_response(conn, 200) =~ "Peace of mind from prototype to production"
|
||||
end
|
||||
end
|
||||
26
test/wish_web/live/home_live_test.exs
Normal file
26
test/wish_web/live/home_live_test.exs
Normal file
@@ -0,0 +1,26 @@
|
||||
defmodule WishWeb.HomeLiveTest do
|
||||
use WishWeb.ConnCase
|
||||
|
||||
import Phoenix.LiveViewTest
|
||||
import Wish.WishlistFixtures
|
||||
import Wish.AccountsFixtures
|
||||
|
||||
defp create_item(_) do
|
||||
item = item_fixture()
|
||||
%{item: item}
|
||||
end
|
||||
|
||||
describe "Index" do
|
||||
setup [:create_item]
|
||||
|
||||
test "lists all items", %{conn: conn, item: item} do
|
||||
{:ok, _index_live, html} =
|
||||
conn
|
||||
|> log_in_user(user_fixture())
|
||||
|> live(~p"/")
|
||||
|
||||
assert html =~ "Daniel's Wishlist"
|
||||
assert html =~ item.description
|
||||
end
|
||||
end
|
||||
end
|
||||
@@ -3,10 +3,21 @@ defmodule WishWeb.ItemLiveTest do
|
||||
|
||||
import Phoenix.LiveViewTest
|
||||
import Wish.WishlistFixtures
|
||||
import Wish.AccountsFixtures
|
||||
|
||||
@create_attrs %{description: "some description", title: "some title", url: "some url", received: true, desire: 42}
|
||||
@update_attrs %{description: "some updated description", title: "some updated title", url: "some updated url", received: false, desire: 43}
|
||||
@invalid_attrs %{description: nil, title: nil, url: nil, received: false, desire: nil}
|
||||
@create_attrs %{
|
||||
description: "some description",
|
||||
title: "some title",
|
||||
url: "some url",
|
||||
desire: 2
|
||||
}
|
||||
@update_attrs %{
|
||||
description: "some updated description",
|
||||
title: "some updated title",
|
||||
url: "some updated url",
|
||||
desire: 3
|
||||
}
|
||||
@invalid_attrs %{description: nil, title: nil, url: nil, desire: nil}
|
||||
|
||||
defp create_item(_) do
|
||||
item = item_fixture()
|
||||
@@ -17,14 +28,20 @@ defmodule WishWeb.ItemLiveTest do
|
||||
setup [:create_item]
|
||||
|
||||
test "lists all items", %{conn: conn, item: item} do
|
||||
{:ok, _index_live, html} = live(conn, ~p"/items")
|
||||
{:ok, _index_live, html} =
|
||||
conn
|
||||
|> log_in_user(user_fixture())
|
||||
|> live(~p"/items")
|
||||
|
||||
assert html =~ "Listing Items"
|
||||
assert html =~ item.description
|
||||
end
|
||||
|
||||
test "saves new item", %{conn: conn} do
|
||||
{:ok, index_live, _html} = live(conn, ~p"/items")
|
||||
{:ok, index_live, _html} =
|
||||
conn
|
||||
|> log_in_user(user_fixture())
|
||||
|> live(~p"/items")
|
||||
|
||||
assert index_live |> element("a", "New Item") |> render_click() =~
|
||||
"New Item"
|
||||
@@ -46,66 +63,75 @@ defmodule WishWeb.ItemLiveTest do
|
||||
assert html =~ "some description"
|
||||
end
|
||||
|
||||
test "updates item in listing", %{conn: conn, item: item} do
|
||||
{:ok, index_live, _html} = live(conn, ~p"/items")
|
||||
|
||||
assert index_live |> element("#items-#{item.id} a", "Edit") |> render_click() =~
|
||||
"Edit Item"
|
||||
|
||||
assert_patch(index_live, ~p"/items/#{item}/edit")
|
||||
|
||||
assert index_live
|
||||
|> form("#item-form", item: @invalid_attrs)
|
||||
|> render_change() =~ "can't be blank"
|
||||
|
||||
assert index_live
|
||||
|> form("#item-form", item: @update_attrs)
|
||||
|> render_submit()
|
||||
|
||||
assert_patch(index_live, ~p"/items")
|
||||
|
||||
html = render(index_live)
|
||||
assert html =~ "Item updated successfully"
|
||||
assert html =~ "some updated description"
|
||||
end
|
||||
# test "updates item in listing", %{conn: conn, item: item} do
|
||||
# {:ok, index_live, _html} =
|
||||
# conn
|
||||
# |> log_in_user(user_fixture())
|
||||
# |> live(~p"/items")
|
||||
#
|
||||
# index_live
|
||||
# |> element("#items-#{item.id} a", "Edit")
|
||||
# |> render_click()
|
||||
#
|
||||
# assert_patch(index_live, ~p"/items/#{item}/show/edit")
|
||||
#
|
||||
# assert index_live
|
||||
# |> form("#item-form", item: @invalid_attrs)
|
||||
# |> render_change() =~ "can't be blank"
|
||||
#
|
||||
# assert index_live
|
||||
# |> form("#item-form", item: @update_attrs)
|
||||
# |> render_submit()
|
||||
#
|
||||
# assert_patch(index_live, ~p"/items")
|
||||
#
|
||||
# html = render(index_live)
|
||||
# assert html =~ "Item updated successfully"
|
||||
# assert html =~ "some updated description"
|
||||
# end
|
||||
|
||||
test "deletes item in listing", %{conn: conn, item: item} do
|
||||
{:ok, index_live, _html} = live(conn, ~p"/items")
|
||||
{:ok, index_live, _html} =
|
||||
conn
|
||||
|> log_in_user(user_fixture())
|
||||
|> live(~p"/items")
|
||||
|
||||
assert index_live
|
||||
|> element("#delete-items-#{item.id}")
|
||||
|> render_click()
|
||||
|
||||
assert index_live |> element("#items-#{item.id} a", "Delete") |> render_click()
|
||||
refute has_element?(index_live, "#items-#{item.id}")
|
||||
end
|
||||
end
|
||||
|
||||
describe "Show" do
|
||||
describe "Edit" do
|
||||
setup [:create_item]
|
||||
|
||||
test "displays item", %{conn: conn, item: item} do
|
||||
{:ok, _show_live, html} = live(conn, ~p"/items/#{item}")
|
||||
{:ok, _show_live, html} =
|
||||
conn
|
||||
|> log_in_user(user_fixture())
|
||||
|> live(~p"/items/#{item}/show/edit")
|
||||
|
||||
assert html =~ "Show Item"
|
||||
assert html =~ "Edit Item"
|
||||
assert html =~ item.description
|
||||
end
|
||||
|
||||
test "updates item within modal", %{conn: conn, item: item} do
|
||||
{:ok, show_live, _html} = live(conn, ~p"/items/#{item}")
|
||||
{:ok, edit_live, _html} =
|
||||
conn
|
||||
|> log_in_user(user_fixture())
|
||||
|> live(~p"/items/#{item}/show/edit")
|
||||
|
||||
assert show_live |> element("a", "Edit") |> render_click() =~
|
||||
"Edit Item"
|
||||
|
||||
assert_patch(show_live, ~p"/items/#{item}/show/edit")
|
||||
|
||||
assert show_live
|
||||
assert edit_live
|
||||
|> form("#item-form", item: @invalid_attrs)
|
||||
|> render_change() =~ "can't be blank"
|
||||
|
||||
assert show_live
|
||||
assert edit_live
|
||||
|> form("#item-form", item: @update_attrs)
|
||||
|> render_submit()
|
||||
|
||||
assert_patch(show_live, ~p"/items/#{item}")
|
||||
|
||||
html = render(show_live)
|
||||
html = render(edit_live)
|
||||
assert html =~ "Item updated successfully"
|
||||
assert html =~ "some updated description"
|
||||
end
|
||||
|
||||
@@ -12,7 +12,6 @@ defmodule WishWeb.UserForgotPasswordLiveTest do
|
||||
{:ok, lv, html} = live(conn, ~p"/users/reset_password")
|
||||
|
||||
assert html =~ "Forgot your password?"
|
||||
assert has_element?(lv, ~s|a[href="#{~p"/users/register"}"]|, "Register")
|
||||
assert has_element?(lv, ~s|a[href="#{~p"/users/log_in"}"]|, "Log in")
|
||||
end
|
||||
|
||||
|
||||
@@ -9,7 +9,6 @@ defmodule WishWeb.UserLoginLiveTest do
|
||||
{:ok, _lv, html} = live(conn, ~p"/users/log_in")
|
||||
|
||||
assert html =~ "Log in"
|
||||
assert html =~ "Register"
|
||||
assert html =~ "Forgot your password?"
|
||||
end
|
||||
|
||||
@@ -58,18 +57,6 @@ defmodule WishWeb.UserLoginLiveTest do
|
||||
end
|
||||
|
||||
describe "login navigation" do
|
||||
test "redirects to registration page when the Register button is clicked", %{conn: conn} do
|
||||
{:ok, lv, _html} = live(conn, ~p"/users/log_in")
|
||||
|
||||
{:ok, _login_live, login_html} =
|
||||
lv
|
||||
|> element(~s|main a:fl-contains("Sign up")|)
|
||||
|> render_click()
|
||||
|> follow_redirect(conn, ~p"/users/register")
|
||||
|
||||
assert login_html =~ "Register"
|
||||
end
|
||||
|
||||
test "redirects to forgot password page when the Forgot Password button is clicked", %{
|
||||
conn: conn
|
||||
} do
|
||||
|
||||
@@ -99,20 +99,5 @@ defmodule WishWeb.UserResetPasswordLiveTest do
|
||||
|
||||
assert conn.resp_body =~ "Log in"
|
||||
end
|
||||
|
||||
test "redirects to password reset page when the Register button is clicked", %{
|
||||
conn: conn,
|
||||
token: token
|
||||
} do
|
||||
{:ok, lv, _html} = live(conn, ~p"/users/reset_password/#{token}")
|
||||
|
||||
{:ok, conn} =
|
||||
lv
|
||||
|> element(~s|main a:fl-contains("Register")|)
|
||||
|> render_click()
|
||||
|> follow_redirect(conn, ~p"/users/register")
|
||||
|
||||
assert conn.resp_body =~ "Register"
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
Reference in New Issue
Block a user