Merge pull request #1560 from magento-pangolin/MQE-420

[Pangolin] Deliver changes after MFTF training feedback

- MQE-369: [Data Input] Non Web Api Data Persistence.
- MQE-378: Create API metadata for Coupon Code
- MQE-309: [Customizability] Update nested API dependency schema and execution
- MQE-365: Template Files
- MQE-411: Fixed template and coupon meta data files.
- MQE-402: Workshop Feedback
- MQE-352: Review and Update SampleCest.xml for added functionality
- MQE-419: README.MD should not reference the magento-pangolin org
- MQE-424: Fix static code issues in MFTF tests and MFTF

Author: okolesnyk

dev/tests/acceptance/README.md

@@ -8,18 +8,20 @@
 ----
 
 # Prerequisites
-* **IMPORTANT**: Configure your Magento Store for [Automated Testing](http://devdocs.magento.com/guides/v2.0/mtf/mtf_quickstart/mtf_quickstart_magento.html)
+* **IMPORTANT**
+    * You will need to have a running instance of Magento that you can access.
+    * You will need to configure your instance of Magento for [Automated Testing](http://devdocs.magento.com/guides/v2.0/mtf/mtf_quickstart/mtf_quickstart_magento.html).
 * [PHP v7.x](http://php.net/manual/en/install.php)
 * [Composer v1.4.x](https://getcomposer.org/download/)
-* [Java](https://www.java.com/en/download/)
+* [Java v1.8.x](https://www.java.com/en/download/)
 * [Selenium Server](http://www.seleniumhq.org/download/) - [v2.53.x](http://selenium-release.storage.googleapis.com/index.html?path=2.53/)
-* [ChromeDriver](https://sites.google.com/a/chromium.org/chromedriver/downloads)
-* [Allure CLI](https://docs.qameta.io/allure/latest/#_installing_a_commandline)
+* [ChromeDriver v2.32.x](https://sites.google.com/a/chromium.org/chromedriver/downloads)
+* [Allure CLI v2.3.x](https://docs.qameta.io/allure/latest/#_installing_a_commandline)
 * [GitHub](https://desktop.github.com/)
 
 ### Recommendations
 * We recommend using [PHPStorm 2017](https://www.jetbrains.com/phpstorm/) for your IDE. They recently added support for [Codeception Test execution](https://blog.jetbrains.com/phpstorm/2017/03/codeception-support-comes-to-phpstorm-2017-1/) which is helpful when debugging.
-* We also recommend updating your [$PATH to include](https://stackoverflow.com/questions/7703041/editing-path-variable-on-mac) `./vendor/bin` so you can easily execute the necessary `robo` and `codecept` commands instead of `./vendor/bin/robo` or `./vendor/bin/codecept`.  
+* We also recommend updating your [$PATH to include](https://stackoverflow.com/questions/7703041/editing-path-variable-on-mac) `./vendor/bin` so you can easily execute the necessary `robo` and `codecept` commands instead of using `./vendor/bin/robo` or `./vendor/bin/codecept`.  
 
 ----
 
@@ -28,19 +30,29 @@ Due to the current setup of the Framework you will need to do the following:
 
   * `mkdir [DIRECTORY_NAME]`
   * `cd [DIRECTORY_NAME]`
-  * Pull down - [EE](https://github.com/magento-pangolin/magento2ee)
-  * Pull down - [CE](https://github.com/magento-pangolin/magento2ce)
+  * Pull down - [EE](https://github.com/magento/magento2ee)
+  * Pull down - [CE](https://github.com/magento/magento2ce)
   * `cd magento2ee`
   * `php -f dev/tools/build-ee.php -- --command=link --exclude=true`
-  * Generate a `github-oauth` token: [Instructions](https://help.github.com/articles/creating-a-personal-access-token-for-the-command-line/#creating-a-token)
+  * `cd ..`
+  * Generate a `github-oauth` token: 
+      * [How to setup an auth.json file for the Composer?](https://mage2.pro/t/topic/743)
+      * [Creating a personal access token for the command line.](https://help.github.com/articles/creating-a-personal-access-token-for-the-command-line/#creating-a-token)
   * `touch magento2ce/dev/tests/acceptance/auth.json`
   * `nano magento2ce/dev/tests/acceptance/auth.json`
+  * Copy/Paste the following:
+    ```
+    {
+      "github-oauth": {
+          "github.com": "<personal access token>"
+      }
+    }
+    ```
   * Replace `<personal access token>` with the token you generated in GitHub.
   * Save your work.
-  * `cd ../magento2ce`
-  * `cd dev/tests/acceptance`
+  * `cd magento2ce/dev/tests/acceptance`
   * `composer install`
-    * **PLEASE IGNORE THE "Installation" SECTION THAT FOLLOWS, START WITH THE "Building The Framework" SECTION INSTEAD.**
+      * **PLEASE IGNORE THE "Installation" SECTION THAT FOLLOWS, START WITH THE "Building The Framework" SECTION INSTEAD.**
 
 ----
 
@@ -116,7 +128,7 @@ To determine which version of the Allure command you need to use please run `all
 ----
 
 # Building The Framework
-After installing the dependencies you will want to build the Codeception project in the [Magento 2 Functional Testing Framework](https://github.com/magento-pangolin/magento2-functional-testing-framework), which is a dependency of the CE or EE Tests repo. Run `./vendor/bin/robo build:project` to complete this task.
+After installing the dependencies you will want to build the Codeception project in the [Magento 2 Functional Testing Framework](https://github.com/magento/magento2-functional-testing-framework), which is a dependency of the CE or EE Tests repo. Run the following to complete this task:
 
 `./vendor/bin/robo build:project`
 
@@ -127,9 +139,15 @@ Before you can generate or run the Tests you will need to edit the Configuration
 
 In the `.env` file you will find key pieces of information that are unique to your local Magento setup that will need to be edited before you can generate tests:
 * **MAGENTO_BASE_URL**
+    * Example: `MAGENTO_BASE_URL=http://127.0.0.1:32772/`
+    * Note: Please end the URL with a `/`.
 * **MAGENTO_BACKEND_NAME**
+    * Example: `MAGENTO_BACKEND_NAME=admin`
+    * Note: Set this variable to `admin`.
 * **MAGENTO_ADMIN_USERNAME**
+    * Example: `MAGENTO_ADMIN_USERNAME=admin`
 * **MAGENTO_ADMIN_PASSWORD**
+    * Example: `MAGENTO_ADMIN_PASSWORD=123123`
 
 ##### Additional Codeception settings can be found in the following files: 
 * **tests/functional.suite.yml**
@@ -222,25 +240,31 @@ Due to the interdependent nature of the 2 repos it is recommended to Symlink the
     `sudo nano /etc/paths`
     
 * StackOverflow Help: https://stackoverflow.com/questions/7703041/editing-path-variable-on-mac
-* Allure `@env error` - Allure recently changed their Codeception Adapter that breaks Codeception when tests include the `@env` tag. A workaround for this error is to revert the changes they made to a function. 
-    * Locate the `AllureAdapter.php` file here: `vendor/allure-framework/allure-codeception/src/Yandex/Allure/Adapter/AllureAdapter.php`
-    * Edit the `_initialize()` function found on line 77 and replace it with the following:
-```
-public function _initialize(array $ignoredAnnotations = [])
-    {
-        parent::_initialize();
-        Annotation\AnnotationProvider::registerAnnotationNamespaces();
-        // Add standard PHPUnit annotations
-        Annotation\AnnotationProvider::addIgnoredAnnotations($this->ignoredAnnotations);
-        // Add custom ignored annotations
-        $ignoredAnnotations = $this->tryGetOption('ignoredAnnotations', []);
-        Annotation\AnnotationProvider::addIgnoredAnnotations($ignoredAnnotations);
-        $outputDirectory = $this->getOutputDirectory();
-        $deletePreviousResults =
-            $this->tryGetOption(DELETE_PREVIOUS_RESULTS_PARAMETER, false);
-        $this->prepareOutputDirectory($outputDirectory, $deletePreviousResults);
-        if (is_null(Model\Provider::getOutputDirectory())) {
-            Model\Provider::setOutputDirectory($outputDirectory);
-        }
-    }
-```
+* Allure `@env error` - Allure recently changed their Codeception Adapter that breaks Codeception when tests include the `@env` tag. There are 2 workarounds for this issue currently.
+    1. You can edit the `composer.json` and point the Allure-Codeception Adapter to a previous commit:
+        * Edit the `composer.json` file.
+        * Make the following change:
+            * ORIGINAL: `“allure-framework/allure-codeception”: "dev-master"`
+            * UPDATED: `“allure-framework/allure-codeception”: “dev-master#af40af5ae2b717618a42fe3e137d75878508c75d”`
+    1. You can revert the changes that they made manually: 
+        * Locate the `AllureAdapter.php` file here: `vendor/allure-framework/allure-codeception/src/Yandex/Allure/Adapter/AllureAdapter.php`
+        * Edit the `_initialize()` function found on line 77 and replace it with the following:
+            ```
+            public function _initialize(array $ignoredAnnotations = [])
+                {
+                    parent::_initialize();
+                    Annotation\AnnotationProvider::registerAnnotationNamespaces();
+                    // Add standard PHPUnit annotations
+                    Annotation\AnnotationProvider::addIgnoredAnnotations($this->ignoredAnnotations);
+                    // Add custom ignored annotations
+                    $ignoredAnnotations = $this->tryGetOption('ignoredAnnotations', []);
+                    Annotation\AnnotationProvider::addIgnoredAnnotations($ignoredAnnotations);
+                    $outputDirectory = $this->getOutputDirectory();
+                    $deletePreviousResults =
+                        $this->tryGetOption(DELETE_PREVIOUS_RESULTS_PARAMETER, false);
+                    $this->prepareOutputDirectory($outputDirectory, $deletePreviousResults);
+                    if (is_null(Model\Provider::getOutputDirectory())) {
+                        Model\Provider::setOutputDirectory($outputDirectory);
+                    }
+                }
+            ```

dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Data/CustomAttributeProductUrlKeyData.xml renamed to dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Data/CustomAttributeData.xml

@@ -8,8 +8,16 @@
 
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
         xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataProfileSchema.xsd">
+    <entity name="CustomAttributeCategoryUrlKey" type="custom_attribute">
+        <data key="attribute_code">url_key</data>
+        <data key="value" unique="suffix">category</data>
+    </entity>
     <entity name="CustomAttributeProductUrlKey" type="custom_attribute">
         <data key="attribute_code">url_key</data>
         <data key="value" unique="suffix">product</data>
     </entity>
+    <entity name="CustomAttributeCategoryIds" type="custom_attribute_array">
+        <data key="attribute_code">category_ids</data>
+        <var key="value" entityType="category" entityKey="id"/>
+    </entity>
 </config>

dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Data/ProductData.xml

@@ -19,6 +19,7 @@
         <data key="status">1</data>
         <data key="quantity">100</data>
         <required-entity type="product_extension_attribute">EavStockItem</required-entity>
+        <required-entity type="custom_attribute_array">CustomAttributeCategoryIds</required-entity>
     </entity>
     <entity name="SimpleProduct" type="product">
         <data key="sku" unique="suffix">SimpleProduct</data>
@@ -29,6 +30,7 @@
         <data key="visibility">4</data>
         <data key="status">1</data>
         <required-entity type="product_extension_attribute">EavStockItem</required-entity>
+        <required-entity type="custom_attribute_array">CustomAttributeCategoryIds</required-entity>
         <!--required-entity type="custom_attribute">CustomAttributeProductUrlKey</required-entity-->
     </entity>
 </config>

dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Metadata/category-meta.xml

@@ -5,58 +5,57 @@
   * See COPYING.txt for license details.
   */
 -->
-
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
         xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataOperation.xsd">
-    <operation name="CreateCategory" dataType="category" type="create" auth="/rest/V1/integration/admin/token" url="/rest/V1/categories" method="POST">
-        <header param="Content-Type">application/json</header>
-        <jsonObject key="category" dataType="category">
-            <entry key="parent_id">integer</entry>
-            <entry key="name">string</entry>
-            <entry key="is_active">boolean</entry>
-            <entry key="position">integer</entry>
-            <entry key="level">integer</entry>
-            <entry key="children">string</entry>
-            <entry key="created_at">string</entry>
-            <entry key="updated_at">string</entry>
-            <entry key="path">string</entry>
-            <entry key="include_in_menu">boolean</entry>
+    <operation name="CreateCategory" dataType="category" type="create" auth="adminOauth" url="/V1/categories" method="POST">
+        <contentType>application/json</contentType>
+        <object key="category" dataType="category">
+            <field key="parent_id">integer</field>
+            <field key="name">string</field>
+            <field key="is_active">boolean</field>
+            <field key="position">integer</field>
+            <field key="level">integer</field>
+            <field key="children">string</field>
+            <field key="created_at">string</field>
+            <field key="updated_at">string</field>
+            <field key="path">string</field>
+            <field key="include_in_menu">boolean</field>
             <array key="available_sort_by">
                 <value>string</value>
             </array>
-            <entry key="extension_attributes">empty_extension_attribute</entry>
+            <field key="extension_attributes">empty_extension_attribute</field>
             <array key="custom_attributes">
                 <value>custom_attribute</value>
             </array>
-        </jsonObject>
+        </object>
     </operation>
 
-    <operation name="UpdateCategory" dataType="category" type="update" auth="/rest/V1/integration/admin/token" url="/rest/V1/categories" method="PUT">
-        <header param="Content-Type">application/json</header>
-        <jsonObject key="category" dataType="category">
-            <entry key="id">integer</entry>
-            <entry key="parent_id">integer</entry>
-            <entry key="name">string</entry>
-            <entry key="is_active">boolean</entry>
-            <entry key="position">integer</entry>
-            <entry key="level">integer</entry>
-            <entry key="children">string</entry>
-            <entry key="created_at">string</entry>
-            <entry key="updated_at">string</entry>
-            <entry key="path">string</entry>
+    <operation name="UpdateCategory" dataType="category" type="update" auth="adminOauth" url="/V1/categories" method="PUT">
+        <contentType>application/json</contentType>
+        <object key="category" dataType="category">
+            <field key="id">integer</field>
+            <field key="parent_id">integer</field>
+            <field key="name">string</field>
+            <field key="is_active">boolean</field>
+            <field key="position">integer</field>
+            <field key="level">integer</field>
+            <field key="children">string</field>
+            <field key="created_at">string</field>
+            <field key="updated_at">string</field>
+            <field key="path">string</field>
             <array key="available_sort_by">
                 <value>string</value>
             </array>
-            <entry key="include_in_menu">boolean</entry>
-            <entry key="extension_attributes">empty_extension_attribute</entry>
+            <field key="include_in_menu">boolean</field>
+            <field key="extension_attributes">empty_extension_attribute</field>
             <array key="custom_attributes">
                 <value>custom_attribute</value>
             </array>
-        </jsonObject>
+        </object>
     </operation>
 
-    <operation name="DeleteCategory" dataType="category" type="delete" auth="/rest/V1/integration/admin/token" url="/rest/V1/categories" method="DELETE">
-        <header param="Content-Type">application/json</header>
+    <operation name="DeleteCategory" dataType="category" type="delete" auth="adminOauth" url="/V1/categories" method="DELETE">
+        <contentType>application/json</contentType>
         <param key="categoryId" type="path">{id}</param>
     </operation>
 </config>