From a57e4091df6505b76f8008c9040863afaed62662 Mon Sep 17 00:00:00 2001
From: Julien Cristau <jcristau@mozilla.com>
Date: Fri, 4 Aug 2017 12:22:55 +0200
Subject: [PATCH] Show ETA for submitted releases if present

---
 kickoff/templates/includes/releases_submitted.html | 3 +++
 kickoff/test/base.py                               | 3 ++-
 kickoff/test/views/test_releases.py                | 5 +++++
 3 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/kickoff/templates/includes/releases_submitted.html b/kickoff/templates/includes/releases_submitted.html
index 1299a23..48a6b5d 100644
--- a/kickoff/templates/includes/releases_submitted.html
+++ b/kickoff/templates/includes/releases_submitted.html
@@ -29,6 +29,9 @@
      <li>Comm Relbranch: {{ rel.commRelbranch }}</li>
      {% endif %}
      <li><a href="/releases/{{ rel.name }}/l10n">L10n Changeset</a></li>
+     {% if rel.release_eta %}
+     <li>ETA: {{ rel.release_eta }}</li>
+     {% endif %}
      {% if not 'Fennec' in rel.name %}
      <li>Partial versions: {{ rel.partials }}</li>
      {% if not rel.promptWaitTime %}
diff --git a/kickoff/test/base.py b/kickoff/test/base.py
index 536aa38..80c5b40 100644
--- a/kickoff/test/base.py
+++ b/kickoff/test/base.py
@@ -153,7 +153,8 @@ class TestBase(unittest.TestCase):
                                l10nChangesets='ja zu',
                                mozillaRelbranch='FOO',
                                submittedAt=datetime(2005, 1, 2, 3, 4, 5, 6),
-                               comment="yet an other amazing comment")
+                               comment="yet an other amazing comment",
+                               release_eta=datetime(2005, 1, 2, 3, 4, 5, 7))
             db.session.add(r)
 
             r = FirefoxRelease(partials='0,1', promptWaitTime=5,
diff --git a/kickoff/test/views/test_releases.py b/kickoff/test/views/test_releases.py
index b9dbf09..0db5700 100644
--- a/kickoff/test/views/test_releases.py
+++ b/kickoff/test/views/test_releases.py
@@ -459,6 +459,11 @@ class TestReleaseView(ViewTest):
         ret = self.get('/release.html', query_string={'name': 'Firefox-moz://a'})
         self.assertEqual(ret.status_code, 404)
 
+    def testReleaseWithETA(self):
+        ret = self.get('/releases.html')
+        self.assertEqual(ret.status_code, 200)
+        self.assertIn('ETA: 2005-01-02T03:04:05.000007+00:00', ret.data)
+
     def testThunderbirdUpdateWithNoCommRevision(self):
         with app.test_request_context():
             release = ThunderbirdRelease('def',
-- 
2.13.3