Merge pull request #3021 from AlchemyCMS/backport/7.2-stable/pr-3012

[7.2-stable] Set Alchemy::Page.current in Messages Controller

Author: tvdeyen

app/controllers/alchemy/messages_controller.rb

@@ -66,6 +66,7 @@ def create # :nodoc:
         MessagesMailer.contact_form_mail(@message, mail_to, mail_from, subject).deliver
         redirect_to_success_page
       else
+        Current.page = @page
         render template: "alchemy/pages/show"
       end
     end

spec/controllers/alchemy/messages_controller_spec.rb

@@ -56,6 +56,11 @@ module Alchemy
           it "should render 'alchemy/pages/show' template" do
             expect(subject).to render_template("alchemy/pages/show")
           end
+
+          it "assigns Alchemy::Page.current" do
+            expect(Alchemy::Current).to receive(:page=).with(page)
+            subject
+          end
         end
 
         context "succeeded" do