Commit 82d53cec authored by João Ventura's avatar João Ventura Committed by Eirik Morland
Browse files

Issue #2892653 by eiriksm, jcnventura: Move settings form to the same place as in D7 version

parent c02696d0

modules/sparkpost_requeue/sparkpost_requeue.routing.yml

+1 −2
Original line number Diff line number Diff line 


sparkpost_requeue.settings_form:

  path: '/admin/config/system/sparkpost_requeue'

  path: '/admin/config/services/sparkpost_requeue'

  defaults:

    _form: '\Drupal\sparkpost_requeue\Form\SettingsForm'

    _title: 'SettingsForm'

sparkpost.links.menu.yml

+1 −1
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@ sparkpost.settings_form: 
  title: 'Sparkpost settings'

  route_name: sparkpost.settings_form

  description: 'Edit sparpost settings'

  parent: system.admin_config_system

  parent: system.admin_config_services

  weight: 99



sparkpost.test_mail_form:

sparkpost.routing.yml

+2 −2
Original line number Diff line number Diff line 
sparkpost.settings_form:

  path: '/admin/config/system/sparkpost'

  path: '/admin/config/services/sparkpost'

  defaults:

    _form: '\Drupal\sparkpost\Form\SettingsForm'

    _title: 'Sparkpost Settings'
@@ -7,7 +7,7 @@ sparkpost.settings_form: 
    _permission: 'administer sparkpost'



sparkpost.test_mail_form:

  path: '/admin/config/system/sparkpost/test'

  path: '/admin/config/services/sparkpost/test'

  defaults:

    _form: '\Drupal\sparkpost\Form\TestMailForm'

    _title: 'Send test mail'

tests/src/Functional/AdminSettingsTest.php

+5 −5
Original line number Diff line number Diff line
@@ -53,11 +53,11 @@ class AdminSettingsTest extends BrowserTestBase { 
    $this->drupalLogin($this->user);



    // Try access sparkpost admin form.

    $this->drupalGet('admin/config/system/sparkpost');

    $this->drupalGet('admin/config/services/sparkpost');

    $this->assertSession()->statusCodeEquals(403);



    // Try access test form.

    $this->drupalGet('admin/config/system/sparkpost/test');

    $this->drupalGet('admin/config/services/sparkpost/test');

    $this->assertSession()->statusCodeEquals(403);



    // Login as admin.
@@ -65,11 +65,11 @@ class AdminSettingsTest extends BrowserTestBase { 
    $this->drupalLogin($this->admin);



    // Try access sparkpost admin form.

    $this->drupalGet('admin/config/system/sparkpost');

    $this->drupalGet('admin/config/services/sparkpost');

    $this->assertSession()->statusCodeEquals(200);



    // Try access test form.

    $this->drupalGet('admin/config/system/sparkpost/test');

    $this->drupalGet('admin/config/services/sparkpost/test');

    $this->assertSession()->statusCodeEquals(403);



    // Set dummy access key.
@@ -79,7 +79,7 @@ class AdminSettingsTest extends BrowserTestBase { 
      ->save();



    // Try access test form.

    $this->drupalGet('admin/config/system/sparkpost/test');

    $this->drupalGet('admin/config/services/sparkpost/test');

    $this->assertSession()->statusCodeEquals(200);

  }