Commit e6828ca5 authored by pifagor's avatar pifagor Committed by pifagor
Browse files

Issue #2957690 by pifagor: "Save and Publish" button on entity forms changed to checkbox

parent ade21a0e
...@@ -59,11 +59,11 @@ class XmlSitemapMultilingualNodeTest extends XmlSitemapMultilingualTestBase { ...@@ -59,11 +59,11 @@ class XmlSitemapMultilingualNodeTest extends XmlSitemapMultilingualTestBase {
$this->drupalPostForm('node/' . $node->id() . '/edit', [ $this->drupalPostForm('node/' . $node->id() . '/edit', [
'langcode[0][value]' => 'en', 'langcode[0][value]' => 'en',
], t('Save and keep published')); ], t('Save'));
$link = $this->assertSitemapLink('node', $node->id(), ['status' => 0, 'access' => 1]); $link = $this->assertSitemapLink('node', $node->id(), ['status' => 0, 'access' => 1]);
$this->assertIdentical($link['language'], 'en'); $this->assertIdentical($link['language'], 'en');
$this->drupalPostForm('node/' . $node->id() . '/edit', ['langcode[0][value]' => 'fr'], t('Save and keep published')); $this->drupalPostForm('node/' . $node->id() . '/edit', ['langcode[0][value]' => 'fr'], t('Save'));
$link = $this->assertSitemapLink('node', $node->id(), ['status' => 0, 'access' => 1]); $link = $this->assertSitemapLink('node', $node->id(), ['status' => 0, 'access' => 1]);
$this->assertIdentical($link['language'], 'fr'); $this->assertIdentical($link['language'], 'fr');
} }
......
...@@ -122,7 +122,8 @@ class XmlSitemapNodeFunctionalTest extends XmlSitemapTestBase { ...@@ -122,7 +122,8 @@ class XmlSitemapNodeFunctionalTest extends XmlSitemapTestBase {
$edit[$title_key] = $this->randomMachineName(8); $edit[$title_key] = $this->randomMachineName(8);
$edit[$body_key] = $this->randomMachineName(16); $edit[$body_key] = $this->randomMachineName(16);
$edit['tags[target_id]'] = 'tag1, tag2, tag3'; $edit['tags[target_id]'] = 'tag1, tag2, tag3';
$this->drupalPostForm('node/add/page', $edit, t('Save and publish')); $edit['status[value]'] = TRUE;
$this->drupalPostForm('node/add/page', $edit, t('Save'));
$tags = entity_load_multiple('taxonomy_term'); $tags = entity_load_multiple('taxonomy_term');
foreach ($tags as $tag) { foreach ($tags as $tag) {
...@@ -140,7 +141,7 @@ class XmlSitemapNodeFunctionalTest extends XmlSitemapTestBase { ...@@ -140,7 +141,7 @@ class XmlSitemapNodeFunctionalTest extends XmlSitemapTestBase {
'changefreq' => XMLSITEMAP_FREQUENCY_HOURLY, 'changefreq' => XMLSITEMAP_FREQUENCY_HOURLY,
]); ]);
$this->drupalPostForm('node/add/page', $edit, t('Save and publish')); $this->drupalPostForm('node/add/page', $edit, t('Save'));
$tags = entity_load_multiple('taxonomy_term'); $tags = entity_load_multiple('taxonomy_term');
foreach ($tags as $tag) { foreach ($tags as $tag) {
...@@ -197,7 +198,7 @@ class XmlSitemapNodeFunctionalTest extends XmlSitemapTestBase { ...@@ -197,7 +198,7 @@ class XmlSitemapNodeFunctionalTest extends XmlSitemapTestBase {
'xmlsitemap[priority]' => 0.9, 'xmlsitemap[priority]' => 0.9,
'xmlsitemap[changefreq]' => XMLSITEMAP_FREQUENCY_ALWAYS, 'xmlsitemap[changefreq]' => XMLSITEMAP_FREQUENCY_ALWAYS,
]; ];
$this->drupalPostForm('node/' . $node->id() . '/edit', $edit, t('Save and keep published')); $this->drupalPostForm('node/' . $node->id() . '/edit', $edit, t('Save'));
$this->assertText('Basic page Test node title has been updated.'); $this->assertText('Basic page Test node title has been updated.');
$this->assertSitemapLinkValues('node', $node->id(), [ $this->assertSitemapLinkValues('node', $node->id(), [
'access' => 1, 'access' => 1,
...@@ -212,7 +213,7 @@ class XmlSitemapNodeFunctionalTest extends XmlSitemapTestBase { ...@@ -212,7 +213,7 @@ class XmlSitemapNodeFunctionalTest extends XmlSitemapTestBase {
'xmlsitemap[status]' => 'default', 'xmlsitemap[status]' => 'default',
'xmlsitemap[priority]' => 'default', 'xmlsitemap[priority]' => 'default',
]; ];
$this->drupalPostForm('node/' . $node->id() . '/edit', $edit, t('Save and keep published')); $this->drupalPostForm('node/' . $node->id() . '/edit', $edit, t('Save'));
$this->assertText('Basic page Test node title has been updated.'); $this->assertText('Basic page Test node title has been updated.');
$this->assertSitemapLinkValues('node', $node->id(), [ $this->assertSitemapLinkValues('node', $node->id(), [
'access' => 1, 'access' => 1,
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment