- "
+ end
+ end
+end
diff --git a/apps/content/test/content_web/controllers/page_controller_test.exs b/apps/content/test/content_web/controllers/page_controller_test.exs
deleted file mode 100644
index 84071587..00000000
--- a/apps/content/test/content_web/controllers/page_controller_test.exs
+++ /dev/null
@@ -1,8 +0,0 @@
-defmodule Content.PageControllerTest do
- use Content.ConnCase
-
- test "GET /", %{conn: conn} do
- conn = get(conn, "/index")
- assert html_response(conn, 200)
- end
-end
diff --git a/apps/content/test/content_web/controllers/posts_controller_test.exs b/apps/content/test/content_web/controllers/posts_controller_test.exs
index dd0e3bc4..b5b70b2f 100644
--- a/apps/content/test/content_web/controllers/posts_controller_test.exs
+++ b/apps/content/test/content_web/controllers/posts_controller_test.exs
@@ -116,6 +116,14 @@ defmodule Content.PostsControllerTest do
assert html_response(conn, 200) =~ "My Post"
end
+ test "lists all posts by category page", %{conn: conn} do
+ fixture(:posts)
+ fixture(:category)
+
+ conn = get conn, Routes.category_page_path(conn, :index, @post_category.slug, "2")
+ assert html_response(conn, 200)
+ end
+
test "lists all posts for page", %{conn: conn} do
fixture(:posts)
@@ -151,6 +159,18 @@ defmodule Content.PostsControllerTest do
assert html_response(conn, 200) =~ posts.title
end
+
+ test "show a static page", %{conn: conn} do
+ conn = get conn, Routes.posts_path(conn, :show, "index")
+
+ assert html_response(conn, 200)
+ end
+
+ test "show a 404 if there's no match", %{conn: conn} do
+ assert_raise Phoenix.Router.NoRouteError, fn ->
+ get conn, Routes.posts_path(conn, :show, "blooper")
+ end
+ end
end
describe "show the front post" do
diff --git a/apps/content/test/content_web/views/layout_view_test.exs b/apps/content/test/content_web/views/layout_view_test.exs
index 7d049194..55cfe45d 100644
--- a/apps/content/test/content_web/views/layout_view_test.exs
+++ b/apps/content/test/content_web/views/layout_view_test.exs
@@ -1,8 +1,70 @@
defmodule Content.LayoutViewTest do
- use Content.ConnCase, async: true
+ use Content.ConnCase
# 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
+
+ import Content.LayoutView
+
+ describe "title/3" do
+ def default_title do
+ I18n.t! "en", "site.title"
+ end
+
+ test "for index" do
+ assert title(Content.PostsView, "index.html", %{page: 1}) =~ "Page 1 | #{default_title()}"
+ end
+
+ test "for feed" do
+ assert title(Content.FeedsView, "index.rss", %{category: "Category Test"}) =~ "Category Test | #{default_title()}"
+ end
+
+ test "for category" do
+ assert title(Content.PostsView, "show.html", %{post: %{title: "Test"}}) =~ "Test | #{default_title()}"
+ end
+
+ test "for nil" do
+ title(nil, nil, nil)
+ end
+ end
+
+ describe "excerpt/3" do
+ test "for a post" do
+ assert excerpt(Content.PostsView, "show.html", %{post: %{excerpt: "Excerpt test"}}) =~ "Excerpt test"
+ end
+
+ test "for a category" do
+ assert excerpt(Content.FeedsView, "index.rss", %{category: "category-test"}) =~ "category-test |"
+ end
+ end
+
+ describe "author/3" do
+ test "with a display name" do
+ assert author(Content.PostsView, "show.html", %{author: %{display_name: "Rufus"}}) =~ "Rufus"
+ end
+
+ test "without a display name" do
+ assert author(Content.PostsView, "show.html", %{}) =~ "Anonymous"
+ end
+ end
+
+ describe "corresponding_feed_url/4" do
+ setup %{conn: conn} do
+ %{conn: put_private(conn, :phoenix_router_url, "/pages")}
+ end
+
+ test "with a nil category", %{conn: conn} do
+ assert corresponding_feed_url(conn, nil, nil, %{category: nil}) == "/pages/feed.rss"
+ end
+
+ test "with a non-nil category", %{conn: conn} do
+ assert corresponding_feed_url(conn, Content.PostsView, "index.html", %{category: "test-category"}) == "/pages/category/test-category/feed.rss"
+ end
+
+ test "without a category", %{conn: conn} do
+ assert corresponding_feed_url(conn, nil, nil, %{}) == "/pages/feed.rss"
+ end
+ end
end
diff --git a/apps/content/test/content_web/views/posts_view_test.exs b/apps/content/test/content_web/views/posts_view_test.exs
new file mode 100644
index 00000000..203cc6bd
--- /dev/null
+++ b/apps/content/test/content_web/views/posts_view_test.exs
@@ -0,0 +1,14 @@
+defmodule Content.PostsViewTest do
+ use Content.ConnCase
+
+ import Content.PostsView
+ import Phoenix.HTML, only: [safe_to_string: 1]
+
+ test "auto_paragraph_tags/1 with nil" do
+ assert safe_to_string(auto_paragraph_tags(nil)) =~ ""
+ end
+
+ test "auto_paragraph_tags/1 with text" do
+ assert safe_to_string(auto_paragraph_tags("Bloop\n\nBloop")) =~ "
Bloop
\nBloop
"
+ end
+end
diff --git a/apps/content/test/support/conn_case.ex b/apps/content/test/support/conn_case.ex
index 34079cbd..987e75ee 100644
--- a/apps/content/test/support/conn_case.ex
+++ b/apps/content/test/support/conn_case.ex
@@ -32,7 +32,7 @@ defmodule Content.ConnCase do
defmacro as_admin(do: expression) do
quote do
- with_mock AuthWeb.Plugs.RequireAuth, [call: fn(conn, _opts) -> conn end] do
+ with_mock Pow.Plug.RequireAuthenticated, [call: fn(conn, _opts) -> conn end] do
with_mock AuthWeb.Plugs.RequireAdmin, [call: fn(conn, _opts) -> conn end] do
unquote(expression)
end
diff --git a/apps/core/lib/core_web/templates/layout/_menu.html.eex b/apps/core/lib/core_web/templates/layout/_menu.html.eex
index a025c4f1..4af7bc09 100644
--- a/apps/core/lib/core_web/templates/layout/_menu.html.eex
+++ b/apps/core/lib/core_web/templates/layout/_menu.html.eex
@@ -4,7 +4,7 @@
Home
- <%= if Auth.Roles.has_role?(@conn, :admin) do %>
+ <%= if has_role?(@conn, :admin) do %>
Admin
<% end %>
diff --git a/apps/core/lib/core_web/templates/layout/_side_menu.html.eex b/apps/core/lib/core_web/templates/layout/_side_menu.html.eex
index 82029885..76b7292e 100644
--- a/apps/core/lib/core_web/templates/layout/_side_menu.html.eex
+++ b/apps/core/lib/core_web/templates/layout/_side_menu.html.eex
@@ -1,6 +1,6 @@