Adapt test cases, document resolution change in Changelog

History.md

@@ -12,6 +12,7 @@
 - Custom input fields in motion forms can now have explanations. They can also be set to be "encouraged but not required" - that is, the user can skip them but will get a warning if they do so.
 - Content pages can now have attached files, just like the welcome text on the home page.
 - Access to content pages can now be restricted to logged in users, admins or specific user groups.
+- When merging amendments into a motion, the default setting now is to create a resolution, not a new motion.
 - Bugfix: Tabular data was not encoded correctly in the PHP-based PDF export.
 - Bugfix: The PDF with all amendments embedded into the motion text could not be generated if a Weasyprint-based PDF layout was selected.
 - Bugfix: If a motion with a proposed modified version was copied, merging that proposed version was not possible anymore.

tests/Acceptance/merging/AllAmendmentsMergeAmendmentsCept.php

@@ -190,7 +190,7 @@
 
 
 $I->wantTo('check if the modifications were made');
-$I->see('A2', 'h1');
+$I->see('Beschluss', '.statusRow');
 $I->see('Version 2', '.motionDataTable .historyOpener .currVersion');
 $I->see('Oamoi a Maß');
 $I->see('Schooe');

tests/Acceptance/merging/CreateResolutionWithProtocolCept.php

@@ -38,8 +38,6 @@
 
 
 $I->wantTo('choose the resolution');
-$I->dontSeeElement('#newInitiator');
-$I->dontSeeElement('#dateResolution');
 $I->click("//input[@name='newStatus'][@value='resolution_preliminary']");
 $I->seeElement('#newInitiator');
 $I->seeElement('#dateResolution');