Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

TASK: Make E2E tests work for Neos 9.0 #3569

Merged
merged 31 commits into from
Sep 23, 2023
Merged
Changes from 1 commit
Commits
Show all changes
31 commits
Select commit Hold shift + click to select a range
65232ef
Merge remote-tracking branch 'origin/bugfix/3301-part-2/fix-docker-e2…
grebaldi Jul 7, 2023
3b1f00c
TASK: Initialize ESCR-driven E2E test setup for 1Dimension fixture
grebaldi Jul 7, 2023
6e8e0c9
TASK: Replace context paths with node addresses in E2E assertions
grebaldi Jul 7, 2023
eb3182f
BUGFIX: Read .node-context-path innerHTML when parsing a node search …
grebaldi Jul 8, 2023
f692333
BUGFIX: (9.0) Predict nodes that will be deleted through discard
grebaldi Jul 8, 2023
57a5bc1
TASK: Replace usage of `Neos.Node.inBackend(node)` with `Neos.Backend…
mficzel Jul 9, 2023
ad36bc7
TASK: Make E2E tests work for 2Dimension fixture
grebaldi Jul 10, 2023
a53af29
Merge remote-tracking branch 'upstream/90-replace-node-inbackend-usag…
grebaldi Jul 10, 2023
1375319
TASK: Get rid of `RemoveNode` feedback in Move* changes
grebaldi Jul 10, 2023
ce395ca
TASK: Add rudimentary support for EditPreviewModes in 9.0
grebaldi Jul 10, 2023
7b451a0
TASK: Update CircleCI php image to cimg/php:8.2-node
grebaldi Jul 11, 2023
e018877
TASK: Adjust e2e.sh test script for CI to match local setup for Neos 9.0
grebaldi Jul 11, 2023
c43bb47
TASK: Merge integration test site packages into one unified distribution
grebaldi Jul 11, 2023
895ca5c
TASK: Adjust e2e.sh script to match new unified test setup
grebaldi Jul 11, 2023
228f551
TASK: Remove patch for neos/neos-development-collection#4395 from Tes…
grebaldi Jul 12, 2023
cc06094
TASK: Restore dependency to neos/buildessentials and phpunit in TestD…
grebaldi Jul 12, 2023
b6f3970
TASK: Add E2E test for switching between sites in a multi-site setup
grebaldi Jul 12, 2023
65a80c7
Merge remote-tracking branch 'upstream/9.0' into task/e2e-tests-on-9-0
grebaldi Jul 12, 2023
c250be1
TASK: Fix StyleCI issues
grebaldi Jul 12, 2023
ea1dd48
TASK: Switch to a strategy based on symlinks rather than copies for d…
grebaldi Jul 12, 2023
0a858bb
TASK: Merge Testcafé runs into a single one
grebaldi Jul 12, 2023
3f2f886
TASK: Symlink composer.json in docker e2e setup (rather than cp)
grebaldi Jul 28, 2023
27c6bb4
Merge remote-tracking branch 'upstream/9.0' into task/e2e-tests-on-9-0
grebaldi Aug 2, 2023
07b620a
TASK: Remove patches for neos/neos-development-collection#4393 and #4…
grebaldi Aug 2, 2023
d0c743c
Revert "TASK: Add rudimentary support for EditPreviewModes in 9.0"
mhsdesign Sep 16, 2023
3bf7dde
Merge branch 'bugfix/90editPreviewModes' into task/e2e-tests-on-9-0
mhsdesign Sep 16, 2023
103afcf
BUGFIX: E2E Error: cannot require `......./FlowContextTrait` in `CRRe…
mhsdesign Sep 21, 2023
084bd2e
BUGFIX: `make test-e2e-docker` composer.json not found
mhsdesign Sep 21, 2023
353aa83
Merge remote-tracking branch 'origin/9.0' into task/e2e-tests-on-9-0
mhsdesign Sep 21, 2023
dcefe42
TASK: Document need for additional etc host entries for local tests
mhsdesign Sep 22, 2023
dd99278
TASK: Move testing hack yaml to reduce impact on other projects
mhsdesign Sep 22, 2023
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Revert "TASK: Add rudimentary support for EditPreviewModes in 9.0"
This reverts commit ce395ca.
mhsdesign committed Sep 16, 2023
commit d0c743c38d27f88bb443355c2ce55e7b1042bb4e
Original file line number Diff line number Diff line change
@@ -132,20 +132,7 @@ protected function renderContent(ControllerContext $controllerContext): string|R

if ($this->nodeDomAddress) {
$fusionView = new FusionView();

$fakeActionRequest = clone $controllerContext->getRequest();
$fakeActionRequest->setControllerPackageKey('Neos.Neos');
$fakeActionRequest->setControllerName('Frontend\\Node');
$fakeActionRequest->setControllerActionName('edit');

$fakeControllerContext = new ControllerContext(
$fakeActionRequest,
$controllerContext->getResponse(),
$controllerContext->getArguments(),
$controllerContext->getUriBuilder(),
);

$fusionView->setControllerContext($fakeControllerContext);
$fusionView->setControllerContext($controllerContext);

$fusionView->assign('value', $this->node);
$fusionView->setFusionPath($this->nodeDomAddress->getFusionPathForContentRendering());
Original file line number Diff line number Diff line change
@@ -178,20 +178,7 @@ protected function renderContent(ControllerContext $controllerContext): string|R
$parentDomAddress = $this->getParentDomAddress();
if ($parentDomAddress) {
$fusionView = new FusionView();

$fakeActionRequest = clone $controllerContext->getRequest();
$fakeActionRequest->setControllerPackageKey('Neos.Neos');
$fakeActionRequest->setControllerName('Frontend\\Node');
$fakeActionRequest->setControllerActionName('edit');

$fakeControllerContext = new ControllerContext(
$fakeActionRequest,
$controllerContext->getResponse(),
$controllerContext->getArguments(),
$controllerContext->getUriBuilder(),
);

$fusionView->setControllerContext($fakeControllerContext);
$fusionView->setControllerContext($controllerContext);

$fusionView->assign('value', $parentNode);
$fusionView->setFusionPath($parentDomAddress->getFusionPath());
10 changes: 1 addition & 9 deletions Classes/Fusion/Helper/NodeInfoHelper.php
Original file line number Diff line number Diff line change
@@ -211,7 +211,7 @@ protected function getUriInformation(Node $node, ControllerContext $controllerCo
if (!$node->nodeType->isOfType($this->documentNodeTypeRole)) {
return $nodeInfo;
}
$nodeInfo['uri'] = $this->editUri($node, $controllerContext);
$nodeInfo['uri'] = $this->previewUri($node, $controllerContext);
return $nodeInfo;
}

@@ -442,14 +442,6 @@ public function uri(Node|NodeAddress $nodeAddress, ControllerContext $controller
return (string)NodeUriBuilder::fromRequest($controllerContext->getRequest())->uriFor($nodeAddress);
}

public function editUri(Node $node, ControllerContext $controllerContext): string
{
$contentRepository = $this->contentRepositoryRegistry->get($node->subgraphIdentity->contentRepositoryId);
$nodeAddressFactory = NodeAddressFactory::create($contentRepository);
$nodeAddress = $nodeAddressFactory->createFromNode($node);
return (string)NodeUriBuilder::fromRequest($controllerContext->getRequest())->editUriFor($nodeAddress);
}

public function previewUri(Node $node, ControllerContext $controllerContext): string
{
$contentRepository = $this->contentRepositoryRegistry->get($node->subgraphIdentity->contentRepositoryId);
2 changes: 1 addition & 1 deletion Configuration/Settings.yaml
Original file line number Diff line number Diff line change
@@ -137,7 +137,7 @@ Neos:
personalWorkspace: '${Neos.Ui.Workspace.getPersonalWorkspace(contentRepositoryId)}'
ui:
contentCanvas:
src: '${Neos.Ui.NodeInfo.editUri(documentNode, controllerContext)}'
src: '${Neos.Ui.NodeInfo.uri(documentNode, controllerContext)}'
backgroundColor: '${Configuration.setting(''Neos.Neos.Ui.contentCanvas.backgroundColor'')}'
debugMode: false
editPreviewMode: '${q(user).property("preferences.preferences")["contentEditing.editPreviewMode"] || Configuration.setting(''Neos.Neos.userInterface.defaultEditPreviewMode'')}'
3 changes: 0 additions & 3 deletions Tests/IntegrationTests/TestDistribution/composer.json
Original file line number Diff line number Diff line change
@@ -32,9 +32,6 @@
},
"extra": {
"patches": {
"neos/neos-development-collection": {
"FEATURE: Edit preview mode support for Neos 9": "https://github.com/neos/neos-development-collection/pull/4067.patch"
}
}
},
"repositories": {