X-Git-Url: http://www.aleph1.co.uk/gitweb/?a=blobdiff_plain;f=web%2Fmodules%2Fcontrib%2Fpathauto%2Fsrc%2FTests%2FPathautoNodeWebTest.php;h=a9376f7ac4648bddb596ade2ace7f992e7717743;hb=059867c3f96750652c80f39e44c442a58c2549ee;hp=95f5eb54c1de932a3bd9be35ebd0322a0fe8541b;hpb=a2bd1bf0c2c1f1a17d188f4dc0726a45494cefae;p=yaffs-website

diff --git a/web/modules/contrib/pathauto/src/Tests/PathautoNodeWebTest.php b/web/modules/contrib/pathauto/src/Tests/PathautoNodeWebTest.php
index 95f5eb54c..a9376f7ac 100644
--- a/web/modules/contrib/pathauto/src/Tests/PathautoNodeWebTest.php
+++ b/web/modules/contrib/pathauto/src/Tests/PathautoNodeWebTest.php
@@ -1,6 +1,7 @@
 <?php
 
 namespace Drupal\pathauto\Tests;
+
 use Drupal\pathauto\Entity\PathautoPattern;
 use Drupal\node\Entity\Node;
 use Drupal\pathauto\PathautoState;
@@ -30,7 +31,7 @@ class PathautoNodeWebTest extends WebTestBase {
   protected $adminUser;
 
   /**
-   * {inheritdoc}
+   * {@inheritdoc}
    */
   function setUp() {
     parent::setUp();
@@ -43,7 +44,6 @@ class PathautoNodeWebTest extends WebTestBase {
       'administer pathauto',
       'administer url aliases',
       'create url aliases',
-      'administer nodes',
       'bypass node access',
       'access content overview',
     );
@@ -57,14 +57,15 @@ class PathautoNodeWebTest extends WebTestBase {
    * Tests editing nodes with different settings.
    */
   function testNodeEditing() {
-    // Ensure that the Pathauto checkbox is checked by default on the node add form.
+    // Ensure that the Pathauto checkbox is checked by default on the node add
+    // form.
     $this->drupalGet('node/add/page');
     $this->assertFieldChecked('edit-path-0-pathauto');
 
     // Create a node by saving the node form.
     $title = ' Testing: node title [';
     $automatic_alias = '/content/testing-node-title';
-    $this->drupalPostForm(NULL, array('title[0][value]' => $title), t('Save and publish'));
+    $this->drupalPostForm(NULL, array('title[0][value]' => $title), t('Save'));
     $node = $this->drupalGetNodeByTitle($title);
 
     // Look for alias generated in the form.
@@ -82,7 +83,7 @@ class PathautoNodeWebTest extends WebTestBase {
       'path[0][pathauto]' => FALSE,
       'path[0][alias]' => $manual_alias,
     );
-    $this->drupalPostForm($node->toUrl('edit-form'), $edit, t('Save and keep published'));
+    $this->drupalPostForm($node->toUrl('edit-form'), $edit, t('Save'));
     $this->assertText(t('@type @title has been updated.', array('@type' => 'page', '@title' => $title)));
 
     // Check that the automatic alias checkbox is now unchecked by default.
@@ -91,7 +92,7 @@ class PathautoNodeWebTest extends WebTestBase {
     $this->assertFieldByName('path[0][alias]', $manual_alias);
 
     // Submit the node form with the default values.
-    $this->drupalPostForm(NULL, array('path[0][pathauto]' => FALSE), t('Save and keep published'));
+    $this->drupalPostForm(NULL, array('path[0][pathauto]' => FALSE), t('Save'));
     $this->assertText(t('@type @title has been updated.', array('@type' => 'page', '@title' => $title)));
 
     // Test that the old (automatic) alias has been deleted and only accessible
@@ -109,7 +110,7 @@ class PathautoNodeWebTest extends WebTestBase {
       'path[0][pathauto]' => TRUE,
       'path[0][alias]' => '/should-not-get-created',
     );
-    $this->drupalPostForm('node/add/page', $edit, t('Save and publish'));
+    $this->drupalPostForm('node/add/page', $edit, t('Save'));
     $this->assertNoAliasExists(array('alias' => 'should-not-get-created'));
     $node = $this->drupalGetNodeByTitle($title);
     $this->assertEntityAlias($node, '/content/automatic-title');
@@ -130,7 +131,7 @@ class PathautoNodeWebTest extends WebTestBase {
     $edit = array();
     $edit['title'] = 'My test article';
     $this->drupalCreateNode($edit);
-    //$this->drupalPostForm(NULL, $edit, t('Save and keep published'));
+    //$this->drupalPostForm(NULL, $edit, t('Save'));
     $node = $this->drupalGetNodeByTitle($edit['title']);
 
     // Pathauto checkbox should still not exist.
@@ -271,7 +272,7 @@ class PathautoNodeWebTest extends WebTestBase {
       'title[0][value]' => 'Sample article',
       'path[0][alias]' => '/sample-article',
     ];
-    $this->drupalPostForm('node/add/article', $edit, t('Save and publish'));
+    $this->drupalPostForm('node/add/article', $edit, t('Save'));
     $this->assertText(t('article Sample article has been created.'));
 
     // Test the alias.