spree_core 3.0.9 → 3.2.0

data/db/migrate/20150314013438_add_missing_indexes_on_spree_tables.rb

@@ -0,0 +1,67 @@
+class AddMissingIndexesOnSpreeTables < ActiveRecord::Migration[4.2]
+  def change
+    if data_source_exists?(:spree_promotion_rules_users) && !index_exists?(:spree_promotion_rules_users,
+                                                                     [:user_id, :promotion_rule_id],
+                                                                     name: 'index_promotion_rules_users_on_user_id_and_promotion_rule_id')
+      add_index :spree_promotion_rules_users,
+                [:user_id, :promotion_rule_id],
+                name: 'index_promotion_rules_users_on_user_id_and_promotion_rule_id'
+    end
+
+    if data_source_exists?(:spree_products_promotion_rules) && !index_exists?(:spree_products_promotion_rules,
+                                                                        [:promotion_rule_id, :product_id],
+                                                                        name: 'index_products_promotion_rules_on_promotion_rule_and_product')
+      add_index :spree_products_promotion_rules,
+                [:promotion_rule_id, :product_id],
+                name: 'index_products_promotion_rules_on_promotion_rule_and_product'
+    end
+
+    unless index_exists? :spree_orders, :canceler_id
+      add_index :spree_orders, :canceler_id
+    end
+
+    unless index_exists? :spree_orders, :store_id
+      add_index :spree_orders, :store_id
+    end
+
+    if data_source_exists?(:spree_orders_promotions) && !index_exists?(:spree_orders_promotions, [:promotion_id, :order_id])
+      add_index :spree_orders_promotions, [:promotion_id, :order_id]
+    end
+
+    if data_source_exists?(:spree_properties_prototypes) && !index_exists?(:spree_properties_prototypes, :prototype_id)
+      add_index :spree_properties_prototypes, :prototype_id
+    end
+
+    if data_source_exists?(:spree_properties_prototypes) && !index_exists?(:spree_properties_prototypes,
+                                                                     [:prototype_id, :property_id],
+                                                                     name: 'index_properties_prototypes_on_prototype_and_property')
+      add_index :spree_properties_prototypes,
+                [:prototype_id, :property_id],
+                name: 'index_properties_prototypes_on_prototype_and_property'
+    end
+
+    if data_source_exists?(:spree_taxons_prototypes) && !index_exists?(:spree_taxons_prototypes, [:prototype_id, :taxon_id])
+      add_index :spree_taxons_prototypes, [:prototype_id, :taxon_id]
+    end
+
+    if data_source_exists?(:spree_option_types_prototypes) && !index_exists?(:spree_option_types_prototypes, :prototype_id)
+      add_index :spree_option_types_prototypes, :prototype_id
+    end
+
+    if data_source_exists?(:spree_option_types_prototypes) && !index_exists?(:spree_option_types_prototypes,
+                                                                       [:prototype_id, :option_type_id],
+                                                                       name: 'index_option_types_prototypes_on_prototype_and_option_type')
+      add_index :spree_option_types_prototypes,
+                [:prototype_id, :option_type_id],
+                name: 'index_option_types_prototypes_on_prototype_and_option_type'
+    end
+
+    if data_source_exists?(:spree_option_values_variants) && !index_exists?(:spree_option_values_variants,
+                                                                       [:option_value_id, :variant_id],
+                                                                       name: 'index_option_values_variants_on_option_value_and_variant')
+      add_index :spree_option_values_variants,
+                [:option_value_id, :variant_id],
+                name: 'index_option_values_variants_on_option_value_and_variant'
+    end
+  end
+end

data/db/migrate/20150317174308_remove_duplicated_indexes_from_multi_columns.rb

@@ -0,0 +1,18 @@
+class RemoveDuplicatedIndexesFromMultiColumns < ActiveRecord::Migration[4.2]
+  def change
+    remove_index :spree_adjustments, name: "index_adjustments_on_order_id"
+    remove_index :spree_option_types_prototypes, :prototype_id
+    add_index :spree_option_types_prototypes, :option_type_id
+    remove_index :spree_option_values_variants, name: 'index_option_values_variants_on_option_value_and_variant'
+    remove_index :spree_option_values_variants, :variant_id
+    add_index :spree_option_values_variants, :option_value_id
+    remove_index :spree_orders, :user_id
+    remove_index :spree_orders_promotions, [:order_id, :promotion_id]
+    add_index :spree_orders_promotions, :order_id
+    remove_index :spree_products_promotion_rules, name: "index_products_promotion_rules_on_promotion_rule_id"
+    remove_index :spree_promotion_rules_users, name: "index_promotion_rules_users_on_user_id"
+    remove_index :spree_properties_prototypes, :prototype_id
+    remove_index :spree_stock_items, :stock_location_id
+    remove_index :spree_taxons_prototypes, :prototype_id
+  end
+end

data/db/migrate/20150324104002_remove_user_index_from_spree_state_changes.rb

@@ -0,0 +1,14 @@
+class RemoveUserIndexFromSpreeStateChanges < ActiveRecord::Migration[4.2]
+  def up
+    if index_exists? :spree_state_changes, :user_id
+      remove_index :spree_state_changes, :user_id
+    end
+
+  end
+
+  def down
+    unless index_exists? :spree_state_changes, :user_id
+      add_index :spree_state_changes, :user_id
+    end
+  end
+end

data/db/migrate/20150515211137_fix_adjustment_order_id.rb

@@ -1,4 +1,4 @@
-class FixAdjustmentOrderId < ActiveRecord::Migration
+class FixAdjustmentOrderId < ActiveRecord::Migration[4.2]
   def change
     say 'Populate order_id from adjustable_id where appropriate'
     execute(<<-SQL.squish)

data/db/migrate/20150522071831_add_position_to_spree_payment_methods.rb

@@ -0,0 +1,5 @@
+class AddPositionToSpreePaymentMethods < ActiveRecord::Migration[4.2]
+  def change
+    add_column :spree_payment_methods, :position, :integer, default: 0
+  end
+end

data/db/migrate/20150522181728_add_deleted_at_to_friendly_id_slugs.rb

@@ -1,4 +1,4 @@
-class AddDeletedAtToFriendlyIdSlugs < ActiveRecord::Migration
+class AddDeletedAtToFriendlyIdSlugs < ActiveRecord::Migration[4.2]
   def change
     add_column :friendly_id_slugs, :deleted_at, :datetime
     add_index :friendly_id_slugs, :deleted_at

data/db/migrate/20150609093816_increase_scale_on_pre_tax_amounts.rb

@@ -1,4 +1,4 @@
-class IncreaseScaleOnPreTaxAmounts < ActiveRecord::Migration
+class IncreaseScaleOnPreTaxAmounts < ActiveRecord::Migration[4.2]
   def change
     # set pre_tax_amount on shipments to discounted_amount - included_tax_total
     # so that the null: false option on the shipment pre_tax_amount doesn't generate

data/db/migrate/20150626181949_add_taxable_adjustment_total_to_line_item.rb

@@ -0,0 +1,19 @@
+class AddTaxableAdjustmentTotalToLineItem < ActiveRecord::Migration[4.2]
+  def change
+    add_column :spree_line_items, :taxable_adjustment_total, :decimal,
+               precision: 10, scale: 2, default: 0.0, null: false
+    add_column :spree_line_items, :non_taxable_adjustment_total, :decimal,
+               precision: 10, scale: 2, default: 0.0, null: false
+
+    add_column :spree_shipments, :taxable_adjustment_total, :decimal,
+               precision: 10, scale: 2, default: 0.0, null: false
+    add_column :spree_shipments, :non_taxable_adjustment_total, :decimal,
+               precision: 10, scale: 2, default: 0.0, null: false
+
+    add_column :spree_orders, :taxable_adjustment_total, :decimal,
+               precision: 10, scale: 2, default: 0.0, null: false
+    add_column :spree_orders, :non_taxable_adjustment_total, :decimal,
+               precision: 10, scale: 2, default: 0.0, null: false
+    # TODO migration that updates old orders
+  end
+end

data/db/migrate/20150627090949_migrate_payment_methods_display.rb

@@ -0,0 +1,12 @@
+class MigratePaymentMethodsDisplay < ActiveRecord::Migration[4.2]
+  def change
+    Spree::PaymentMethod.all.each do |method|
+      if method.display_on.blank?
+        method.display_on = "both"
+        method.save
+      end
+    end
+
+    change_column :spree_payment_methods, :display_on, :string, default: "both"
+  end
+end

data/db/migrate/20150707204155_enable_acts_as_paranoid_on_calculators.rb

@@ -1,4 +1,4 @@
-class EnableActsAsParanoidOnCalculators < ActiveRecord::Migration
+class EnableActsAsParanoidOnCalculators < ActiveRecord::Migration[4.2]
   def change
     add_column :spree_calculators, :deleted_at, :datetime
     add_index :spree_calculators, :deleted_at

data/db/migrate/20150714154102_spree_payment_method_store_credits.rb

@@ -0,0 +1,12 @@
+class SpreePaymentMethodStoreCredits < ActiveRecord::Migration[4.2]
+  def up
+    # Reload to pick up new position column for acts_as_list
+    Spree::PaymentMethod.reset_column_information
+    Spree::PaymentMethod::StoreCredit.find_or_create_by(name: 'Store Credit', description: 'Store Credit',
+                                                        active: true, display_on: 'back_end')
+  end
+
+  def down
+    Spree::PaymentMethod.find_by(type: 'Spree::PaymentMethod::StoreCredit', name: 'Store Credit').try(&:destroy)
+  end
+end

data/db/migrate/20150726141425_rename_has_and_belongs_to_associations_to_model_names.rb

@@ -0,0 +1,18 @@
+class RenameHasAndBelongsToAssociationsToModelNames < ActiveRecord::Migration[4.2]
+  def change
+    {
+      'spree_option_types_prototypes' => 'spree_option_type_prototypes',
+      'spree_option_values_variants' => 'spree_option_value_variants',
+      'spree_orders_promotions' => 'spree_order_promotions',
+      'spree_products_promotion_rules' => 'spree_product_promotion_rules',
+      'spree_taxons_promotion_rules' => 'spree_promotion_rule_taxons',
+      'spree_promotion_rules_users' => 'spree_promotion_rule_users',
+      'spree_properties_prototypes' => 'spree_property_prototypes',
+      'spree_taxons_prototypes' => 'spree_prototype_taxons',
+      'spree_roles_users' => 'spree_role_users',
+      'spree_shipping_methods_zones' => 'spree_shipping_method_zones'
+    }.each do |old_name, new_name|
+      rename_table old_name, new_name
+    end
+  end
+end

data/db/migrate/20150727191614_spree_store_credit_types.rb

@@ -0,0 +1,11 @@
+class SpreeStoreCreditTypes < ActiveRecord::Migration[4.2]
+  def up
+    Spree::StoreCreditType.find_or_create_by(name: 'Expiring', priority: 1)
+    Spree::StoreCreditType.find_or_create_by(name: 'Non-expiring', priority: 2)
+  end
+
+  def down
+    Spree::StoreCreditType.find_by(name: 'Expiring').try(&:destroy)
+    Spree::StoreCreditType.find_by(name: 'Non-expiring').try(&:destroy)
+  end
+end

data/db/migrate/20150819154308_add_discontinued_to_products_and_variants.rb

@@ -0,0 +1,68 @@
+class AddDiscontinuedToProductsAndVariants < ActiveRecord::Migration[4.2]
+  def up
+    add_column :spree_products, :discontinue_on, :datetime, after: :available_on
+    add_column :spree_variants, :discontinue_on, :datetime, after: :deleted_at
+
+    add_index :spree_products, :discontinue_on
+    add_index :spree_variants, :discontinue_on
+
+    puts "Warning: This migration changes the meaning of 'deleted'. Before this change, 'deleted' meant products that were no longer being sold in your store. After this change, you can only delete a product or variant if it has not already been sold to a customer (a model-level check enforces this). Instead, you should use the new field 'discontinue_on' for products or variants which were sold in the past but no longer for sale. This fixes bugs when other objects are attached to deleted products and variants. (Even though acts_as_paranoid gem keeps the records in the database, most associations are automatically scoped to exclude the deleted records.) In thew meaning of 'deleted,' you can still use the delete function on products & variants which are *truly user-error mistakes*, specifically before an order has been placed or the items have gone on sale. You also must use the soft-delete function (which still works after this change) to clean up slug (product) and SKU (variant) duplicates. Otherwise, you should generally over ever need to discontinue products.
+
+Data Fix: We will attempt to reverse engineer the old meaning of 'deleted' (no longer for sale) to the new database field 'discontinue_on'. However, since Slugs and SKUs cannot be duplicated on Products and Variants, we cannot gaurantee this to be foolproof if you have deteled Products and Variants that have duplicate Slugs or SKUs in non-deleted records. In these cases, we recommend you use the additional rake task to clean up your old records (see rake db:fix_orphan_line_items). If you have such records, this migration will leave them in place, preferring the non-deleted records over the deleted ones. However, since old line items will still be associated with deleted objects, you will still the bugs in your app until you run:
+
+rake db:fix_orphan_line_items
+
+We will print out a report of the data we are fixing now: "
+
+    Spree::Product.only_deleted.each do |product|
+      # determine if there is a slug duplicate
+      the_dup = Spree::Product.find_by(slug: product.slug)
+      if the_dup.nil?
+        # check to see if there are line items attached to any variants
+        if Spree::Variant.with_deleted.where(product_id: product.id).map(&:line_items).any?
+          puts "recovering deleted product id #{product.id} ... this will un-delete the record and set it to be discontinued"
+
+          old_deleted = product.deleted_at
+          product.update_column(:deleted_at, nil) # for some reason .recover doesn't appear to be a method
+          product.update_column(:discontinue_on, old_deleted)
+        else
+          puts "leaving product id #{product.id} deleted because there are no line items attached to it..."
+        end
+      else
+        puts "leaving product id #{product.id} deleted because there is a duplicate slug for '#{product.slug}' (product id #{the_dup.id}) "
+        if product.variants.map(&:line_items).any?
+          puts "WARNING: You may still have bugs with product id #{product.id} (#{product.name}) until you run rake db:fix_orphan_line_items"
+        end
+      end
+    end
+
+    Spree::Variant.only_deleted.each do |variant|
+      # determine if there is a slug duplicate
+      the_dup = Spree::Variant.find_by(sku: variant.sku)
+      if the_dup.nil?
+        # check to see if there are line items attached to any variants
+        if variant.line_items.any?
+          puts "recovering deleted variant id #{variant.id} ... this will un-delete the record and set it to be discontinued"
+          old_deleted = variant.deleted_at
+          variant.update_column(:deleted_at, nil) # for some reason .recover doesn't appear to be a method
+          variant.update_column(:discontinue_on, old_deleted)
+        else
+          puts "leaving variant id #{variant.id} deleted because there are no line items attached to it..."
+        end
+      else
+        puts "leaving variant id #{variant.id} deleted because there is a duplicate SKU for '#{variant.sku}' (variant id #{the_dup.id}) "
+        if variant.line_items.any?
+          puts "WARNING: You may still have bugs with variant id #{variant.id} (#{variant.name}) until you run rake db:fix_orphan_line_items"
+        end
+      end
+    end
+  end
+
+  def down
+    execute "UPDATE spree_products SET deleted_at = discontinue_on WHERE deleted_at IS NULL"
+    execute "UPDATE spree_variants SET deleted_at = discontinue_on WHERE deleted_at IS NULL"
+
+    remove_column :spree_products, :discontinue_on
+    remove_column :spree_variants, :discontinue_on
+  end
+end

data/db/migrate/20151220072838_remove_shipping_method_id_from_spree_orders.rb

@@ -0,0 +1,13 @@
+class RemoveShippingMethodIdFromSpreeOrders < ActiveRecord::Migration[4.2]
+  def up
+    if column_exists?(:spree_orders, :shipping_method_id, :integer)
+      remove_column :spree_orders, :shipping_method_id, :integer
+    end
+  end
+
+  def down
+    unless column_exists?(:spree_orders, :shipping_method_id, :integer)
+      add_column :spree_orders, :shipping_method_id, :integer
+    end
+  end
+end

data/db/migrate/20160207191757_add_id_column_to_earlier_habtm_tables.rb

@@ -0,0 +1,16 @@
+class AddIdColumnToEarlierHabtmTables < ActiveRecord::Migration[4.2]
+  def up
+    add_column :spree_option_type_prototypes, :id, :primary_key
+    add_column :spree_option_value_variants, :id, :primary_key
+    add_column :spree_order_promotions, :id, :primary_key
+    add_column :spree_product_promotion_rules, :id, :primary_key
+    add_column :spree_promotion_rule_users, :id, :primary_key
+    add_column :spree_property_prototypes, :id, :primary_key
+    add_column :spree_role_users, :id, :primary_key
+    add_column :spree_shipping_method_zones, :id, :primary_key
+  end
+
+  def down
+    raise ActiveRecord::IrreversibleMigration
+  end
+end

data/db/migrate/20160219165458_add_indexes.rb

@@ -0,0 +1,14 @@
+class AddIndexes < ActiveRecord::Migration[4.2]
+  def change
+    add_index :spree_assets, :position
+    add_index :spree_option_types, :name
+    add_index :spree_option_values, :name
+    add_index :spree_prices, :variant_id
+    add_index :spree_properties, :name
+    add_index :spree_roles, :name
+    add_index :spree_shipping_categories, :name
+    add_index :spree_taxons, :lft
+    add_index :spree_taxons, :rgt
+    add_index :spree_taxons, :name
+  end
+end

data/db/migrate/20160509064646_remove_counter_cache_from_spree_variants_to_spree_stock_items.rb

@@ -0,0 +1,10 @@
+class RemoveCounterCacheFromSpreeVariantsToSpreeStockItems < ActiveRecord::Migration[4.2]
+  def up
+    if column_exists?(:spree_variants, :stock_items_count)
+      remove_column :spree_variants, :stock_items_count
+    end
+  end
+
+  def down
+  end
+end

data/db/migrate/20160511071954_acts_as_taggable_on_spree_migration.rb

@@ -0,0 +1,40 @@
+class ActsAsTaggableOnSpreeMigration < ActiveRecord::Migration[4.2]
+  def self.up
+    create_table :spree_tags do |t|
+      t.string :name
+      t.integer :taggings_count, default: 0
+    end
+
+    create_table :spree_taggings do |t|
+      t.references :tag
+
+      # You should make sure that the column created is
+      # long enough to store the required class names.
+      t.references :taggable, polymorphic: true
+      t.references :tagger, polymorphic: true
+
+      # Limit is created to prevent MySQL error on index
+      # length for MyISAM table type: http://bit.ly/vgW2Ql
+      t.string :context, limit: 128
+
+      t.datetime :created_at
+    end
+
+    add_index :spree_tags, :name, unique: true
+    add_index :spree_taggings,
+              [
+                :tag_id,
+                :taggable_id,
+                :taggable_type,
+                :context,
+                :tagger_id,
+                :tagger_type
+              ],
+              unique: true, name: "spree_taggings_idx"
+  end
+
+  def self.down
+    drop_table :spree_taggings
+    drop_table :spree_tags
+  end
+end

data/db/migrate/20160511072249_change_collation_for_spree_tag_names.rb

@@ -0,0 +1,9 @@
+# This migration is added to circumvent issue #623 and have special characters
+# work properly
+class ChangeCollationForSpreeTagNames < ActiveRecord::Migration[4.2]
+  def up
+    if ActsAsTaggableOn::Utils.using_mysql?
+      execute("ALTER TABLE spree_tags MODIFY name varchar(255) CHARACTER SET utf8 COLLATE utf8_bin;")
+    end
+  end
+end

data/db/migrate/20160511072335_add_missing_indexes_to_spree_taggings.rb

@@ -0,0 +1,14 @@
+class AddMissingIndexesToSpreeTaggings < ActiveRecord::Migration[4.2]
+  def change
+    add_index :spree_taggings, :tag_id
+    add_index :spree_taggings, :taggable_id
+    add_index :spree_taggings, :taggable_type
+    add_index :spree_taggings, :tagger_id
+    add_index :spree_taggings, :context
+
+    add_index :spree_taggings, [:tagger_id, :tagger_type]
+    add_index :spree_taggings,
+              [:taggable_id, :taggable_type, :tagger_id, :context],
+              name: "spree_taggings_idy"
+  end
+end

data/db/migrate/20160608090604_add_zipcode_required_to_spree_countries.rb

@@ -0,0 +1,7 @@
+class AddZipcodeRequiredToSpreeCountries < ActiveRecord::Migration[4.2]
+  def change
+    add_column :spree_countries, :zipcode_required, :boolean, default: true
+    Spree::Country.reset_column_information
+    Spree::Country.where(iso: Spree::Address::NO_ZIPCODE_ISO_CODES).update_all(zipcode_required: false)
+  end
+end

data/db/migrate/20161014145148_add_created_at_to_variant.rb

@@ -0,0 +1,8 @@
+class AddCreatedAtToVariant < ActiveRecord::Migration[5.0]
+  def change
+    add_column :spree_variants, :created_at, :datetime
+    Spree::Variant.reset_column_information
+    Spree::Variant.unscoped.where.not(updated_at: nil).update_all('created_at = updated_at')
+    Spree::Variant.unscoped.where(updated_at: nil).update_all(created_at: Time.current, updated_at: Time.current)
+  end
+end

data/db/migrate/20161014152814_add_null_false_to_spree_variants_timestamps.rb

@@ -0,0 +1,6 @@
+class AddNullFalseToSpreeVariantsTimestamps < ActiveRecord::Migration[5.0]
+  def change
+    change_column_null :spree_variants, :created_at, false
+    change_column_null :spree_variants, :updated_at, false
+  end
+end

data/lib/generators/spree/custom_user/custom_user_generator.rb

@@ -35,7 +35,7 @@ module Spree
     end
 
     def self.next_migration_number(dirname)
-      if ActiveRecord::Base.timestamped_migrations
+      if ApplicationRecord.timestamped_migrations
         sleep 1 # make sure to get a different migration every time
         Time.new.utc.strftime("%Y%m%d%H%M%S")
       else

data/lib/generators/spree/custom_user/templates/authentication_helpers.rb.tt

@@ -30,7 +30,7 @@ module Spree
   end
 end
 
-ApplicationController.send :include, Spree::AuthenticationHelpers
-ApplicationController.send :include, Spree::CurrentUserHelpers
+ApplicationController.include Spree::AuthenticationHelpers
+ApplicationController.include Spree::CurrentUserHelpers
 
-Spree::Api::BaseController.send :include, Spree::CurrentUserHelpers
+Spree::Api::BaseController.include Spree::CurrentUserHelpers

data/lib/generators/spree/custom_user/templates/migration.rb.tt

@@ -1,6 +1,6 @@
-class AddSpreeFieldsToCustomUserTable < ActiveRecord::Migration
+class AddSpreeFieldsToCustomUserTable < ActiveRecord::Migration[4.2]
   def up
-    add_column <%= table_name.inspect %>, :spree_api_key, :string, :limit => 48
+    add_column <%= table_name.inspect %>, :spree_api_key, :string, limit: 48
     add_column <%= table_name.inspect %>, :ship_address_id, :integer
     add_column <%= table_name.inspect %>, :bill_address_id, :integer
   end

data/lib/generators/spree/dummy/dummy_generator.rb

@@ -6,8 +6,8 @@ module Spree
   class DummyGenerator < Rails::Generators::Base
     desc "Creates blank Rails application, installs Spree and all sample data"
 
-    class_option :lib_name, :default => ''
-    class_option :database, :default => ''
+    class_option :lib_name, default: ''
+    class_option :database, default: ''
 
     def self.source_paths
       paths = self.superclass.source_paths
@@ -41,14 +41,14 @@ module Spree
       @lib_name = options[:lib_name]
       @database = options[:database]
 
-      template "rails/database.yml", "#{dummy_path}/config/database.yml", :force => true
-      template "rails/boot.rb", "#{dummy_path}/config/boot.rb", :force => true
-      template "rails/application.rb", "#{dummy_path}/config/application.rb", :force => true
-      template "rails/routes.rb", "#{dummy_path}/config/routes.rb", :force => true
-      template "rails/test.rb", "#{dummy_path}/config/environments/test.rb", :force => true
-      template "rails/script/rails", "#{dummy_path}/spec/dummy/script/rails", :force => true
-      template "initializers/custom_user.rb", "#{dummy_path}/config/initializers/custom_user.rb", :force => true
-      template "initializers/devise.rb", "#{dummy_path}/config/initializers/devise.rb", :force => true
+      template "rails/database.yml", "#{dummy_path}/config/database.yml", force: true
+      template "rails/boot.rb", "#{dummy_path}/config/boot.rb", force: true
+      template "rails/application.rb", "#{dummy_path}/config/application.rb", force: true
+      template "rails/routes.rb", "#{dummy_path}/config/routes.rb", force: true
+      template "rails/test.rb", "#{dummy_path}/config/environments/test.rb", force: true
+      template "rails/script/rails", "#{dummy_path}/spec/dummy/script/rails", force: true
+      template "initializers/custom_user.rb", "#{dummy_path}/config/initializers/custom_user.rb", force: true
+      template "initializers/devise.rb", "#{dummy_path}/config/initializers/devise.rb", force: true
     end
 
     def test_dummy_inject_extension_requirements
@@ -91,7 +91,7 @@ begin
 rescue LoadError
   # #{requirement} is not available.
 end
-      ], :before => /require '#{@lib_name}'/, :verbose => true
+      ], before: /require '#{@lib_name}'/, verbose: true
     end
 
     def dummy_path

data/lib/generators/spree/dummy/templates/rails/application.rb

@@ -2,7 +2,7 @@ require File.expand_path('../boot', __FILE__)
 
 require 'rails/all'
 
-Bundler.require(*Rails.groups(:assets => %w(development test)))
+Bundler.require(*Rails.groups(assets: %w(development test)))
 
 require '<%= lib_name %>'
 

data/lib/generators/spree/dummy/templates/rails/database.yml

@@ -1,6 +1,11 @@
 <% if agent_number = ENV['TC_AGENT_NUMBER']
 database_prefix = agent_number + '_'
 end %>
+<% if options[:lib_name]
+  lib_name = options[:lib_name].gsub('/', '_')
+end %>
+<% db_password = ENV['DB_PASSWORD'] %>
+<% db_username = ENV['DB_USERNAME'] %>
 <% case ENV['DB']
   when 'sqlite' %>
 development:
@@ -14,44 +19,49 @@ production:
   adapter: sqlite3
   database: db/spree_production.sqlite3
 <% when 'mysql' %>
-development:
+mysql: &mysql
   adapter: mysql2
-  database: <%= database_prefix %><%= options[:lib_name] %>_spree_development
   encoding: utf8
+  <% unless db_username.blank? %>
+  username: <%= db_username %>
+  <% end %>
+  <% unless db_password.blank? %>
+  password: <%= db_password %>
+  <% end %>
+
+development:
+  <<: *mysql
+  database: <%= database_prefix %><%= lib_name %>_spree_development
 test:
-  adapter: mysql2
-  database: <%= database_prefix %><%= options[:lib_name] %>_spree_test
-  encoding: utf8
+  <<: *mysql
+  database: <%= database_prefix %><%= lib_name %>_spree_test
 production:
-  adapter: mysql2
-  database: <%= database_prefix %><%= options[:lib_name] %>_spree_production
-  encoding: utf8
+  <<: *mysql
+  database: <%= database_prefix %><%= lib_name %>_spree_production
 <% when 'postgres' %>
 <% db_host = ENV['DB_HOST'] %>
-development:
+postgres: &postgres
   adapter: postgresql
-  database: <%= database_prefix %><%= options[:lib_name] %>_spree_development
-  username: postgres
-  min_messages: warning
-<% unless db_host.blank? %>
+  <% unless db_username.blank? %>
+  username: <%= db_username || 'postgres' %>
+  <% end %>
+  <% unless db_password.blank? %>
+  password: <%= db_password %>
+  <% end %>
+  <% unless db_host.blank? %>
   host: <%= db_host %>
-<% end %>
-test:
-  adapter: postgresql
-  database: <%= database_prefix %><%= options[:lib_name] %>_spree_test
-  username: postgres
+  <% end %>
   min_messages: warning
-<% unless db_host.blank? %>
-  host: <%= db_host %>
-<% end %>
+
+development:
+  <<: *postgres
+  database: <%= database_prefix %><%= lib_name %>_spree_development
+test:
+  <<: *postgres
+  database: <%= database_prefix %><%= lib_name %>_spree_test
 production:
-  adapter: postgresql
-  database: <%= database_prefix %><%= options[:lib_name] %>_spree_production
-  username: postgres
-  min_messages: warning
-<% unless db_host.blank? %>
-  host: <%= db_host %>
-<% end %>
+  <<: *postgres
+  database: <%= database_prefix %><%= lib_name %>_spree_production
 <% else %>
 development:
   adapter: sqlite3

data/lib/generators/spree/dummy/templates/rails/test.rb

@@ -8,8 +8,8 @@ Dummy::Application.configure do
   config.cache_classes = true
 
   # Configure static asset server for tests with Cache-Control for performance
-  config.serve_static_files = true
-  config.static_cache_control = "public, max-age=3600"
+  config.public_file_server.enabled = true
+  config.public_file_server.headers = { 'Cache-Control' => 'public, max-age=3600' }
 
   # Show full error reports and disable caching
   config.consider_all_requests_local       = true
@@ -27,7 +27,8 @@ Dummy::Application.configure do
   # The :test delivery method accumulates sent emails in the
   # ActionMailer::Base.deliveries array.
   config.action_mailer.delivery_method = :test
-  ActionMailer::Base.default :from => "spree@example.com"
+  ActionMailer::Base.default from: "spree@example.com"
+
 
   # Print deprecation notices to the stderr
   config.active_support.deprecation = :stderr