MAGETWO-37044: [GITHUB] I'm not getting default values (name & email) in contact form when i logged in #1200

vkholoshenko · Olexii Korshenko · commit d582414da965 · 2015-05-15T15:29:23.000+03:00
diff --git a/app/code/Magento/Contact/Block/ContactForm.php b/app/code/Magento/Contact/Block/ContactForm.php
@@ -0,0 +1,24 @@
+<?php
+/**
+ * Copyright © 2015 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Contact\Block;
+
+use Magento\Framework\View\Element\Template;
+
+/**
+ * Main contact form block
+ */
+class ContactForm extends Template
+{
+    /**
+     * @param Template\Context $context
+     * @param array $data
+     */
+    public function __construct(Template\Context $context, array $data = [])
+    {
+        parent::__construct($context, $data);
+        $this->_isScopePrivate = true;
+    }
+}
diff --git a/app/code/Magento/Contact/Test/Unit/Block/ContactFormTest.php b/app/code/Magento/Contact/Test/Unit/Block/ContactFormTest.php
@@ -0,0 +1,44 @@
+<?php
+/**
+ * Copyright © 2015 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Contact\Test\Unit\Block;
+
+use Magento\Contact\Block\ContactForm;
+
+class ContactFormTest extends \PHPUnit_Framework_TestCase
+{
+    /**
+     * @var \Magento\Contact\Block\ContactForm
+     */
+    protected $contactForm;
+
+    /**
+     * @var \Magento\Framework\View\Element\Template\Context|\PHPUnit_Framework_MockObject_MockObject
+     */
+    protected $contextMock;
+
+    /**
+     * {@inheritDoc}
+     */
+    protected function setUp()
+    {
+        $this->contextMock = $this->getMockBuilder('Magento\Framework\View\Element\Template\Context')
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $this->contactForm = new ContactForm(
+            $this->contextMock
+        );
+    }
+
+    /**
+     *
+     */
+    public function testScope()
+    {
+        $this->assertTrue($this->contactForm->isScopePrivate());
+    }
+}
diff --git a/app/code/Magento/Contact/view/frontend/layout/contact_index_index.xml b/app/code/Magento/Contact/view/frontend/layout/contact_index_index.xml
@@ -11,7 +11,7 @@
     </head>
     <body>
         <referenceContainer name="content">
-            <block class="Magento\Framework\View\Element\Template" name="contactForm" template="Magento_Contact::form.phtml">
+            <block class="Magento\Contact\Block\ContactForm" name="contactForm" template="Magento_Contact::form.phtml">
                 <container name="form.additional.info" label="Form Additional Info"/>
             </block>
         </referenceContainer>
