@@ -39,7 +39,7 @@ defmodule ClaperWeb.EventLive.EventCardComponent do
<%= @event.code %>
-
+
<%= if NaiveDateTime.compare(@current_time, @event.started_at) == :gt and NaiveDateTime.compare(@current_time, @event.expired_at) == :lt do %>
<%= if NaiveDateTime.compare(@current_time, @event.started_at) == :gt and NaiveDateTime.compare(@current_time, @event.expired_at) == :lt do %>
@@ -66,7 +66,7 @@ defmodule ClaperWeb.EventLive.EventCardComponent do <%= if NaiveDateTime.compare(@current_time, @event.expired_at) == :lt do %> <%= if @event.presentation_file.status == "done" || (@event.presentation_file.status == "fail" && @event.presentation_file.hash) do %>
-
+
<%= gettext "Present/Customize" %>
@@ -110,7 +110,7 @@ defmodule ClaperWeb.EventLive.EventCardComponent do
<%= if NaiveDateTime.compare(@current_time, @event.expired_at) == :gt do %>
<%= gettext "Present/Customize" %>
@@ -110,7 +110,7 @@ defmodule ClaperWeb.EventLive.EventCardComponent do
<%= if NaiveDateTime.compare(@current_time, @event.expired_at) == :gt do %>
-
+
-
-
+
-
<% current_time = NaiveDateTime.utc_now() %>
<%= for event <- @managed_events do %>
<.live_component module={ClaperWeb.EventLive.EventCardComponent} id={"managed-event-#{event.uuid}"} is_leader={true} event={event} current_time={current_time} />
diff --git a/lib/claper_web/live/event_live/join.html.heex b/lib/claper_web/live/event_live/join.html.heex
index 1eece33..384b4dd 100644
--- a/lib/claper_web/live/event_live/join.html.heex
+++ b/lib/claper_web/live/event_live/join.html.heex
@@ -8,7 +8,7 @@
-
+
<%= gettext("About") %>
<%= if @current_user do %>
diff --git a/test/claper/presentations_test.exs b/test/claper/presentations_test.exs
index fbea48c..1b0658e 100644
--- a/test/claper/presentations_test.exs
+++ b/test/claper/presentations_test.exs
@@ -14,8 +14,8 @@ defmodule Claper.PresentationsTest do
end
test "get_presentation_file_by_hash!/2 returns the presentation_file with given hash" do
- presentation_file = presentation_file_fixture()
- assert Presentations.get_presentation_file_by_hash!(presentation_file.hash) == %{presentation_file | event: nil}
+ presentation_file = presentation_file_fixture(%{}, [:event])
+ assert Presentations.get_presentation_file_by_hash!(presentation_file.hash) == presentation_file
end
test "create_presentation_file/1 with valid data creates a presentation_file" do
diff --git a/test/claper_web/live/event_live_test.exs b/test/claper_web/live/event_live_test.exs
index 76dfaf7..c7026aa 100644
--- a/test/claper_web/live/event_live_test.exs
+++ b/test/claper_web/live/event_live_test.exs
@@ -2,60 +2,33 @@ defmodule ClaperWeb.EventLiveTest do
use ClaperWeb.ConnCase
import Phoenix.LiveViewTest
- import Claper.{EventsFixtures}
+ import Claper.{PresentationsFixtures}
- @create_attrs %{name: "some name"}
@update_attrs %{name: "some updated name"}
- @invalid_attrs %{name: nil}
defp create_event(params) do
- event = event_fixture()
- params |> Map.put(:event, event)
+ presentation_file = presentation_file_fixture(%{user: params.user}, [:event])
+ presentation_state_fixture(%{presentation_file: presentation_file})
+ params |> Map.put(:presentation_file, presentation_file)
end
describe "Index" do
- setup [:create_event, :register_and_log_in_user]
+ setup [:register_and_log_in_user, :create_event]
- test "lists all events", %{conn: conn, event: event} do
+ test "lists all events", %{conn: conn, presentation_file: presentation_file} do
{:ok, _index_live, html} = live(conn, Routes.event_index_path(conn, :index))
- assert html =~ "Listing Events"
- assert html =~ event.name
+ assert html =~ "presentations"
+ assert html =~ presentation_file.event.name
end
- test "saves new event", %{conn: conn} do
+ test "updates event in listing", %{conn: conn, presentation_file: presentation_file} do
{:ok, index_live, _html} = live(conn, Routes.event_index_path(conn, :index))
- assert index_live |> element("a", "New Event") |> render_click() =~
- "New Event"
+ assert index_live |> element("#event-#{presentation_file.event.uuid} a", "Edit") |> render_click() =~
+ "Edit"
- assert_patch(index_live, Routes.event_index_path(conn, :new))
-
- assert index_live
- |> form("#event-form", event: @invalid_attrs)
- |> render_change() =~ "can't be blank"
-
- {:ok, _, html} =
- index_live
- |> form("#event-form", event: @create_attrs)
- |> render_submit()
- |> follow_redirect(conn, Routes.event_index_path(conn, :index))
-
- assert html =~ "Event created successfully"
- assert html =~ "some name"
- end
-
- test "updates event in listing", %{conn: conn, event: event} do
- {:ok, index_live, _html} = live(conn, Routes.event_index_path(conn, :index))
-
- assert index_live |> element("#event-#{event.uuid} a", "Edit") |> render_click() =~
- "Edit Event"
-
- assert_patch(index_live, Routes.event_index_path(conn, :edit, event.uuid))
-
- assert index_live
- |> form("#event-form", event: @invalid_attrs)
- |> render_change() =~ "can't be blank"
+ assert_patch(index_live, Routes.event_index_path(conn, :edit, presentation_file.event.uuid))
{:ok, _, html} =
index_live
@@ -63,48 +36,36 @@ defmodule ClaperWeb.EventLiveTest do
|> render_submit()
|> follow_redirect(conn, Routes.event_index_path(conn, :index))
- assert html =~ "Event updated successfully"
+ assert html =~ "Updated successfully"
assert html =~ "some updated name"
end
- test "deletes event in listing", %{conn: conn, event: event} do
+ test "deletes event in listing", %{conn: conn, presentation_file: presentation_file} do
{:ok, index_live, _html} = live(conn, Routes.event_index_path(conn, :index))
- assert index_live |> element("#event-#{event.uuid} a", "Delete") |> render_click()
- refute has_element?(index_live, "#event-#{event.uuid}")
+ assert index_live |> element("#event-#{presentation_file.event.uuid} a", "Edit") |> render_click() =~
+ "Edit"
+
+ {:ok, conn} = index_live |> element(~s{a[phx-value-id=#{presentation_file.event.uuid}]}) |> render_click()
+ |> follow_redirect(conn, Routes.event_index_path(conn, :index))
+
+ {:ok, index_live, _html} = live(conn, Routes.event_index_path(conn, :index))
+
+
+ refute has_element?(index_live, "#event-#{presentation_file.event.uuid}")
end
end
describe "Show" do
- setup [:create_event, :register_and_log_in_user]
+ setup [:register_and_log_in_user, :create_event]
- test "displays event", %{conn: conn, event: event} do
- {:ok, _show_live, html} = live(conn, Routes.event_show_path(conn, :show, event.uuid))
+ test "displays event", %{conn: conn, presentation_file: presentation_file} do
- assert html =~ "Show Event"
- assert html =~ event.name
+ {:ok, _show_live, html} = live(conn, Routes.event_show_path(conn, :show, presentation_file.event.code))
+
+ assert html =~ "Be the first to react"
+ assert html =~ presentation_file.event.name
end
- test "updates event within modal", %{conn: conn, event: event} do
- {:ok, show_live, _html} = live(conn, Routes.event_show_path(conn, :show, event.uuid))
-
- assert show_live |> element("a", "Edit") |> render_click() =~
- "Edit Event"
-
- assert_patch(show_live, Routes.event_show_path(conn, :edit, event.uuid))
-
- assert show_live
- |> form("#event-form", event: @invalid_attrs)
- |> render_change() =~ "can't be blank"
-
- {:ok, _, html} =
- show_live
- |> form("#event-form", event: @update_attrs)
- |> render_submit()
- |> follow_redirect(conn, Routes.event_show_path(conn, :show, event.uuid))
-
- assert html =~ "Event updated successfully"
- assert html =~ "some updated name"
- end
end
end
diff --git a/test/claper_web/live/post_live_test.exs b/test/claper_web/live/post_live_test.exs
index e26dd66..710f13b 100644
--- a/test/claper_web/live/post_live_test.exs
+++ b/test/claper_web/live/post_live_test.exs
@@ -2,109 +2,23 @@ defmodule ClaperWeb.PostLiveTest do
use ClaperWeb.ConnCase
import Phoenix.LiveViewTest
- import Claper.PostsFixtures
+ import Claper.{PresentationsFixtures,PostsFixtures}
- @create_attrs %{body: "some body"}
- @update_attrs %{body: "some updated body"}
- @invalid_attrs %{body: nil}
-
- defp create_post(params) do
- post = post_fixture(%{}, [:room])
- params |> Map.put(:post, post) |> Map.put(:org_id, post.org_id)
+ defp create_event(params) do
+ presentation_file = presentation_file_fixture(%{user: params.user}, [:event])
+ presentation_state_fixture(%{presentation_file: presentation_file})
+ post = post_fixture(%{user: params.user, event: presentation_file.event})
+ params |> Map.put(:presentation_file, presentation_file) |> Map.put(:post, post)
end
describe "Index" do
- setup [:create_post, :register_and_log_in_user]
+ setup [:register_and_log_in_user, :create_event]
- test "lists all posts", %{conn: conn, post: post} do
- {:ok, _index_live, html} = live(conn, Routes.post_index_path(conn, :index, post.room.uuid))
+ test "list posts", %{conn: conn, presentation_file: presentation_file} do
+ {:ok, _index_live, html} = live(conn, Routes.event_show_path(conn, :show, presentation_file.event.code))
- assert html =~ "Listing Posts"
- assert html =~ post.body
- end
-
- test "saves new post", %{conn: conn, post: post} do
- {:ok, index_live, _html} = live(conn, Routes.post_index_path(conn, :index, post.room.uuid))
-
- assert index_live |> element("a", "New Post") |> render_click() =~
- "New Post"
-
- assert_patch(index_live, Routes.post_index_path(conn, :new, post.room.uuid))
-
- assert index_live
- |> form("#post-form", post: @invalid_attrs)
- |> render_change() =~ "can't be blank"
-
- {:ok, _, html} =
- index_live
- |> form("#post-form", post: @create_attrs)
- |> render_submit()
- |> follow_redirect(conn, Routes.post_index_path(conn, :index, post.room.uuid))
-
- assert html =~ "Post created successfully"
assert html =~ "some body"
- end
- test "updates post in listing", %{conn: conn, post: post} do
- {:ok, index_live, _html} = live(conn, Routes.post_index_path(conn, :index, post.room.uuid))
-
- assert index_live |> element("#post-#{post.uuid} a", "Edit") |> render_click() =~
- "Edit Post"
-
- assert_patch(index_live, Routes.post_index_path(conn, :edit, post.uuid))
-
- assert index_live
- |> form("#post-form", post: @invalid_attrs)
- |> render_change() =~ "can't be blank"
-
- {:ok, _, html} =
- index_live
- |> form("#post-form", post: @update_attrs)
- |> render_submit()
- |> follow_redirect(conn, Routes.post_index_path(conn, :index, post.room.uuid))
-
- assert html =~ "Post updated successfully"
- assert html =~ "some updated body"
- end
-
- test "deletes post in listing", %{conn: conn, post: post} do
- {:ok, index_live, _html} = live(conn, Routes.post_index_path(conn, :index, post.room.uuid))
-
- assert index_live |> element("#post-#{post.uuid} a", "Delete") |> render_click()
- refute index_live |> element("#post-#{post.uuid} a", "Delete") |> has_element?
- end
- end
-
- describe "Show" do
- setup [:create_post, :register_and_log_in_user]
-
- test "displays post", %{conn: conn, post: post} do
- {:ok, _show_live, html} = live(conn, Routes.post_show_path(conn, :show, post.uuid))
-
- assert html =~ "Show Post"
- assert html =~ post.body
- end
-
- test "updates post within modal", %{conn: conn, post: post} do
- {:ok, show_live, _html} = live(conn, Routes.post_show_path(conn, :show, post.uuid))
-
- assert show_live |> element("a", "Edit") |> render_click() =~
- "Edit Post"
-
- assert_patch(show_live, Routes.post_show_path(conn, :edit, post.uuid))
-
- assert show_live
- |> form("#post-form", post: @invalid_attrs)
- |> render_change() =~ "can't be blank"
-
- {:ok, _, html} =
- show_live
- |> form("#post-form", post: @update_attrs)
- |> render_submit()
- |> follow_redirect(conn, Routes.post_show_path(conn, :show, post.uuid))
-
- assert html =~ "Post updated successfully"
- assert html =~ "some updated body"
end
end
end
diff --git a/test/claper_web/views/error_view_test.exs b/test/claper_web/views/error_view_test.exs
deleted file mode 100644
index f700a4d..0000000
--- a/test/claper_web/views/error_view_test.exs
+++ /dev/null
@@ -1,14 +0,0 @@
-defmodule ClaperWeb.ErrorViewTest do
- use ClaperWeb.ConnCase, async: true
-
- # Bring render/3 and render_to_string/3 for testing custom views
- import Phoenix.View
-
- test "renders 404.html" do
- assert render_to_string(ClaperWeb.ErrorView, "404.html", []) == "Not Found"
- end
-
- test "renders 500.html" do
- assert render_to_string(ClaperWeb.ErrorView, "500.html", []) == "Internal Server Error"
- end
-end
diff --git a/test/claper_web/views/layout_view_test.exs b/test/claper_web/views/layout_view_test.exs
deleted file mode 100644
index 2c735a5..0000000
--- a/test/claper_web/views/layout_view_test.exs
+++ /dev/null
@@ -1,8 +0,0 @@
-defmodule ClaperWeb.LayoutViewTest do
- use ClaperWeb.ConnCase, async: true
-
- # When testing helpers, you may want to import Phoenix.HTML and
- # use functions such as safe_to_string() to convert the helper
- # result into an HTML string.
- # import Phoenix.HTML
-end
diff --git a/test/claper_web/views/page_view_test.exs b/test/claper_web/views/page_view_test.exs
deleted file mode 100644
index 01565c2..0000000
--- a/test/claper_web/views/page_view_test.exs
+++ /dev/null
@@ -1,3 +0,0 @@
-defmodule ClaperWeb.PageViewTest do
- use ClaperWeb.ConnCase, async: true
-end
diff --git a/test/support/conn_case.ex b/test/support/conn_case.ex
index cbb989d..b30548f 100644
--- a/test/support/conn_case.ex
+++ b/test/support/conn_case.ex
@@ -45,13 +45,8 @@ defmodule ClaperWeb.ConnCase do
It stores an updated connection and a registered user in the
test context.
"""
- def register_and_log_in_user(%{conn: conn, org_id: org_id}) do
- user = Claper.AccountsFixtures.user_fixture(%{confirmed_at: DateTime.utc_now(), org_id: org_id})
- %{conn: log_in_user(conn, user), user: user}
- end
-
def register_and_log_in_user(%{conn: conn}) do
- user = Claper.AccountsFixtures.user_fixture(%{confirmed_at: DateTime.utc_now()})
+ user = Claper.AccountsFixtures.confirmed_user_fixture()
%{conn: log_in_user(conn, user), user: user}
end
@@ -65,7 +60,8 @@ defmodule ClaperWeb.ConnCase do
conn
|> Phoenix.ConnTest.init_test_session(%{})
- |> Plug.Conn.put_session(:user_token, token)
|> Plug.Conn.put_session(:current_user, user)
+ |> Plug.Conn.put_session(:user_token, token)
+
end
end
diff --git a/test/support/fixtures/accounts_fixtures.ex b/test/support/fixtures/accounts_fixtures.ex
index 6a525a3..79c6b7c 100644
--- a/test/support/fixtures/accounts_fixtures.ex
+++ b/test/support/fixtures/accounts_fixtures.ex
@@ -7,12 +7,28 @@ defmodule Claper.AccountsFixtures do
def unique_user_email, do: "user#{System.unique_integer()}@example.com"
def valid_user_attributes(attrs \\ %{}) do
+ Enum.into(attrs, %{
+ email: unique_user_email(),
+ confirmed_at: NaiveDateTime.utc_now(),
+ })
+ end
+
+ def no_valid_user_attributes(attrs \\ %{}) do
Enum.into(attrs, %{
email: unique_user_email()
})
end
def user_fixture(attrs \\ %{}) do
+ {:ok, user} =
+ attrs
+ |> no_valid_user_attributes()
+ |> Claper.Accounts.register_user()
+
+ user
+ end
+
+ def confirmed_user_fixture(attrs \\ %{}) do
{:ok, user} =
attrs
|> valid_user_attributes()
diff --git a/test/support/fixtures/events_fixtures.ex b/test/support/fixtures/events_fixtures.ex
index 0126fd2..86bd568 100644
--- a/test/support/fixtures/events_fixtures.ex
+++ b/test/support/fixtures/events_fixtures.ex
@@ -12,7 +12,7 @@ defmodule Claper.EventsFixtures do
Generate a event.
"""
def event_fixture(attrs \\ %{}, preload \\ []) do
- assoc = %{user: user_fixture()}
+ assoc = %{user: attrs[:user] || user_fixture()}
{:ok, event} =
attrs
|> Enum.into(%{
diff --git a/test/support/fixtures/posts_fixtures.ex b/test/support/fixtures/posts_fixtures.ex
index 8875cde..82fbbce 100644
--- a/test/support/fixtures/posts_fixtures.ex
+++ b/test/support/fixtures/posts_fixtures.ex
@@ -12,8 +12,8 @@ defmodule Claper.PostsFixtures do
Generate a post.
"""
def post_fixture(attrs \\ %{}, preload \\ []) do
- user = user_fixture()
- event = event_fixture()
+ user = attrs[:user] || user_fixture()
+ event = attrs[:event] || event_fixture()
assoc = %{user: user, event: event}
{:ok, post} =
Claper.Posts.create_post(assoc.event, attrs
diff --git a/test/support/fixtures/presentations_fixtures.ex b/test/support/fixtures/presentations_fixtures.ex
index 4bda125..cfbb3da 100644
--- a/test/support/fixtures/presentations_fixtures.ex
+++ b/test/support/fixtures/presentations_fixtures.ex
@@ -12,7 +12,7 @@ defmodule Claper.PresentationsFixtures do
Generate a presentation_file.
"""
def presentation_file_fixture(attrs \\ %{}, preload \\ []) do
- assoc = %{event: event_fixture()}
+ assoc = %{event: attrs[:event] || event_fixture(attrs)}
{:ok, presentation_file} =
attrs
|> Enum.into(%{
@@ -29,19 +29,20 @@ defmodule Claper.PresentationsFixtures do
@doc """
Generate a presentation_state.
"""
- def presentation_state_fixture(attrs \\ %{}) do
- assoc = %{presentation_file: presentation_file_fixture()}
+ def presentation_state_fixture(attrs \\ %{}, preload \\ []) do
+ assoc = %{presentation_file: attrs[:presentation_file] || presentation_file_fixture()}
{:ok, presentation_state} =
attrs
|> Enum.into(%{
presentation_file_id: assoc.presentation_file.id,
position: 0,
+ banned: [],
chat_visible: false,
poll_visible: false,
join_screen_visible: false
})
|> Claper.Presentations.create_presentation_state()
- presentation_state
+ Claper.UtilFixture.merge_preload(presentation_state, preload, assoc)
end
end