Merge branch 'release/release-1.5.1'

examples/features/bootstrap/FeatureContext.php

@@ -137,6 +137,15 @@ public function iSetupAnOauthConsumerFixture()
          $this->_buildOauthConsumerFixture();
     }
 
+
+    /**
+     * @Given I setup an admin fixture with role ids
+     */
+    public function iSetupAnAdminFixtureWithRoleIds()
+    {
+        $this->_buildAdminWithRoleIdsFixture();
+    }
+
     /**
      *
      * @throws Exception
@@ -297,6 +306,17 @@ protected function _buildAdminFixture()
         );
     }
 
+    /**
+     *
+     * @throws Exception
+     */
+    protected function _buildAdminWithRoleIdsFixture()
+    {
+        FixtureBuilder::build(
+            FixtureBuilder::ADMIN_FIXTURE_TYPE, new FixturesLocator(), 'admin-with-role-ids.yml', '@AfterSuite'
+        );
+    }
+
     /**
      *
      * @throws Exception

examples/features/fixtures.feature

@@ -14,4 +14,5 @@ Feature: Magento Fixtures
       And I setup an api user fixture
       And I setup a grouped product fixture
       And I setup an admin fixture
+      And I setup an admin fixture with role ids
       And I setup an oauth consumer fixture

examples/features/fixtures/Data/Providers/Admin.php

@@ -16,7 +16,9 @@ class Admin implements Provider
 {
     public function getUsername()
     {
-        return 'testadmin';
+        $random = substr(md5(rand()), 0, 7);
+
+        return 'admin' . $random;
     }
 
     public function getFirstname()
@@ -31,11 +33,18 @@ public function getLastname()
 
     public function getEmail()
     {
-        return '[email protected]';
+        $random = substr(md5(rand()), 0, 7);
+
+        return 'admin' . $random . '@fixture.com';
     }
 
     public function getPassword()
     {
         return '123123pass';
     }
+
+    public function getRoleIds()
+    {
+        return [1];
+    }
 }

examples/features/fixtures/yaml/admin-with-role-ids.yml

@@ -0,0 +1,10 @@
+fixture:
+    model: admin/user
+    data_provider: 'Data\Providers\Admin'
+    attributes:
+        username: '{{getUsername}}'
+        firstname: '{{getFirstname}}'
+        lastname: '{{getLastname}}'
+        email: '{{getEmail}}'
+        password: '{{getPassword}}'
+        role_ids: '{{getRoleIds}}'

magefix/src/Magefix/Fixture/Builder/Admin.php

@@ -17,6 +17,18 @@ class Admin extends AbstractBuilder
      */
     public function build()
     {
-        return $this->_build();
+        $fixtureId = $this->_build();
+        $this->_assignRoleIds();
+        return $fixtureId;
+    }
+
+    protected function _assignRoleIds()
+    {
+        if (isset($this->_data['fixture']['attributes']['roles_ids'])) {
+            $adminUser = $this->_getMageModel();
+            $adminUser->setRoleIds($this->_data['fixture']['attributes']['roles_ids'])
+                ->setRoleUserId($adminUser->getId())
+                ->saveRelations();
+        }
     }
 }