From 8539543d3d59af92f00355b8d914fb55ba474370 Mon Sep 17 00:00:00 2001
From: Andrew Dryga <andrew@dryga.com>
Date: Mon, 3 Jul 2023 17:11:47 -0600
Subject: [PATCH] Bump Elixir/OTP versions (#1730)

---
 .github/workflows/elixir.yml                  | 20 +++++++++----------
 .tool-versions                                |  4 ++--
 .../web/controllers/auth_controller_test.exs  |  5 +++--
 3 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/.github/workflows/elixir.yml b/.github/workflows/elixir.yml
index 6cf2159a2..ab9687d40 100644
--- a/.github/workflows/elixir.yml
+++ b/.github/workflows/elixir.yml
@@ -39,8 +39,8 @@ jobs:
     steps:
       - uses: erlef/setup-beam@v1
         with:
-          otp-version: "25"
-          elixir-version: "1.15"
+          otp-version: "26.0.2"
+          elixir-version: "1.15.2"
       - uses: actions/checkout@v3
       - uses: actions/cache@v3
         name: Elixir Deps Cache
@@ -92,8 +92,8 @@ jobs:
       - uses: erlef/setup-beam@v1
         id: setup-beam
         with:
-          otp-version: "25"
-          elixir-version: "1.15"
+          otp-version: "26.0.2"
+          elixir-version: "1.15.2"
       - uses: actions/checkout@v3
       - uses: actions/cache@v3
         name: Elixir Deps Cache
@@ -145,8 +145,8 @@ jobs:
     steps:
       - uses: erlef/setup-beam@v1
         with:
-          otp-version: "25"
-          elixir-version: "1.15"
+          otp-version: "26.0.2"
+          elixir-version: "1.15.2"
       - uses: actions/checkout@v3
       - uses: actions/cache@v3
         name: Elixir Deps Cache
@@ -214,8 +214,8 @@ jobs:
           sudo apt-get install -q -y postgresql-client
       - uses: erlef/setup-beam@v1
         with:
-          otp-version: "25"
-          elixir-version: "1.15"
+          otp-version: "26.0.2"
+          elixir-version: "1.15.2"
       - uses: actions/cache@v3
         name: Elixir Deps Cache
         env:
@@ -316,8 +316,8 @@ jobs:
       - uses: nanasess/setup-chromedriver@v1
       - uses: erlef/setup-beam@v1
         with:
-          otp-version: "25"
-          elixir-version: "1.15"
+          otp-version: "26.0.2"
+          elixir-version: "1.15.2"
       - uses: actions/setup-node@v3
         with:
           node-version: 18
diff --git a/.tool-versions b/.tool-versions
index 0d075abc2..835d4c052 100644
--- a/.tool-versions
+++ b/.tool-versions
@@ -1,8 +1,8 @@
 # These are used for the dev environment.
 # This should match the versions used in the built product.
 nodejs 18.16.0
-elixir 1.15.0-otp-25
-erlang 25.3.2.2
+elixir 1.15.2-otp-26
+erlang 26.0.2
 terraform 1.5.0
 
 # Used for static analysis
diff --git a/elixir/apps/web/test/web/controllers/auth_controller_test.exs b/elixir/apps/web/test/web/controllers/auth_controller_test.exs
index 15e8e9073..3aad05ff5 100644
--- a/elixir/apps/web/test/web/controllers/auth_controller_test.exs
+++ b/elixir/apps/web/test/web/controllers/auth_controller_test.exs
@@ -216,8 +216,9 @@ defmodule Web.AuthControllerTest do
         verify_sign_in_token_path =
           "/#{account.id}/sign_in/providers/#{provider.id}/verify_sign_in_token"
 
-        assert email.text_body =~
-                 "#{verify_sign_in_token_path}?identity_id=#{identity.id}&amp;secret="
+        assert email.text_body =~ "#{verify_sign_in_token_path}"
+        assert email.text_body =~ "identity_id=#{identity.id}&amp;secret="
+        assert email.text_body =~ "secret="
       end)
 
       assert redirected_to(conn) == "/#{account.id}/sign_in/providers/email/#{provider.id}"