Merge remote-tracking branch 'trigger/nathans-bugfixes' into BugFixPR

Author: joanhe

app/code/Magento/Cms/Block/Adminhtml/Block/Edit/DeleteButton.php

@@ -13,7 +13,7 @@
 class DeleteButton extends GenericButton implements ButtonProviderInterface
 {
     /**
-     * @return array
+     * @inheritDoc
      */
     public function getButtonData()
     {
@@ -24,14 +24,16 @@ public function getButtonData()
                 'class' => 'delete',
                 'on_click' => 'deleteConfirm(\'' . __(
                     'Are you sure you want to do this?'
-                ) . '\', \'' . $this->getDeleteUrl() . '\')',
+                ) . '\', \'' . $this->getDeleteUrl() . '\', {"data": {}})',
                 'sort_order' => 20,
             ];
         }
         return $data;
     }
 
     /**
+     * URL to send delete requests to.
+     *
      * @return string
      */
     public function getDeleteUrl()

app/code/Magento/Cms/Block/Adminhtml/Page/Edit/DeleteButton.php

@@ -13,7 +13,7 @@
 class DeleteButton extends GenericButton implements ButtonProviderInterface
 {
     /**
-     * @return array
+     * @inheritDoc
      */
     public function getButtonData()
     {
@@ -24,14 +24,16 @@ public function getButtonData()
                 'class' => 'delete',
                 'on_click' => 'deleteConfirm(\'' . __(
                     'Are you sure you want to do this?'
-                ) . '\', \'' . $this->getDeleteUrl() . '\')',
+                ) . '\', \'' . $this->getDeleteUrl() . '\', {"data": {}})',
                 'sort_order' => 20,
             ];
         }
         return $data;
     }
 
     /**
+     * Url to send delete requests to.
+     *
      * @return string
      */
     public function getDeleteUrl()

app/code/Magento/Cms/Test/Mftf/ActionGroup/SearchBlockOnGridPageActionGroup.xml

@@ -16,4 +16,27 @@
         <waitForLoadingMaskToDisappear stepKey="waitForSecondIdSortDescendingToFinish2" />
         <waitForElementVisible selector="{{WidgetSection.BlockPage(Block.identifier)}}" stepKey="waitForBlockTitle" />
     </actionGroup>
+    <actionGroup name ="deleteBlock">
+        <arguments>
+            <argument name="Block" defaultValue=""/>
+        </arguments>
+        <amOnPage url="{{CmsBlocksPage.url}}" stepKey="navigateToCMSBlocksGrid"/>
+        <waitForPageLoad stepKey="waitForPageLoad1"/>
+        <conditionalClick selector="{{BlockPageActionsSection.clearAll}}" dependentSelector="{{BlockPageActionsSection.activeFilters}}" stepKey="clickToResetFilter" visible="true"/>
+        <waitForPageLoad stepKey="waitForPageLoad2"/>
+        <click selector="{{BlockPageActionsSection.FilterBtn}}" stepKey="clickFilterBtn"/>
+        <fillField selector="{{BlockPageActionsSection.URLKey}}" userInput="{{Block.identifier}}" stepKey="fillBlockIdentifierInput"/>
+        <click selector="{{BlockPageActionsSection.ApplyFiltersBtn}}" stepKey="applyFilter"/>
+        <waitForLoadingMaskToDisappear stepKey="waitForGridToLoadResults" />
+        <waitForElementVisible selector="{{BlockPageActionsSection.select(Block.identifier)}}" stepKey="waitForCMSPageGrid" />
+        <click selector="{{BlockPageActionsSection.select(Block.identifier)}}" stepKey="clickSelect" />
+        <waitForElementVisible selector="{{BlockPageActionsSection.edit(Block.identifier)}}" stepKey="waitForEditLink" />
+        <click selector="{{BlockPageActionsSection.edit(Block.identifier)}}" stepKey="clickEdit" />
+        <waitForLoadingMaskToDisappear stepKey="waitForPageToLoad" />
+        <click selector="{{CmsBlockBlockActionSection.deleteBlock}}" stepKey="deleteBlock"/>
+        <waitForElementVisible selector="{{CmsBlockBlockActionSection.deleteConfirm}}" stepKey="waitForOkButtonToBeVisible"/>
+        <click selector="{{CmsBlockBlockActionSection.deleteConfirm}}" stepKey="clickOkButton"/>
+        <waitForPageLoad stepKey="waitForPageLoad3"/>
+        <see userInput="You deleted the block." stepKey="seeSuccessMessage"/>
+    </actionGroup>
 </actionGroups>

app/code/Magento/Cms/Test/Mftf/Section/CmsNewBlockBlockActionsSection.xml

@@ -24,4 +24,8 @@
     <section name="BlockContentSection">
         <element name="TextArea" type="input" selector="#cms_block_form_content"/>
     </section>
+    <section name="CmsBlockBlockActionSection">
+        <element name="deleteBlock" type="button" selector="#delete" timeout="30"/>
+        <element name="deleteConfirm" type="button" selector=".action-primary.action-accept" timeout="60"/>
+    </section>
 </sections>

app/code/Magento/Cms/Test/Mftf/Test/AdminCreateCmsBlockTest.xml

@@ -23,6 +23,9 @@
             <actionGroup ref="DisabledWYSIWYG" stepKey="disableWYSIWYG"/>
         </before>
         <after>
+            <actionGroup ref="deleteBlock" stepKey="deleteCreatedBlock">
+                <argument name="Block" value="_defaultBlock"/>
+            </actionGroup>
             <actionGroup ref="logout" stepKey="logout"/>
         </after>
         <amOnPage url="{{CmsNewBlock.url}}" stepKey="amOnBlocksCreationForm"/>

app/code/Magento/Cms/Test/Unit/Ui/Component/Listing/Column/BlockActionsTest.php

@@ -95,6 +95,7 @@ public function testPrepareDataSource()
                             'title' => __('Delete %1', $title),
                             'message' => __('Are you sure you want to delete a %1 record?', $title)
                         ],
+                        'post' => true
                     ]
                 ],
             ]

app/code/Magento/Cms/Test/Unit/Ui/Component/Listing/Column/PageActionsTest.php

@@ -70,6 +70,7 @@ public function testPrepareItemsByPageId()
                             'title' => __('Delete %1', $title),
                             'message' => __('Are you sure you want to delete a %1 record?', $title)
                         ],
+                        'post' => true
                     ]
                 ],
             ]

app/code/Magento/Cms/Ui/Component/Listing/Column/BlockActions.php

@@ -55,10 +55,7 @@ public function __construct(
     }
 
     /**
-     * Prepare Data Source
-     *
-     * @param array $dataSource
-     * @return array
+     * @inheritDoc
      */
     public function prepareDataSource(array $dataSource)
     {
@@ -87,7 +84,8 @@ public function prepareDataSource(array $dataSource)
                             'confirm' => [
                                 'title' => __('Delete %1', $title),
                                 'message' => __('Are you sure you want to delete a %1 record?', $title)
-                            ]
+                            ],
+                            'post' => true
                         ]
                     ];
                 }
@@ -99,6 +97,7 @@ public function prepareDataSource(array $dataSource)
 
     /**
      * Get instance of escaper
+     *
      * @return Escaper
      * @deprecated 101.0.7
      */

app/code/Magento/Cms/Ui/Component/Listing/Column/PageActions.php

@@ -67,10 +67,7 @@ public function __construct(
     }
 
     /**
-     * Prepare Data Source
-     *
-     * @param array $dataSource
-     * @return array
+     * @inheritDoc
      */
     public function prepareDataSource(array $dataSource)
     {
@@ -89,7 +86,8 @@ public function prepareDataSource(array $dataSource)
                         'confirm' => [
                             'title' => __('Delete %1', $title),
                             'message' => __('Are you sure you want to delete a %1 record?', $title)
-                        ]
+                        ],
+                        'post' => true
                     ];
                 }
                 if (isset($item['identifier'])) {
@@ -110,6 +108,7 @@ public function prepareDataSource(array $dataSource)
 
     /**
      * Get instance of escaper
+     *
      * @return Escaper
      * @deprecated 101.0.7
      */

dev/tests/static/framework/Magento/Sniffs/Less/AvoidIdSniff.php

@@ -14,7 +14,6 @@
  * Ensure that id selector is not used
  *
  * @link http://devdocs.magento.com/guides/v2.0/coding-standards/code-standard-less.html#types
- *
  */
 class AvoidIdSniff implements Sniff
 {
@@ -26,31 +25,75 @@ class AvoidIdSniff implements Sniff
     public $supportedTokenizers = [TokenizerSymbolsInterface::TOKENIZER_CSS];
 
     /**
+     * Tokens that can appear in a selector
+     *
      * @var array
      */
-    private $symbolsBeforeId = [
-        TokenizerSymbolsInterface::INDENT_SPACES,
-        TokenizerSymbolsInterface::NEW_LINE,
+    private $selectorTokens = [
+        T_HASH,
+        T_WHITESPACE,
+        T_STRING_CONCAT,
+        T_OPEN_PARENTHESIS,
+        T_CLOSE_PARENTHESIS,
+        T_OPEN_SQUARE_BRACKET,
+        T_CLOSE_SQUARE_BRACKET,
+        T_DOUBLE_QUOTED_STRING,
+        T_CONSTANT_ENCAPSED_STRING,
+        T_DOUBLE_COLON,
+        T_COLON,
+        T_EQUAL,
+        T_MUL_EQUAL,
+        T_OR_EQUAL,
+        T_STRING,
+        T_NONE,
+        T_DOLLAR,
+        T_GREATER_THAN,
+        T_PLUS,
+        T_NS_SEPARATOR,
+        T_LNUMBER,
     ];
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function register()
     {
         return [T_HASH];
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
+     *
+     * Will flag any selector that looks like the following:
+     * #foo[bar],
+     * #foo[bar=bash],
+     * #foo[bar~=bash],
+     * #foo[bar$=bash],
+     * #foo[bar*=bash],
+     * #foo[bar|=bash],
+     * #foo[bar='bash'],
+     * #foo:hover,
+     * #foo:nth-last-of-type(n),
+     * #foo::before,
+     * #foo + div,
+     * #foo > div,
+     * #foo ~ div,
+     * #foo\3Abar ~ div,
+     * #foo\:bar ~ div,
+     * #foo.bar .baz,
+     * div#foo {
+     *     blah: 'abc';
+     * }
      */
     public function process(File $phpcsFile, $stackPtr)
     {
         $tokens = $phpcsFile->getTokens();
 
-        if (T_WHITESPACE === $tokens[$stackPtr - 1]['code']
-            && in_array($tokens[$stackPtr - 1]['content'], $this->symbolsBeforeId)
-        ) {
+        // Find the next non-selector token
+        $nextToken = $phpcsFile->findNext($this->selectorTokens, $stackPtr + 1, null, true);
+
+        // Anything except a { or a , means this is not a selector
+        if ($nextToken !== false && in_array($tokens[$nextToken]['code'], [T_OPEN_CURLY_BRACKET, T_COMMA])) {
             $phpcsFile->addError('Id selector is used', $stackPtr, 'IdSelectorUsage');
         }
     }