From 33fd08a1685feea1ff323ae55187202904c96e55 Mon Sep 17 00:00:00 2001
From: Valentin Deniaud <vdeniaud@entrouvert.com>
Date: Thu, 28 Oct 2021 18:35:48 +0200
Subject: [PATCH] sms: increase visibility of test message sending (#58138)

---
 .../passerelle/manage/messages_service_view.html       |  9 ++-------
 .../templates/passerelle/manage/service_view.html      |  2 ++
 tests/test_sms.py                                      | 10 ++++------
 3 files changed, 8 insertions(+), 13 deletions(-)

diff --git a/passerelle/sms/templates/passerelle/manage/messages_service_view.html b/passerelle/sms/templates/passerelle/manage/messages_service_view.html
index 6e5e2c89..32b3e054 100644
--- a/passerelle/sms/templates/passerelle/manage/messages_service_view.html
+++ b/passerelle/sms/templates/passerelle/manage/messages_service_view.html
@@ -1,13 +1,8 @@
 {% extends "passerelle/manage/service_view.html" %}
 {% load i18n passerelle %}
 
-{% block endpoints %}
-{{ block.super }}
+{% block actions %}
 {% if perms.base.see_accessright %}
-<div>
-  <a rel="popup" href="/manage{{ object.get_absolute_url }}test-send/">
-    {% trans 'Send a test message' %}
-  </a>
-</div>
+<a rel="popup" id="sms-test-send" href="/manage{{ object.get_absolute_url }}test-send/">{% trans 'Send a test message' %}</a>
 {% endif %}
 {% endblock %}
diff --git a/passerelle/templates/passerelle/manage/service_view.html b/passerelle/templates/passerelle/manage/service_view.html
index 79ce9f88..2d50a56b 100644
--- a/passerelle/templates/passerelle/manage/service_view.html
+++ b/passerelle/templates/passerelle/manage/service_view.html
@@ -19,6 +19,8 @@
 {% if object|can_edit:request.user %}
 <a rel="popup" href="{{ object.get_edit_url }}">{% trans 'edit' %}</a>
 {% endif %}
+{% block actions %}
+{% endblock %}
 </span>
 <ul class="extra-actions-menu">
   {% if object|can_edit:request.user and has_check_status %}
diff --git a/tests/test_sms.py b/tests/test_sms.py
index 345823ab..be332fd9 100644
--- a/tests/test_sms.py
+++ b/tests/test_sms.py
@@ -422,18 +422,16 @@ def test_ovh_new_api(app, freezer):
 def test_sms_test_send(admin_user, app, connector):
     url = '/%s/%s/' % (connector.get_connector_slug(), connector.slug)
     resp = app.get(url)
-    link = resp.html.find('div', {'id': 'endpoints'}).find_all('a')[-1]
-    assert 'Send a test message' not in link.text
+    assert 'Send a test message' not in resp.text
 
     app = login(app)
     resp = app.get(url)
-    link = resp.html.find('div', {'id': 'endpoints'}).find_all('a')[-1]
-    assert 'Send a test message' in link.text
-    assert link['href'] == reverse(
+    assert 'Send a test message' in resp.text
+    assert resp.pyquery('a#sms-test-send')[0].attrib['href'] == reverse(
         'sms-test-send', kwargs={'connector': connector.get_connector_slug(), 'slug': connector.slug}
     )
 
-    resp = app.get(link['href'])
+    resp = resp.click('Send a test message')
     resp.form['number'] = '+33688888888'
     resp.form['sender'] = '+33699999999'
     resp.form['message'] = 'hello'
-- 
2.30.2