Merge pull request #196 from VNG-Realisatie/issue/provider-tests-impr…

…ovements Issue/provider tests improvements
VNG-Realisatie · Oct 17, 2019 · 1f7d8fa · 1f7d8fa
2 parents 5991b33 + 84453c9
commit 1f7d8fa
Show file tree

Hide file tree

Showing 7 changed files with 52 additions and 12 deletions.
diff --git a/src/vng/servervalidation/templates/servervalidation/server-run_detail.html b/src/vng/servervalidation/templates/servervalidation/server-run_detail.html
@@ -50,7 +50,7 @@
                             {% endblocktrans %}
                         </p>
                         <span display="block" style='width: 250px;' class="common__BadgeWrapper-sc-16zh6vt-3 fagfmg">
-                            <a href="{% url 'server_run:server-run_detail' object.uuid %}">
+                            <a href="{% url 'server_run:server-run_latest' object.test_scenario.uuid object.environment.uuid %}">
 
                                 <img id="badge" style='width:250px' alt="" src="">
                             </a>
@@ -383,10 +383,10 @@ <h5 class="card-title">HTML snippet</h5>
     function setBadgeInfo() {
         document.getElementById("badge-description").innerHTML = "Shown below is the badge of the most recent provider run with the environment {{ server_run.environment }} that was started by the user <b>{{ object.user }}</b>.";
         document.getElementById("badge").src = "https://img.shields.io/endpoint.svg?style=for-the-badge&url={{changing_badge_url|urlencode}}";
-        var gitSnippet = '[![Status badge](https://img.shields.io/endpoint.svg?style=for-the-badge&url={{changing_badge_url|urlencode}})]({{changing_badge_url}})'
+        var gitSnippet = '[![Status badge](https://img.shields.io/endpoint.svg?style=for-the-badge&url={{changing_badge_url|urlencode}})]({{request.scheme}}://{{request.get_host}}{% url 'server_run:server-run_latest' object.test_scenario.uuid object.environment.uuid %})'
 
         var htmlSnippet = '<span display="block" height="20px" class="common__BadgeWrapper-sc-16zh6vt-3 fagfmg">\n'
-            + '<a href="{{request.scheme}}://{{request.get_host}}{% url 'server_run:server-run_detail' object.uuid %}">\n'
+            + '<a href="{{request.scheme}}://{{request.get_host}}{% url 'server_run:server-run_latest' object.test_scenario.uuid object.environment.uuid %}">\n'
             + '<img style="width:100%" alt="" src="https://img.shields.io/endpoint.svg?style=for-the-badge&url={{changing_badge_url|urlencode}}"></span></a>'
 
         // this page's own source code

diff --git a/src/vng/servervalidation/templates/servervalidation/server-run_list.html b/src/vng/servervalidation/templates/servervalidation/server-run_list.html
@@ -48,7 +48,7 @@
                                 <tr>
                                     <td>
                                         <span display="block" class="common__BadgeWrapper-sc-16zh6vt-3 fagfmg">
-                                            <a href="{% url 'server_run:server-run_list' test_scenario.uuid environment.uuid %}">
+                                            <a href="{% url 'server_run:server-run_latest' test_scenario.uuid environment.uuid %}">
                                                 <img style="height:30px"  alt="" src="https://img.shields.io/endpoint.svg?style=for-the-badge&amp;url={{request.scheme}}://{{request.get_host}}{% url 'apiv1server:latest-badge' environment.uuid %}">
                                             </a>
                                         </span>

diff --git a/src/vng/servervalidation/templates/servervalidation/table/row-server-run.html b/src/vng/servervalidation/templates/servervalidation/table/row-server-run.html
@@ -71,12 +71,5 @@
             {{server_run.status_exec}}
         {% endif %}
     </td>
-    {% comment %} <td>
-        <span display="block"  class="common__BadgeWrapper-sc-16zh6vt-3 fagfmg">
-            <a href="{% url 'server_run:server-run_detail' server_run.uuid %}">
-                <img style='height:30px ' alt="" src="https://img.shields.io/endpoint.svg?style=for-the-badge&amp;url={{request.scheme}}://{{request.get_host}}{% url 'apiv1server:api_server-run-shield' server_run.uuid %}">
-            </a>
-        </span>
-    </td> {% endcomment %}
 </tr>
 {% endspaceless %}
diff --git a/src/vng/servervalidation/templates/servervalidation/table/row-test-scenario.html b/src/vng/servervalidation/templates/servervalidation/table/row-test-scenario.html
@@ -15,7 +15,7 @@
     <td>
         {% if last_run %}
             <span display="block" class="common__BadgeWrapper-sc-16zh6vt-3 fagfmg">
-                <a href="{% url 'server_run:server-run_list' scenario.uuid environment.uuid %}">
+                <a href="{% url 'server_run:server-run_latest' scenario.uuid environment.uuid %}">
                     <img style="height:30px"  alt="" src="https://img.shields.io/endpoint.svg?style=for-the-badge&amp;url={{request.scheme}}://{{request.get_host}}{% url 'apiv1server:latest-badge' environment.uuid %}">
                 </a>
             </span>

diff --git a/src/vng/servervalidation/tests/tests_frontend.py b/src/vng/servervalidation/tests/tests_frontend.py
@@ -801,3 +801,35 @@ def test_server_run_detail_uses_latest_results(self):
 
         self.assertIn('https://img.shields.io/', response.text)
         self.assertNotIn('no results yet for this environment', response.text)
+
+
+class LatestServerRunTests(WebTest):
+
+    def setUp(self):
+        self.user = UserFactory.create()
+        self.test_scenario = TestScenarioFactory.create()
+        self.environment = EnvironmentFactory.create(
+            test_scenario=self.test_scenario,
+            user=self.user
+        )
+
+    def test_latest_run_page_redirects_to_latest_run(self):
+        server_run1 = ServerRunFactory.create(
+            test_scenario=self.test_scenario,
+            user=self.user,
+            stopped="2019-01-01T12:00:00Z",
+            environment=self.environment
+        )
+        server_run2 = ServerRunFactory.create(
+            test_scenario=self.test_scenario,
+            user=self.user,
+            stopped="2019-01-01T15:00:00Z",
+            environment=self.environment
+        )
+
+        response = self.app.get(reverse('server_run:server-run_latest', kwargs={
+            'scenario_uuid': self.test_scenario.uuid,
+            'env_uuid': self.environment.uuid
+        }), user=self.user)
+
+        self.assertIn(str(server_run2.id), response.text)
diff --git a/src/vng/servervalidation/urls.py b/src/vng/servervalidation/urls.py
@@ -26,5 +26,6 @@
     path('<uuid:uuid>/', views.ServerRunOutputUuid.as_view(), name='server-run_detail'),
     path('<int:api_id>/', views.TestScenarioList.as_view(), name='test-scenario_list'),
     path('<uuid:scenario_uuid>/<uuid:env_uuid>/', views.ServerRunList.as_view(), name='server-run_list'),
+    path('<uuid:scenario_uuid>/<uuid:env_uuid>/latest/', views.LatestRunView.as_view(), name='server-run_latest'),
     # path('', views.ServerRunList.as_view(), name='server-run_list'),
 ]
diff --git a/src/vng/servervalidation/views.py b/src/vng/servervalidation/views.py
@@ -586,3 +586,17 @@ def get(self, request, *args, **kwargs):
             'scenario_uuid': environment.test_scenario.uuid,
             'env_uuid': environment.uuid
         }))
+
+
+class LatestRunView(ServerRunOutputUuid):
+    model = ServerRun
+    template_name = 'servervalidation/server-run_detail.html'
+    slug_field = 'uuid'
+    slug_url_kwarg = 'uuid'
+
+    def get_object(self):
+        server_runs = ServerRun.objects.filter(
+            environment__uuid=self.kwargs['env_uuid'],
+            test_scenario__uuid=self.kwargs['scenario_uuid']
+        ).order_by('-stopped')
+        return server_runs.first()