Merge pull request #246 from AlchemyCMS/dependabot/bundler/devise-gte-4.9-and-lt-6.0

Allow Devise 5.0

Author: tvdeyen

Gemfile

@@ -20,6 +20,8 @@ group :test do
   if ENV["GITHUB_ACTIONS"]
     gem "simplecov-cobertura", "~> 3.0"
   end
+  gem "selenium-webdriver", "~> 4.40"
+  gem "capybara-screenshot", "~> 1.0"
 end
 
 gem "github_fast_changelog", require: false

alchemy-devise.gemspec

@@ -16,7 +16,7 @@ Gem::Specification.new do |s|
   s.files = Dir["{app,config,db,lib}/**/*", "LICENSE", "CHANGELOG.md", "README.md"]
 
   s.add_dependency "alchemy_cms", [">= 8.0.0.a", "< 9.0"]
-  s.add_dependency "devise", ["~> 4.9"]
+  s.add_dependency "devise", ">= 4.9", "< 6.0"
   s.add_dependency "flickwerk", ["~> 0.3.6"]
 
   s.add_development_dependency "capybara"

app/views/alchemy/admin/passwords/edit.html.erb

@@ -12,9 +12,7 @@
     <p><%= Alchemy.t('Please enter a new password') %></p>
   <% end %>
 <% else %>
-  <div id="errors" style="display: block">
-    <%= devise_error_messages! %>
-  </div>
+  <%= render "devise/shared/error_messages", resource: resource %>
 <% end %>
   <%= alchemy_form_for resource, as: resource_name, url: admin_update_password_path, method: 'patch' do |f| %>
     <%= f.hidden_field :reset_password_token %>

app/views/alchemy/admin/passwords/new.html.erb

@@ -12,9 +12,7 @@
     <p><%= Alchemy.t('Please enter your email address') %></p>
   <% end %>
 <% else %>
-  <div id="errors" style="display: block">
-    <%= devise_error_messages! %>
-  </div>
+  <%= render "devise/shared/error_messages", resource: resource %>
 <% end %>
   <%= alchemy_form_for :user, url: admin_reset_password_path, html: {method: 'post'} do |f| %>
     <%= f.input :email,

app/views/devise/shared/_error_messages.html.erb

@@ -0,0 +1,12 @@
+<% if resource.errors.any? %>
+  <alchemy-message data-turbo-temporary type="error">
+    <h2>
+      <%= Alchemy.t("default_message", scope: "forms.error_notification") %>
+    </h2>
+    <ul>
+      <% resource.errors.full_messages.each do |message| %>
+        <li><%= message %></li>
+      <% end %>
+    </ul>
+  </alchemy-message>
+<% end %>

spec/features/password_reset_feature_spec.rb

@@ -20,6 +20,15 @@
       .to have_content("You will receive an email with instructions on how to reset your password in a few minutes.")
   end
 
+  it "Displays error if email not found." do
+    visit admin_new_password_path
+
+    fill_in :user_email, with: "wrong@email.com"
+    click_button "Send reset instructions"
+
+    expect(page).to have_content("Email not found")
+  end
+
   it "User can visit edit password form." do
     visit admin_edit_password_path(id: user.id, reset_password_token: "1234")
 
@@ -41,4 +50,14 @@
     expect(page)
       .to have_content("Your password has been changed successfully.")
   end
+
+  it "Displays error if reset token is wrong." do
+    visit admin_edit_password_path(id: user.id, reset_password_token: "1234")
+
+    fill_in :user_password, with: "secret123"
+    fill_in :user_password_confirmation, with: "secret123"
+    click_button "Change password"
+
+    expect(page).to have_content("Reset password token is invalid")
+  end
 end

spec/rails_helper.rb

@@ -9,7 +9,8 @@
 require "rails-controller-testing"
 require "rspec/rails"
 require "rspec/active_model/mocks"
-require "capybara/rails"
+require "capybara/rspec"
+require "capybara-screenshot/rspec"
 require "factory_bot_rails"
 require "alchemy/test_support/integration_helpers"
 require "alchemy/test_support/config_stubbing"