Merge 164c441 into 0473938

core/app/helpers/refinery/tag_helper.rb

@@ -12,6 +12,8 @@ def refinery_help_tag(title='Tip')
     # This is just a quick wrapper to render an image tag that lives inside refinery/icons.
     # They are all 16x16 so this is the default but is able to be overriden with supplied options.
     def refinery_icon_tag(filename, options = {})
+      Refinery.deprecate('Refinery::TagHelper.refinery_icon_tag', when: '4.1', replacement: 'Refinery::TagHelper.action_icon')
+
       filename = "#{filename}.png" unless filename.split('.').many?
       path = image_path "refinery/icons/#{filename}", skip_pipeline: true
       image_tag path, {:width => 16, :height => 16}.merge(options)

core/lib/generators/refinery/dummy/dummy_generator.rb

@@ -14,7 +14,8 @@ def self.source_paths
     end
 
     PASSTHROUGH_OPTIONS = [
-      :skip_active_record, :skip_javascript, :skip_action_cable, :skip_action_mailer, :database, :javascript, :quiet, :pretend, :force, :skip
+      :skip_active_record, :skip_javascript, :skip_action_cable, :skip_action_mailer, :skip_active_storage, :database,
+      :javascript, :quiet, :pretend, :force, :skip
     ]
 
     def generate_test_dummy
@@ -24,6 +25,7 @@ def generate_test_dummy
       opts[:skip_bundle] = true
       opts[:skip_action_cable] = true
       opts[:skip_action_mailer] = true
+      opts[:skip_active_storage] = true
 
       invoke Rails::Generators::AppGenerator, [ File.expand_path(dummy_path, destination_root) ], opts
     end

core/refinerycms-core.gemspec

@@ -2,7 +2,7 @@
 require File.expand_path('../../core/lib/refinery/version', __FILE__)
 
 version = Refinery::Version.to_s
-rails_version = ['>= 5.1.0', '< 5.2']
+rails_version = ['>= 5.2.0', '< 6']
 
 Gem::Specification.new do |s|
   s.platform          = Gem::Platform::RUBY

core/spec/controllers/refinery/sitemap_controller_spec.rb

@@ -9,7 +9,7 @@ module Refinery
     it "shows a valid xml response" do
       get :index
 
-      expect(response).to be_success
+      expect(response).to be_successful
     end
   end
 end

core/spec/helpers/refinery/tag_helper_spec.rb

@@ -15,7 +15,7 @@ module Refinery
       end
 
       it "wraps image_tag with some options preset" do
-        expect(helper.refinery_icon_tag("ugis.ozols.jpg")).to xml_eq(%Q{<img alt="Ugis.ozols" height="16" src="/images/refinery/icons/ugis.ozols.jpg" width="16" />})
+        expect(helper.refinery_icon_tag("ugis.ozols.jpg", { alt: "Ugis.ozols"})).to xml_eq(%Q{<img alt="Ugis.ozols" height="16" src="/images/refinery/icons/ugis.ozols.jpg" width="16" />})
       end
     end
 

core/spec/lib/generators/refinery/cms/cms_generator_spec.rb

@@ -97,12 +97,12 @@ module Refinery
     end
 
     def copy_routes
-      routes = File.join(Gem.loaded_specs['railties'].full_gem_path, 'lib', 'rails', 'generators', 'rails', 'app', 'templates', 'config', 'routes.rb')
+      routes = File.join(Gem.loaded_specs['railties'].
+        full_gem_path, 'lib', 'rails', 'generators', 'rails', 'app', 'templates', 'config', 'routes.rb.tt')
       destination = File.join(destination_root, "config")
 
       FileUtils.mkdir_p(destination)
-      FileUtils.cp routes, destination
+      FileUtils.cp routes, File.join(destination, "routes.rb")
     end
-
   end
 end