MAGETWO-69521: Customer attribute with "Show on Storefront" set to No does not appear in backend

Author: Sergii Kovalenko

app/code/Magento/Customer/Test/Unit/Model/Customer/DataProviderTest.php

@@ -338,20 +338,16 @@ protected function getTypeAddressMock()
         return $typeAddressMock;
     }
 
+    /**
+     * @param \PHPUnit_Framework_MockObject_MockObject $attributeMock
+     * @param \PHPUnit_Framework_MockObject_MockObject $attributeBooleanMock
+     * @param array $options
+     */
     private function injectVisibilityProps(
         \PHPUnit_Framework_MockObject_MockObject $attributeMock,
         \PHPUnit_Framework_MockObject_MockObject $attributeBooleanMock,
         array $options = []
     ) {
-        $attributeCode = self::ATTRIBUTE_CODE;
-        if (isset($options[self::ATTRIBUTE_CODE]['specific_code_prefix'])) {
-            $attributeCode = $attributeCode . $options[self::ATTRIBUTE_CODE]['specific_code_prefix'];
-        }
-
-        $attributeMock->expects($this->exactly(2))
-            ->method('getAttributeCode')
-            ->willReturn($attributeCode);
-
         if (isset($options[self::ATTRIBUTE_CODE]['visible'])) {
             $attributeMock->expects($this->any())
                 ->method('getIsVisible')
@@ -370,15 +366,6 @@ private function injectVisibilityProps(
                 ->willReturn($options[self::ATTRIBUTE_CODE]['is_used_in_forms']);
         }
 
-        $booleanAttributeCode = 'test-code-boolean';
-        if (isset($options['test-code-boolean']['specific_code_prefix'])) {
-            $booleanAttributeCode = $booleanAttributeCode . $options['test-code-boolean']['specific_code_prefix'];
-        }
-
-        $attributeBooleanMock->expects($this->exactly(2))
-            ->method('getAttributeCode')
-            ->willReturn($booleanAttributeCode);
-
         if (isset($options['test-code-boolean']['visible'])) {
             $attributeBooleanMock->expects($this->any())
                 ->method('getIsVisible')
@@ -423,6 +410,15 @@ protected function getAttributeMock($type = 'customer', $options = [])
             ->disableOriginalConstructor()
             ->getMockForAbstractClass();
 
+        $attributeCode = self::ATTRIBUTE_CODE;
+        if (isset($options[self::ATTRIBUTE_CODE]['specific_code_prefix'])) {
+            $attributeCode = $attributeCode . $options[self::ATTRIBUTE_CODE]['specific_code_prefix'];
+        }
+
+        $attributeMock->expects($this->exactly(2))
+            ->method('getAttributeCode')
+            ->willReturn($attributeCode);
+
         $sourceMock->expects($this->any())
             ->method('getAllOptions')
             ->willReturn(self::OPTIONS_RESULT);
@@ -473,6 +469,14 @@ function ($origName) {
         $attributeBooleanMock->expects($this->once())
             ->method('usesSource')
             ->willReturn(false);
+        $booleanAttributeCode = 'test-code-boolean';
+        if (isset($options['test-code-boolean']['specific_code_prefix'])) {
+            $booleanAttributeCode = $booleanAttributeCode . $options['test-code-boolean']['specific_code_prefix'];
+        }
+
+        $attributeBooleanMock->expects($this->exactly(2))
+            ->method('getAttributeCode')
+            ->willReturn($booleanAttributeCode);
 
         $this->eavValidationRulesMock->expects($this->any())
             ->method('build')