Skip to content

Commit 55a9727

Browse files
author
Sergiy Zhovnir
committed
#issue-57 Fixing the tests
1 parent a495f8f commit 55a9727

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

src/com/magento/idea/magento2plugin/actions/generation/dialog/NewControllerDialog.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -140,7 +140,7 @@ public String getControllerDirectory() {
140140
}
141141

142142
public String getActionDirectory() {
143-
return getControllerDirectory() + File.separator + getControllerName();
143+
return getControllerDirectory() + "/" + getControllerName();
144144
}
145145

146146
private void suggestControllerDirectory() {
@@ -166,15 +166,15 @@ private String getModuleIdentifierPath() {
166166
if (parts[0] == null || parts[1] == null || parts.length > 2) {
167167
return null;
168168
}
169-
return parts[0] + File.separator + parts[1];
169+
return parts[0] + "/" + parts[1];
170170
}
171171

172172
private String getNamespace() {
173173
String[]parts = moduleName.split(Package.VENDOR_MODULE_NAME_SEPARATOR);
174174
if (parts[0] == null || parts[1] == null || parts.length > 2) {
175175
return null;
176176
}
177-
String directoryPart = getControllerDirectory().replace(File.separator, Package.FQN_SEPARATOR);
177+
String directoryPart = getControllerDirectory().replace("/", Package.FQN_SEPARATOR);
178178
String controllerPart = Package.FQN_SEPARATOR + getControllerName();
179179

180180
return parts[0] + Package.FQN_SEPARATOR + parts[1] + Package.FQN_SEPARATOR + directoryPart + controllerPart;

src/com/magento/idea/magento2plugin/actions/generation/generator/ModuleControllerClassGenerator.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,7 @@ private String getControllerFqn() {
130130
private PhpClass createControllerClass(String actionName) {
131131
PsiDirectory parentDirectory = ModuleIndex.getInstance(project)
132132
.getModuleDirectoryByModuleName(getControllerModule());
133-
String[] controllerDirectories = controllerFileData.getActionDirectory().split(File.separator);
133+
String[] controllerDirectories = controllerFileData.getActionDirectory().split("/");
134134
for (String controllerDirectory: controllerDirectories) {
135135
parentDirectory = directoryGenerator.findOrCreateSubdirectory(parentDirectory, controllerDirectory);
136136
}

0 commit comments

Comments
 (0)