Merge pull request #220 from spree/elia/fix-1-8-with-rails-6

Fix v1.8 with rails 6+

Rakefile

@@ -5,8 +5,12 @@ require 'rdoc/task'
 require 'rspec'
 require 'rspec/core/rake_task'
 
+require 'bundler'
+Bundler.require
+Bundler::GemHelper.install_tasks
+
 desc 'Default: run specs'
-task :default => :spec  
+task :default => :spec
 RSpec::Core::RakeTask.new do |t|
   t.pattern = "spec/**/*_spec.rb"
 end

lib/deface/action_view_extensions.rb

@@ -33,13 +33,19 @@ def encode!
         @handler = ActionView::Template::Handlers::ERB
 
         # Modify the existing string instead of returning a copy
-        @source.replace Deface::Override.apply_overrides(
+        new_source = Deface::Override.apply_overrides(
           Deface::Override.convert_source(source, syntax: syntax),
           overrides: overrides
         )
+
+        if Deface.before_rails_6?
+          @source.replace new_source
+        else
+          source.replace new_source
+        end
       end
 
-      @source
+      source
     end
 
     private