Fixes for Solidus 2.5

.travis.yml

@@ -12,6 +12,8 @@ env:
     - SOLIDUS_BRANCH=v2.2
     - SOLIDUS_BRANCH=v2.3
     - SOLIDUS_BRANCH=v2.4
+    - SOLIDUS_BRANCH=v2.5
+    - SOLIDUS_BRANCH=v2.6
     - SOLIDUS_BRANCH=master
 matrix:
   fast_finish: true

app/views/spree/admin/shared/_alchemy_sub_menu.html.erb

@@ -0,0 +1,23 @@
+<ul class="admin-subnav">
+  <% if can?(:index, :alchemy_admin_pages) %>
+    <%= tab :pages, label: :pages, url: alchemy.admin_pages_path %>
+  <% end %>
+  <% if can?(:index, :alchemy_admin_sites) %>
+    <%= tab :sites, label: :sites, url: alchemy.admin_sites_path %>
+  <% end %>
+  <% if can?(:index, :alchemy_admin_languages) %>
+    <%= tab :languages, label: :languages, url: alchemy.admin_languages_path %>
+  <% end %>
+  <% if can?(:index, :alchemy_admin_tags) %>
+    <%= tab :tags, label: :tags, url: alchemy.admin_tags_path %>
+  <% end %>
+  <% if defined?(Alchemy::User) && can?(:index, :alchemy_admin_users) %>
+    <%= tab :users, label: :users, url: alchemy.admin_users_path %>
+  <% end %>
+  <% if can?(:index, :alchemy_admin_pictures) %>
+    <%= tab :pictures, label: :pictures, url: alchemy.admin_pictures_path %>
+  <% end %>
+  <% if can?(:index, :alchemy_admin_attachments) %>
+    <%= tab :attachments, label: :attachments, url: alchemy.admin_attachments_path %>
+  <% end %>
+</ul>

config/initializers/alchemy.rb

@@ -1,10 +1,49 @@
-Alchemy::Modules.register_module({
+alchemy_module = {
   engine_name: 'spree',
   name: 'solidus',
   navigation: {
     controller: 'spree/admin/orders',
     action: 'index',
-    name: 'Shop',
-    image: 'alchemy/solidus/alchemy_module_icon.png'
+    name: 'Store',
+    image: 'alchemy/solidus/alchemy_module_icon.png',
+    sub_navigation: [
+      {
+        controller: 'spree/admin/orders',
+        action: 'index',
+        name: 'Orders'
+      },
+      {
+        controller: 'spree/admin/products',
+        action: 'index',
+        name: 'Products'
+      },
+      {
+        controller: 'spree/admin/reports',
+        action: 'index',
+        name: 'Reports'
+      },
+      {
+        controller: 'spree/admin/promotions',
+        action: 'index',
+        name: 'Promotions'
+      },
+      {
+        controller: 'spree/admin/stock_items',
+        action: 'index',
+        name: 'Stock'
+      }
+    ]
   }
-})
+}
+
+if defined?(Spree::Auth::Engine)
+  alchemy_module[:navigation][:sub_navigation].push(
+    {
+      controller: 'spree/admin/users',
+      action: 'index',
+      name: 'Users'
+    }
+  )
+end
+
+Alchemy::Modules.register_module(alchemy_module)

config/locales/alchemy_solidus_en.yml

@@ -2,4 +2,11 @@ en:
   spree:
     admin:
       tab:
-        cms: CMS
+        cms: CMS
+        pages: Pages
+        sites: Sites
+        languages: Languages
+        tags: Tags
+        users: Users
+        pictures: Pictures
+        attachments: Attachments

config/locales/alchemy_solidus_it.yml

@@ -2,4 +2,10 @@ it:
   spree:
     admin:
       tab:
-        cms: CMS
+        cms: CMS
+        pages: "Pagine"
+        sites: "Siti"
+        languages: "Lingue"
+        tags: "Tags"
+        pictures: "Immagini"
+        attachments: "File"

lib/alchemy/solidus/engine.rb

@@ -33,6 +33,16 @@ class Engine < ::Rails::Engine
           require 'alchemy/solidus/spree_install_generator_fix'
         end
       end
+
+      # Fix for +belongs_to :bill_address+ in {Spree::UserAddressBook}
+      # Solidus has this set to +false+ in {Spree::Base}, but {Alchemy::User} does not inherit from it.
+      initializer 'alchemy_solidus.belongs_bill_address_fix' do
+        if Alchemy.user_class_name == 'Alchemy::User'
+          ActiveSupport.on_load(:active_record) do
+            Alchemy::User.belongs_to_required_by_default = false
+          end
+        end
+      end
     end
   end
 end

lib/generators/alchemy/solidus/install/install_generator.rb

@@ -20,6 +20,8 @@ class InstallGenerator < Rails::Generators::Base
         desc: "Set true if you don't want to run the Alchemy Devise installer. NOTE: Automatically skipped if Alchemy::Devise is not available."
       class_option :skip_spree_custom_user_generator, default: false, type: :boolean,
         desc: "Set true if you don't want to run the Solidus custom user generator. NOTE: Automatically skipped if Alchemy::Devise is not available."
+      class_option :skip_alchemy_user_generator, default: false, type: :boolean,
+        desc: "Set true if you don't want to generate an admin user. NOTE: Automatically skipped if Alchemy::Devise is not available."
       class_option :auto_accept, default: false, type: :boolean,
         desc: 'Set true if run from a automated script (ie. on a CI)'
 
@@ -49,6 +51,44 @@ def run_spree_custom_user_generator
         end
       end
 
+      def inject_admin_tab
+        inject_into_file 'config/initializers/spree.rb', {after: "Spree::Backend::Config.configure do |config|\n"} do
+          <<~ADMIN_TAB
+            \  # AlchemyCMS admin tabs
+            \  config.menu_items << config.class::MenuItem.new(
+            \    [:pages, :sites, :languages, :tags, :users, :pictures, :attachments],
+            \    'copy',
+            \    label: :cms,
+            \    condition: -> { can?(:index, :alchemy_admin_dashboard) },
+            \    partial: 'spree/admin/shared/alchemy_sub_menu',
+            \    url: '/admin/pages'
+            \  )
+          ADMIN_TAB
+        end
+      end
+
+      def create_admin_user
+        if Kernel.const_defined?('Alchemy::Devise') && !options[:skip_alchemy_user_generator] && Alchemy::User.count.zero?
+          login = ENV.fetch('ALCHEMY_ADMIN_USER_LOGIN', 'admin')
+          email = ENV.fetch('ALCHEMY_ADMIN_USER_EMAIL', 'admin@example.com')
+          password = ENV.fetch('ALCHEMY_ADMIN_USER_PASSWORD', 'test1234')
+          unless options[:auto_accept]
+            login = ask("\nEnter the username for the admin user", default: login)
+            email = ask("Enter the email for the admin user", default: email)
+            password = ask("Enter the password for the admin user", default: password)
+          end
+
+          Alchemy::User.create!(
+            login: login,
+            email: email,
+            password: password,
+            password_confirmation: password,
+            alchemy_roles: 'admin',
+            spree_roles: [Spree::Role.find_or_create_by!(name: 'admin')]
+          )
+        end
+      end
+
       def inject_routes
         routes_file_path = Rails.root.join('config', 'routes.rb')
         mountpoint = '/'
@@ -64,6 +104,26 @@ def inject_routes
           "\n  mount Alchemy::Engine, at: '/#{mountpoint.chomp('/')}'\n"
         end
       end
+
+      def set_root_route
+        routes_file_path = Rails.root.join('config', 'routes.rb')
+        if options[:auto_accept] || ask("\nDo you want Alchemy to handle the root route ('/')?", default: true)
+          if File.read(routes_file_path).match SPREE_MOUNT_REGEXP
+            sentinel = SPREE_MOUNT_REGEXP
+          else
+            sentinel = "Rails.application.routes.draw do\n"
+          end
+          inject_into_file routes_file_path, {after: sentinel} do
+            <<~ROOT_ROUTE
+              \n
+              \  # Let AlchemyCMS handle the root route
+              \  Spree::Core::Engine.routes.draw do
+              \    root to: '/alchemy/pages#index'
+              \  end
+            ROOT_ROUTE
+          end
+        end
+      end
     end
   end
 end

spec/features/alchemy/alchemy_admin_integrations_spec.rb

@@ -6,18 +6,6 @@
 require 'spree/testing_support/factories/address_factory'
 
 RSpec.feature "Admin Integration", type: :feature do
-  let!(:admin) do
-    Alchemy::User.create!(
-      login: 'admin',
-      password: 'S3cre#t',
-      password_confirmation: 'S3cre#t',
-      email: 'email@example.com',
-      alchemy_roles: 'admin',
-      spree_roles: [Spree::Role.first_or_create!(name: 'admin')],
-      bill_address: FactoryBot.create(:address)
-    )
-  end
-
   it 'it is possible to login and visit Alchemy admin' do
     login!
     visit '/admin/dashboard'
@@ -38,8 +26,8 @@ def login!
     visit '/admin/login'
 
     expect(page).to have_field 'user_login'
-    fill_in 'user_login', with: admin.login
-    fill_in 'user_password', with: admin.password
+    fill_in 'user_login', with: 'admin'
+    fill_in 'user_password', with: 'test1234'
     click_button 'login'
   end
 end