diff --git a/alchemy-devise.gemspec b/alchemy-devise.gemspec index 73167b6..4a45ffb 100644 --- a/alchemy-devise.gemspec +++ b/alchemy-devise.gemspec @@ -15,7 +15,7 @@ Gem::Specification.new do |s| s.files = Dir["{app,config,db,lib}/**/*", "LICENSE", "CHANGELOG.md", "README.md"] - s.add_dependency "alchemy_cms", [">= 8.4.0.a", "< 9.0"] + s.add_dependency "alchemy_cms", [">= 8.4.2", "< 9.0"] s.add_dependency "devise", ">= 4.9", "< 6.0" s.add_dependency "flickwerk", ["~> 0.3.6"] diff --git a/config/initializers/alchemy.rb b/config/initializers/alchemy.rb index 2b4a410..7ef4b45 100644 --- a/config/initializers/alchemy.rb +++ b/config/initializers/alchemy.rb @@ -3,17 +3,16 @@ Rails.application.config.to_prepare do Alchemy.config.abilities.add("Alchemy::Devise::Ability") - Alchemy::Modules.register_module({ - name: "users", - engine_name: "alchemy", - position: 4.1, - navigation: { - name: "modules.users", - controller: "/alchemy/admin/users", - action: "index", - icon: "group" - } - }) + unless Alchemy.config.menu.any? { |item| item.name == "users" } + Alchemy.config.menu.insert( + 4, + name: "users", + title: "modules.users", + icon: "group", + url: -> { alchemy.admin_users_path }, + condition: -> { can?(:index, :alchemy_admin_users) } + ) + end Alchemy.config.signup_path = "/admin/signup" Alchemy.config.login_path = "/admin/login" diff --git a/spec/initializers/alchemy_spec.rb b/spec/initializers/alchemy_spec.rb new file mode 100644 index 0000000..92cf8ab --- /dev/null +++ b/spec/initializers/alchemy_spec.rb @@ -0,0 +1,13 @@ +require "rails_helper" + +RSpec.describe "Alchemy initializer" do + it "lists the users entry between languages and sites in the menu" do + expect(Alchemy::Admin::MainNavigation::Menu.new.items.map(&:name).first(6)).to eq(%w[dashboard pages menus languages users sites]) + end + + it "links the users entry to the users admin" do + users = Alchemy.config.menu.find { |item| item.name == "users" } + view_context = double("view context", alchemy: Alchemy::Engine.routes.url_helpers) + expect(users.path(view_context)).to eq("/admin/users") + end +end