.credo.exs

@@ -157,17 +157,17 @@
         #
         # Controversial and experimental checks (opt-in, just replace `false` with `[]`)
         #
-        {Credo.Check.Consistency.MultiAliasImportRequireUse, []},
-        {Credo.Check.Consistency.UnusedVariableNames, [force: :meaningful]},
+        {Credo.Check.Consistency.MultiAliasImportRequireUse, false},
+        {Credo.Check.Consistency.UnusedVariableNames, false},
         {Credo.Check.Design.DuplicatedCode, false},
         {Credo.Check.Readability.AliasAs, false},
         {Credo.Check.Readability.BlockPipe, false},
         {Credo.Check.Readability.ImplTrue, false},
         {Credo.Check.Readability.MultiAlias, false},
-        {Credo.Check.Readability.SeparateAliasRequire, []},
+        {Credo.Check.Readability.SeparateAliasRequire, false},
         {Credo.Check.Readability.SinglePipe, false},
         {Credo.Check.Readability.Specs, false},
-        {Credo.Check.Readability.StrictModuleLayout, []},
+        {Credo.Check.Readability.StrictModuleLayout, false},
         {Credo.Check.Readability.WithCustomTaggedTuple, false},
         {Credo.Check.Refactor.ABCSize, false},
         {Credo.Check.Refactor.AppendSingleItem, false},
@@ -176,9 +176,9 @@
         {Credo.Check.Refactor.NegatedIsNil, false},
         {Credo.Check.Refactor.PipeChainStart, false},
         {Credo.Check.Refactor.VariableRebinding, false},
-        {Credo.Check.Warning.LeakyEnvironment, []},
-        {Credo.Check.Warning.MapGetUnsafePass, []},
-        {Credo.Check.Warning.UnsafeToAtom, []}
+        {Credo.Check.Warning.LeakyEnvironment, false},
+        {Credo.Check.Warning.MapGetUnsafePass, false},
+        {Credo.Check.Warning.UnsafeToAtom, false}
 
         #
         # Custom checks can be created using `mix credo.gen.check`.

.drone.yml

@@ -77,7 +77,7 @@ services:
 volumes:
   - name: cache
     host:
-      path: /run/media/default/ssdsrv/gitea/drone-cache
+      path: /tmp/drone-cache
   - name: docker_sock
     host:
       path: /var/run/docker.sock

CHANGELOG.md

@@ -1,7 +1,3 @@
-# v0.4.1
-- Fix button and tag text wrapping
-- Code quality fixes
-
 # v0.4.0
 - Make tables sortable
 - Add link to changelog from version number

assets/css/components.scss

@@ -25,7 +25,6 @@
   }
 
   .btn {
-    @apply inline-block break-all min-w-4;
     @apply focus:outline-none px-4 py-2 rounded-lg;
     @apply shadow-sm focus:shadow-lg;
     @apply transition-all duration-300 ease-in-out;
@@ -52,7 +51,6 @@
   }
 
   .link {
-    @apply inline-block break-all min-w-4;
     @apply hover:underline;
     @apply transition-colors duration-500 ease-in-out;
   }

assets/tailwind.config.js

@@ -28,20 +28,6 @@ module.exports = {
         128: '32rem',
         192: '48rem',
         256: '64rem'
-      },
-      minWidth: {
-        4: '1rem',
-        8: '2rem',
-        12: '3rem',
-        16: '4rem',
-        20: '8rem'
-      },
-      maxWidth: {
-        4: '1rem',
-        8: '2rem',
-        12: '3rem',
-        16: '4rem',
-        20: '8rem'
       }
     }
   },

lib/cannery/accounts.ex

@@ -196,7 +196,7 @@ defmodule Cannery.Accounts do
          {:ok, _} <- Repo.transaction(user_email_multi(user, email, context)) do
       :ok
     else
-      _error_tuple -> :error
+      _ -> :error
     end
   end
 
@@ -265,7 +265,7 @@ defmodule Cannery.Accounts do
     |> Repo.transaction()
     |> case do
       {:ok, %{user: user}} -> {:ok, user}
-      {:error, :user, changeset, _changes_so_far} -> {:error, changeset}
+      {:error, :user, changeset, _} -> {:error, changeset}
     end
   end
 
@@ -372,7 +372,7 @@ defmodule Cannery.Accounts do
          {:ok, %{user: user}} <- Repo.transaction(confirm_user_multi(user)) do
       {:ok, user}
     else
-      _error_tuple -> :error
+      _ -> :error
     end
   end
 
@@ -420,7 +420,7 @@ defmodule Cannery.Accounts do
          %User{} = user <- Repo.one(query) do
       user
     else
-      _error_tuple -> nil
+      _ -> nil
     end
   end
 
@@ -444,7 +444,7 @@ defmodule Cannery.Accounts do
     |> Repo.transaction()
     |> case do
       {:ok, %{user: user}} -> {:ok, user}
-      {:error, :user, changeset, _changes_so_far} -> {:error, changeset}
+      {:error, :user, changeset, _} -> {:error, changeset}
     end
   end
 end

lib/cannery/accounts/user.ex

@@ -171,7 +171,7 @@ defmodule Cannery.Accounts.User do
     Bcrypt.verify_pass(password, hashed_password)
   end
 
-  def valid_password?(_invalid_user, _invalid_password) do
+  def valid_password?(_, _) do
     Bcrypt.no_user_verify()
     false
   end

lib/cannery/ammo.ex

@@ -308,7 +308,7 @@ defmodule Cannery.Ammo do
   def get_used_count(%AmmoGroup{} = ammo_group) do
     ammo_group
     |> Repo.preload(:shot_groups)
-    |> Map.fetch!(:shot_groups)
+    |> Map.get(:shot_groups)
     |> Enum.map(fn %{count: count} -> count end)
     |> Enum.sum()
   end

lib/cannery/containers.ex

@@ -215,7 +215,7 @@ defmodule Cannery.Containers do
   def get_container_rounds!(%Container{} = container) do
     container
     |> Repo.preload(:ammo_groups)
-    |> Map.fetch!(:ammo_groups)
+    |> Map.get(:ammo_groups)
     |> Enum.map(fn %{count: count} -> count end)
     |> Enum.sum()
   end

lib/cannery/release.ex

@@ -9,7 +9,7 @@ defmodule Cannery.Release do
 
   def rollback(repo, version) do
     load_app()
-    {:ok, _fun, _opts} = Ecto.Migrator.with_repo(repo, &Ecto.Migrator.run(&1, :down, to: version))
+    {:ok, _, _} = Ecto.Migrator.with_repo(repo, &Ecto.Migrator.run(&1, :down, to: version))
   end
 
   defp load_app do
@@ -20,7 +20,7 @@ defmodule Cannery.Release do
     load_app()
 
     for repo <- Application.fetch_env!(@app, :ecto_repos) do
-      {:ok, _fun, _opts} = Ecto.Migrator.with_repo(repo, &Ecto.Migrator.run(&1, :up, all: true))
+      {:ok, _, _} = Ecto.Migrator.with_repo(repo, &Ecto.Migrator.run(&1, :up, all: true))
     end
   end
 end

lib/cannery/repo/migrator.ex

@@ -6,11 +6,11 @@ defmodule Cannery.Repo.Migrator do
   use GenServer
   require Logger
 
-  def start_link(_opts) do
+  def start_link(_) do
     GenServer.start_link(__MODULE__, [], [])
   end
 
-  def init(_opts) do
+  def init(_) do
     migrate!()
     {:ok, nil}
   end

lib/cannery_web.ex

@@ -71,7 +71,6 @@ defmodule CanneryWeb do
     quote do
       use Phoenix.Router
 
-      # credo:disable-for-next-line Credo.Check.Consistency.MultiAliasImportRequireUse
       import Plug.Conn
       import Phoenix.Controller
       import Phoenix.LiveView.Router
@@ -80,9 +79,7 @@ defmodule CanneryWeb do
 
   def channel do
     quote do
-      # credo:disable-for-next-line Credo.Check.Consistency.MultiAliasImportRequireUse
       use Phoenix.Channel
-      # credo:disable-for-next-line Credo.Check.Consistency.MultiAliasImportRequireUse
       import CanneryWeb.Gettext
     end
   end
@@ -90,18 +87,14 @@ defmodule CanneryWeb do
   defp view_helpers do
     quote do
       # Use all HTML functionality (forms, tags, etc)
-      # credo:disable-for-next-line Credo.Check.Consistency.MultiAliasImportRequireUse
       use Phoenix.HTML
 
       # Import LiveView and .heex helpers (live_render, live_patch, <.form>, etc)
-      # credo:disable-for-next-line Credo.Check.Consistency.MultiAliasImportRequireUse
       import Phoenix.LiveView.Helpers
 
       # Import basic rendering functionality (render, render_layout, etc)
-      # credo:disable-for-next-line Credo.Check.Consistency.MultiAliasImportRequireUse
       import Phoenix.View
 
-      # credo:disable-for-next-line Credo.Check.Consistency.MultiAliasImportRequireUse
       import CanneryWeb.{ErrorHelpers, Gettext, LiveHelpers, ViewHelpers}
       alias CanneryWeb.Router.Helpers, as: Routes
     end

lib/cannery_web/components/container_card.ex

@@ -14,11 +14,11 @@ defmodule CanneryWeb.Components.ContainerCard do
     ~H"""
     <div
       id={"container-#{@container.id}"}
-      class="overflow-hidden max-w-full mx-4 my-2 px-8 py-4 flex flex-col justify-center items-center space-y-4
+      class="mx-4 my-2 px-8 py-4 flex flex-col justify-center items-center space-y-4
         border border-gray-400 rounded-lg shadow-lg hover:shadow-md
         transition-all duration-300 ease-in-out"
     >
-      <div class="max-w-full mb-4 flex flex-col justify-center items-center space-y-2">
+      <div class="mb-4 flex flex-col justify-center items-center space-y-2">
         <%= live_redirect to: Routes.container_show_path(Endpoint, :show, @container),
                       class: "link" do %>
           <h1 class="px-4 py-2 rounded-lg title text-xl">

lib/cannery_web/components/tag_card.ex

@@ -22,7 +22,7 @@ defmodule CanneryWeb.Components.TagCard do
   def simple_tag_card(assigns) do
     ~H"""
     <h1
-      class="inline-block break-all mx-2 my-1 px-4 py-2 rounded-lg title text-xl"
+      class="mx-2 my-1 px-4 py-2 rounded-lg title text-xl"
       style={"color: #{@tag.text_color}; background-color: #{@tag.bg_color}"}
     >
       <%= @tag.name %>

lib/cannery_web/live/ammo_group_live/index.ex

@@ -121,21 +121,19 @@ defmodule CanneryWeb.AmmoGroupLive.Index do
 
     {staged,
      ~H"""
-     <div class="min-w-20 py-2 px-4 h-full flex flex-col justify-center items-center">
-       <button
-         type="button"
-         class="mx-2 my-1 btn btn-primary"
-         phx-click="toggle_staged"
-         phx-value-ammo_group_id={ammo_group.id}
-       >
-         <%= if ammo_group.staged, do: gettext("Unstage"), else: gettext("Stage") %>
-       </button>
+     <button
+       type="button"
+       class="btn btn-primary"
+       phx-click="toggle_staged"
+       phx-value-ammo_group_id={ammo_group.id}
+     >
+       <%= if ammo_group.staged, do: gettext("Unstage"), else: gettext("Stage") %>
+     </button>
 
-       <%= live_patch(dgettext("actions", "Record shots"),
-         to: Routes.ammo_group_index_path(Endpoint, :add_shot_group, ammo_group),
-         class: "mx-2 my-1 btn btn-primary"
-       ) %>
-     </div>
+     <%= live_patch(dgettext("actions", "Record shots"),
+       to: Routes.ammo_group_index_path(Endpoint, :add_shot_group, ammo_group),
+       class: "btn btn-primary"
+     ) %>
      """}
   end
 
@@ -176,17 +174,11 @@ defmodule CanneryWeb.AmmoGroupLive.Index do
   defp get_value_for_key("container", %{container: nil}), do: {nil, nil}
 
   defp get_value_for_key("container", %{container: %{name: container_name}} = ammo_group) do
-    assigns = %{ammo_group: ammo_group}
-
     {container_name,
-     ~H"""
-     <div class="min-w-20 py-2 px-4 h-full space-x-4 flex justify-center items-center">
-       <%= live_patch(@ammo_group.container.name,
-         to: Routes.ammo_group_index_path(Endpoint, :move, @ammo_group),
-         class: "btn btn-primary"
-       ) %>
-     </div>
-     """}
+     live_patch(container_name,
+       to: Routes.ammo_group_index_path(Endpoint, :move, ammo_group),
+       class: "btn btn-primary"
+     )}
   end
 
   defp get_value_for_key(key, ammo_group),

lib/cannery_web/live/ammo_group_live/show.ex

@@ -44,7 +44,7 @@ defmodule CanneryWeb.AmmoGroupLive.Show do
   @impl true
   def handle_event(
         "delete",
-        _params,
+        _,
         %{assigns: %{ammo_group: ammo_group, current_user: current_user}} = socket
       ) do
     ammo_group |> Ammo.delete_ammo_group!(current_user)
@@ -58,7 +58,7 @@ defmodule CanneryWeb.AmmoGroupLive.Show do
   @impl true
   def handle_event(
         "toggle_staged",
-        _params,
+        _,
         %{assigns: %{ammo_group: ammo_group, current_user: current_user}} = socket
       ) do
     {:ok, ammo_group} =

lib/cannery_web/live/ammo_type_live/show.ex

@@ -14,7 +14,7 @@ defmodule CanneryWeb.AmmoTypeLive.Show do
   end
 
   @impl true
-  def handle_params(%{"id" => id}, _params, %{assigns: %{current_user: current_user}} = socket) do
+  def handle_params(%{"id" => id}, _, %{assigns: %{current_user: current_user}} = socket) do
     ammo_type = Ammo.get_ammo_type!(id, current_user)
 
     socket =
@@ -32,7 +32,7 @@ defmodule CanneryWeb.AmmoTypeLive.Show do
   @impl true
   def handle_event(
         "delete",
-        _params,
+        _,
         %{assigns: %{ammo_type: ammo_type, current_user: current_user}} = socket
       ) do
     %{name: ammo_type_name} = ammo_type |> Ammo.delete_ammo_type!(current_user)

lib/cannery_web/live/container_live/index.html.heex

@@ -20,7 +20,7 @@
     ) %>
   <% end %>
 
-  <div class="max-w-full flex flex-row flex-wrap justify-center items-center">
+  <div class="flex flex-row flex-wrap justify-center items-center">
     <%= for container <- @containers do %>
       <.container_card container={container}>
         <:tag_actions>

lib/cannery_web/live/container_live/show.ex

@@ -18,7 +18,7 @@ defmodule CanneryWeb.ContainerLive.Show do
   @impl true
   def handle_params(
         %{"id" => id},
-        _session,
+        _,
         %{assigns: %{current_user: current_user}} = socket
       ) do
     {:noreply, socket |> render_container(id, current_user)}
@@ -53,7 +53,7 @@ defmodule CanneryWeb.ContainerLive.Show do
   @impl true
   def handle_event(
         "delete_container",
-        _params,
+        _,
         %{assigns: %{container: container, current_user: current_user}} = socket
       ) do
     socket =

lib/cannery_web/live/home_live.ex

@@ -29,7 +29,7 @@ defmodule CanneryWeb.HomeLive do
       %{^query => vsn} ->
         {:noreply, redirect(socket, external: "https://hexdocs.pm/#{query}/#{vsn}")}
 
-      _no_query ->
+      _ ->
         {:noreply,
          socket
          |> put_flash(:error, "No dependencies found matching \"#{query}\"")
@@ -133,7 +133,7 @@ defmodule CanneryWeb.HomeLive do
                 to: "https://gitea.bubbletea.dev/shibao/cannery/src/branch/stable/CHANGELOG.md",
                 target: "_blank",
                 rel: "noopener noreferrer" do %>
-            <p>0.4.1</p>
+            <p>0.4.0</p>
             <i class="fas fa-md fa-info-circle"></i>
           <% end %>
         </li>

lib/cannery_web/live/invite_live/index.ex

@@ -119,7 +119,7 @@ defmodule CanneryWeb.InviteLive.Index do
   end
 
   @impl true
-  def handle_event("copy_to_clipboard", _params, socket) do
+  def handle_event("copy_to_clipboard", _, socket) do
     prompt = dgettext("prompts", "Copied to clipboard")
     {:noreply, socket |> put_flash(:info, prompt)}
   end

lib/cannery_web/views/email_view.ex

@@ -2,6 +2,7 @@ defmodule CanneryWeb.EmailView do
   @moduledoc """
   A view for email-related helper functions
   """
-  use CanneryWeb, :view
   alias CanneryWeb.{Endpoint, HomeLive}
+
+  use CanneryWeb, :view
 end

lib/cannery_web/views/error_view.ex

@@ -8,7 +8,7 @@ defmodule CanneryWeb.ErrorView do
       case error_path do
         "404.html" -> dgettext("errors", "Not found")
         "401.html" -> dgettext("errors", "Unauthorized")
-        _other_template -> dgettext("errors", "Internal Server Error")
+        _ -> dgettext("errors", "Internal Server Error")
       end
 
     render("error.html", %{error_string: error_string})

mix.exs

@@ -4,7 +4,7 @@ defmodule Cannery.MixProject do
   def project do
     [
       app: :cannery,
-      version: "0.4.1",
+      version: "0.4.0",
       elixir: "~> 1.12",
       elixirc_paths: elixirc_paths(Mix.env()),
       compilers: [:gettext] ++ Mix.compilers(),

priv/gettext/actions.pot

@@ -160,7 +160,7 @@ msgid "Why not get some ready to shoot?"
 msgstr ""
 
 #, elixir-autogen, elixir-format
-#: lib/cannery_web/live/ammo_group_live/index.ex:134
+#: lib/cannery_web/live/ammo_group_live/index.ex:133
 #: lib/cannery_web/live/ammo_group_live/show.html.heex:86
 #: lib/cannery_web/live/range_live/index.html.heex:36
 msgid "Record shots"

priv/gettext/default.pot

@@ -689,12 +689,12 @@ msgid "New password"
 msgstr ""
 
 #, elixir-autogen, elixir-format
-#: lib/cannery_web/live/ammo_group_live/index.ex:131
+#: lib/cannery_web/live/ammo_group_live/index.ex:130
 msgid "Stage"
 msgstr ""
 
 #, elixir-autogen, elixir-format
-#: lib/cannery_web/live/ammo_group_live/index.ex:131
+#: lib/cannery_web/live/ammo_group_live/index.ex:130
 msgid "Unstage"
 msgstr ""
 

priv/gettext/prompts.pot

@@ -92,7 +92,7 @@ msgid "Are you sure you want to delete the invite for %{name}?"
 msgstr ""
 
 #, elixir-autogen, elixir-format
-#: lib/cannery_web/live/ammo_group_live/index.ex:167
+#: lib/cannery_web/live/ammo_group_live/index.ex:165
 #: lib/cannery_web/live/ammo_group_live/show.html.heex:66
 #: lib/cannery_web/live/ammo_type_live/index.ex:130
 msgid "Are you sure you want to delete this ammo?"

test/cannery/accounts_test.exs

@@ -304,9 +304,9 @@ defmodule Cannery.AccountsTest do
     end
 
     test "deletes all tokens for the given user", %{user: user} do
-      _token = Accounts.generate_user_session_token(user)
+      _ = Accounts.generate_user_session_token(user)
 
-      {:ok, _user} =
+      {:ok, _} =
         Accounts.update_user_password(user, valid_user_password(), %{
           "password" => "new valid password"
         })
@@ -501,8 +501,8 @@ defmodule Cannery.AccountsTest do
     end
 
     test "deletes all tokens for the given user", %{user: user} do
-      _token = Accounts.generate_user_session_token(user)
-      {:ok, _user} = Accounts.reset_user_password(user, %{"password" => "new valid password"})
+      _ = Accounts.generate_user_session_token(user)
+      {:ok, _} = Accounts.reset_user_password(user, %{"password" => "new valid password"})
       refute Repo.get_by(UserToken, user_id: user.id)
     end
   end

test/cannery_web/controllers/user_auth_test.exs

@@ -116,7 +116,7 @@ defmodule CanneryWeb.UserAuthTest do
     end
 
     test "does not authenticate if data is missing", %{conn: conn, current_user: current_user} do
-      _token = Accounts.generate_user_session_token(current_user)
+      _ = Accounts.generate_user_session_token(current_user)
       conn = UserAuth.fetch_current_user(conn, [])
       refute get_session(conn, :user_token)
       refute conn.assigns.current_user

test/cannery_web/controllers/user_confirmation_controller_test.exs

@@ -5,7 +5,8 @@ defmodule CanneryWeb.UserConfirmationControllerTest do
 
   use CanneryWeb.ConnCase, async: true
   import CanneryWeb.Gettext
-  alias Cannery.{Accounts, Repo}
+  alias Cannery.Accounts
+  alias Cannery.Repo
 
   @moduletag :user_confirmation_controller_test
 

test/cannery_web/live/ammo_group_live_test.exs

@@ -51,7 +51,7 @@ defmodule CanneryWeb.AmmoGroupLiveTest do
       #        |> form("#ammo_group-form", ammo_group: @invalid_attrs)
       #        |> render_change() =~ dgettext("errors", "can't be blank")
 
-      {:ok, _view, html} =
+      {:ok, _, html} =
         index_live
         |> form("#ammo_group-form", ammo_group: @create_attrs)
         |> render_submit()
@@ -75,7 +75,7 @@ defmodule CanneryWeb.AmmoGroupLiveTest do
       #        |> form("#ammo_group-form", ammo_group: @invalid_attrs)
       #        |> render_change() =~ dgettext("errors", "can't be blank")
 
-      {:ok, _view, html} =
+      {:ok, _, html} =
         index_live
         |> form("#ammo_group-form",
           ammo_group: @create_attrs |> Map.put("multiplier", to_string(multiplier))
@@ -135,7 +135,7 @@ defmodule CanneryWeb.AmmoGroupLiveTest do
       #        |> form("#shot_group-form", shot_group: @invalid_attrs)
       #        |> render_change() =~ dgettext("errors", "is invalid")
 
-      {:ok, _view, html} =
+      {:ok, _, html} =
         index_live
         |> form("#shot-group-form", shot_group: @shot_group_create_attrs)
         |> render_submit()
@@ -158,7 +158,7 @@ defmodule CanneryWeb.AmmoGroupLiveTest do
       #        |> form("#ammo_group-form", ammo_group: @invalid_attrs)
       #        |> render_change() =~ dgettext("errors", "can't be blank")
 
-      {:ok, _view, html} =
+      {:ok, _, html} =
         index_live
         |> form("#ammo_group-form", ammo_group: @update_attrs)
         |> render_submit()
@@ -204,7 +204,7 @@ defmodule CanneryWeb.AmmoGroupLiveTest do
       #        |> form("#ammo_group-form", ammo_group: @invalid_attrs)
       #        |> render_change() =~ dgettext("errors", "can't be blank")
 
-      {:ok, _view, html} =
+      {:ok, _, html} =
         show_live
         |> form("#ammo_group-form", ammo_group: @update_attrs)
         |> render_submit()
@@ -226,7 +226,7 @@ defmodule CanneryWeb.AmmoGroupLiveTest do
       #        |> form("#shot_group-form", shot_group: @invalid_attrs)
       #        |> render_change() =~ dgettext("errors", "is invalid")
 
-      {:ok, _view, html} =
+      {:ok, _, html} =
         index_live
         |> form("#shot-group-form", shot_group: @shot_group_create_attrs)
         |> render_submit()
@@ -251,7 +251,7 @@ defmodule CanneryWeb.AmmoGroupLiveTest do
       #        |> form("#shot_group-form", shot_group: @invalid_attrs)
       #        |> render_change() =~ dgettext("errors", "is invalid")
 
-      {:ok, _view, html} =
+      {:ok, _, html} =
         index_live
         |> form("#shot-group-form", shot_group: @shot_group_update_attrs)
         |> render_submit()

test/cannery_web/live/ammo_type_live_test.exs

@@ -62,7 +62,7 @@ defmodule CanneryWeb.AmmoTypeLiveTest do
       #        |> form("#ammo_type-form", ammo_type: @invalid_attrs)
       #        |> render_change() =~ dgettext("errors", "can't be blank")
 
-      {:ok, _view, html} =
+      {:ok, _, html} =
         index_live
         |> form("#ammo_type-form", ammo_type: @create_attrs)
         |> render_submit()
@@ -86,7 +86,7 @@ defmodule CanneryWeb.AmmoTypeLiveTest do
       #        |> form("#ammo_type-form", ammo_type: @invalid_attrs)
       #        |> render_change() =~ dgettext("errors", "can't be blank")
 
-      {:ok, _view, html} =
+      {:ok, _, html} =
         index_live
         |> form("#ammo_type-form", ammo_type: @update_attrs)
         |> render_submit()
@@ -128,7 +128,7 @@ defmodule CanneryWeb.AmmoTypeLiveTest do
       #        |> form("#ammo_type-form", ammo_type: @invalid_attrs)
       #        |> render_change() =~ dgettext("errors", "can't be blank")
 
-      {:ok, _view, html} =
+      {:ok, _, html} =
         show_live
         |> form("#ammo_type-form", ammo_type: @update_attrs)
         |> render_submit()

test/cannery_web/live/container_live_test.exs

@@ -52,7 +52,7 @@ defmodule CanneryWeb.ContainerLiveTest do
       #        |> form("#container-form", container: @invalid_attrs)
       #        |> render_change() =~ dgettext("errors", "can't be blank")
 
-      {:ok, _view, html} =
+      {:ok, _, html} =
         index_live
         |> form("#container-form", container: @create_attrs)
         |> render_submit()
@@ -78,7 +78,7 @@ defmodule CanneryWeb.ContainerLiveTest do
       #        |> form("#container-form", container: @invalid_attrs)
       #        |> render_change() =~ dgettext("errors", "can't be blank")
 
-      {:ok, _view, html} =
+      {:ok, _, html} =
         index_live
         |> form("#container-form", container: @update_attrs)
         |> render_submit()
@@ -123,7 +123,7 @@ defmodule CanneryWeb.ContainerLiveTest do
       #        |> form("#container-form", container: @invalid_attrs)
       #        |> render_change() =~ dgettext("errors", "can't be blank")
 
-      {:ok, _view, html} =
+      {:ok, _, html} =
         show_live
         |> form("#container-form", container: @update_attrs)
         |> render_submit()

test/cannery_web/live/invite_live_test.exs

@@ -40,7 +40,7 @@ defmodule CanneryWeb.InviteLiveTest do
       #        |> form("#invite-form", invite: @invalid_attrs)
       #        |> render_change() =~ dgettext("errors", "can't be blank")
 
-      {:ok, _view, html} =
+      {:ok, _, html} =
         index_live
         |> form("#invite-form", invite: @create_attrs)
         |> render_submit()
@@ -63,7 +63,7 @@ defmodule CanneryWeb.InviteLiveTest do
       #        |> form("#invite-form", invite: @invalid_attrs)
       #        |> render_change() =~ dgettext("errors", "can't be blank")
 
-      {:ok, _view, html} =
+      {:ok, _, html} =
         index_live
         |> form("#invite-form", invite: @update_attrs)
         |> render_submit()

test/cannery_web/live/range_live_test.exs

@@ -49,7 +49,7 @@ defmodule CanneryWeb.RangeLiveTest do
       #        |> form("#shot_group-form", shot_group: @invalid_attrs)
       #        |> render_change() =~ dgettext("errors", "is invalid")
 
-      {:ok, _view, html} =
+      {:ok, _, html} =
         index_live
         |> form("#shot-group-form", shot_group: @create_attrs)
         |> render_submit()
@@ -71,7 +71,7 @@ defmodule CanneryWeb.RangeLiveTest do
       #        |> form("#shot_group-form", shot_group: @invalid_attrs)
       #        |> render_change() =~ dgettext("errors", "is invalid")
 
-      {:ok, _view, html} =
+      {:ok, _, html} =
         index_live
         |> form("#shot-group-form", shot_group: @update_attrs)
         |> render_submit()

test/cannery_web/live/tag_live_test.exs

@@ -53,7 +53,7 @@ defmodule CanneryWeb.TagLiveTest do
       #        |> form("#tag-form", tag: @invalid_attrs)
       #        |> render_change() =~ dgettext("errors", "can't be blank")
 
-      {:ok, _view, html} =
+      {:ok, _, html} =
         index_live
         |> form("#tag-form", tag: @create_attrs)
         |> render_submit()
@@ -75,7 +75,7 @@ defmodule CanneryWeb.TagLiveTest do
       #        |> form("#tag-form", tag: @invalid_attrs)
       #        |> render_change() =~ dgettext("errors", "can't be blank")
 
-      {:ok, _view, html} =
+      {:ok, _, html} =
         index_live
         |> form("#tag-form", tag: @update_attrs)
         |> render_submit()

test/cannery_web/views/error_view_test.exs

@@ -5,11 +5,12 @@ defmodule CanneryWeb.ErrorViewTest do
 
   use CanneryWeb.ConnCase, async: true
   import CanneryWeb.Gettext
-  # Bring render/3 and render_to_string/3 for testing custom views
-  import Phoenix.View
 
   @moduletag :error_view_test
 
+  # Bring render/3 and render_to_string/3 for testing custom views
+  import Phoenix.View
+
   test "renders 404.html" do
     assert render_to_string(CanneryWeb.ErrorView, "404.html", []) =~
              dgettext("errors", "Not found")

test/support/conn_case.ex

@@ -25,7 +25,6 @@ defmodule CanneryWeb.ConnCase do
       # Import conveniences for testing with connections
       import Plug.Conn
       import Phoenix.ConnTest
-      # credo:disable-for-next-line Credo.Check.Consistency.MultiAliasImportRequireUse
       import Cannery.Fixtures
       import CanneryWeb.ConnCase
 

test/support/data_case.ex

@@ -22,8 +22,10 @@ defmodule Cannery.DataCase do
       alias Cannery.Repo
 
       import Ecto
-      import Ecto.{Changeset, Query}
-      import Cannery.{DataCase, Fixtures}
+      import Ecto.Changeset
+      import Ecto.Query
+      import Cannery.DataCase
+      import Cannery.Fixtures
     end
   end
 
@@ -43,7 +45,7 @@ defmodule Cannery.DataCase do
   """
   def errors_on(changeset) do
     Ecto.Changeset.traverse_errors(changeset, fn {message, opts} ->
-      Regex.replace(~r"%{(\w+)}", message, fn _content, key ->
+      Regex.replace(~r"%{(\w+)}", message, fn _, key ->
         opts |> Keyword.get(String.to_existing_atom(key), key) |> to_string()
       end)
     end)