MFTF. Simplified page completion

Author: Vitaliy Boyko

src/com/magento/idea/magento2plugin/actions/generation/CreateAPluginAction.java

@@ -44,6 +44,9 @@ public void update(AnActionEvent event) {
             Pair<PsiFile, PhpClass> pair = this.findPhpClass(event);
             PsiFile psiFile = pair.getFirst();
             PhpClass phpClass = pair.getSecond();
+            if (phpClass == null || psiFile == null) {
+                return;
+            }
             targetClass = phpClass;
             if (!(psiFile instanceof PhpFile) || phpClass.isFinal() || this.targetMethod == null) {
                 this.setStatus(event, false);

src/com/magento/idea/magento2plugin/completion/provider/mftf/PageCompletionProvider.java

@@ -11,7 +11,7 @@
 import com.intellij.psi.PsiElement;
 import com.intellij.util.ProcessingContext;
 import com.intellij.util.indexing.FileBasedIndex;
-import com.magento.idea.magento2plugin.magento.files.MftfActionGroup;
+import com.magento.idea.magento2plugin.magento.files.MftfPage;
 import com.magento.idea.magento2plugin.stubs.indexes.mftf.PageIndex;
 import org.jetbrains.annotations.NotNull;
 import java.util.Collection;
@@ -35,6 +35,8 @@ protected void addCompletions(
         for (String pageName: allKeys) {
             result.addElement(LookupElementBuilder.create(
                     pageName
+                        + MftfPage.REFERENCE_SEPARATOR
+                        + MftfPage.URL_ATTRIBUTE
             ));
         }
     }

src/com/magento/idea/magento2plugin/magento/files/MftfPage.java

@@ -10,4 +10,5 @@ public class MftfPage {
     public static String PAGE_TAG = "page";
     public static String NAME_ATTRIBUTE = "name";
     public static String REFERENCE_SEPARATOR = ".";
+    public static String URL_ATTRIBUTE = "url";
 }

src/com/magento/idea/magento2plugin/stubs/indexes/mftf/PageIndex.java

@@ -72,11 +72,6 @@ public DataIndexer<String, String, FileContent> getIndexer() {
                 }
 
                 map.put(name, name);
-                XmlAttribute[] attributes = pageTag.getAttributes();
-                for (XmlAttribute attribute: attributes) {
-                    String childAttributeName = attribute.getName();
-                    map.put(name + MftfPage.REFERENCE_SEPARATOR + childAttributeName, name);
-                }
             }
 
             return map;

testData/completion/xml/MftfPageUrlCompletionRegistrar/pageUrlInActionGroupMustBeEmptyForEntity/TestActionGroup.xml

@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
+    <actionGroup name="Test">
+        <amOnPage url="{{AttributeSet<caret>}}" stepKey="goToProductPage"/>
+    </actionGroup>
+</actionGroups>

testData/project/magento2/vendor/magento/module-catalog/Test/Mftf/Page/TestPage2.xml

@@ -8,7 +8,7 @@
 
 <pages xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
         xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/PageObject.xsd">
-    <page name="TestPage2" urlKey="test/catalog/category/edit">
+    <page name="TestPage2" url="test/catalog/category/edit">
         <section name="TestAdminCategorySidebarActionSection"/>
     </page>
 </pages>

testData/reference/xml/MftfPageUrlReferenceRegistrar/pageUrlInActionGroupMustHaveReference/TestActionGroup.xml

@@ -8,6 +8,6 @@
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
         xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
     <actionGroup name="Test">
-        <amOnPage url="{{TestPage2.urlKey<caret>}}" stepKey="goToProductPage"/>
+        <amOnPage url="{{TestPage2.url<caret>}}" stepKey="goToProductPage"/>
     </actionGroup>
 </actionGroups>

testData/reference/xml/MftfPageUrlReferenceRegistrar/pageUrlInActionGroupPluginDisabled/TestActionGroup.xml

@@ -8,6 +8,6 @@
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
         xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
     <actionGroup name="Test">
-        <amOnPage url="{{TestPage2.urlKey<caret>}}" stepKey="goToProductPage"/>
+        <amOnPage url="{{TestPage2.url<caret>}}" stepKey="goToProductPage"/>
     </actionGroup>
 </actionGroups>

tests/com/magento/idea/magento2plugin/completion/xml/MftfPageUrlCompletionRegistrarTest.java

@@ -7,10 +7,8 @@
 public class MftfPageUrlCompletionRegistrarTest extends CompletionXmlFixtureTestCase {
 
     private static final String[] lookupStrings = new String[] {
-        "TestPage",
         "TestPage.url",
-        "TestPage2",
-        "TestPage2.urlKey",
+        "TestPage2.url"
       };
 
     public void testPageUrlInActionGroupMustProvideCompletion() {
@@ -33,6 +31,13 @@ public void testPageUrlInActionGroupMustBeEmptyForTestDocument() {
         assertCompletionNotShowing(filePath);
     }
 
+    public void testPageUrlInActionGroupMustBeEmptyForEntity() {
+        String filePath = this.getFixturePath("TestActionGroup.xml");
+        myFixture.copyFileToProject(filePath);
+
+        assertCompletionNotShowing(filePath);
+    }
+
     public void testPageUrlInTestMustProvideCompletion() {
         String filePath = this.getFixturePath("TestMftfTest.xml");
         myFixture.copyFileToProject(filePath);