PRT-289 Creates Portal 404 page; fixes tests

Author: caco13

Diff for: experiments/tests/test_views.py

@@ -447,6 +447,11 @@ def test_access_experiment_detail_with_wrong_url_returns_404_http_status_code(se
         slug = str(Experiment.objects.first().slug)[:-3]
         response = self.client.get('/experiments/' + slug + '/')
         self.assertEqual(response.status_code, 404)
+        self.assertIn('404 - Not Found', response.content.decode())
+        self.assertIn(
+            'Neuroscience Experiments Database', response.content.decode(),
+        )
+        self.assertIn('Related Projects', response.content.decode())
 
     def test_uses_detail_template(self):
         slug = str(Experiment.objects.first().slug)

Diff for: experiments/views.py

@@ -10,8 +10,8 @@
 from django.core.exceptions import PermissionDenied
 from django.core.mail import send_mail
 from django.db.models import Count
-from django.http import HttpResponseRedirect, HttpResponse
-from django.shortcuts import render, get_object_or_404
+from django.http import HttpResponseRedirect, HttpResponse, Http404
+from django.shortcuts import render
 from django.template.loader import render_to_string
 from django.utils.text import slugify
 from django.utils.translation import activate, LANGUAGE_SESSION_KEY, \
@@ -214,7 +214,10 @@ def experiment_detail(request, slug):
         to_be_analysed_count = all_experiments.filter(
             status=Experiment.TO_BE_ANALYSED).count()
 
-    experiment = get_object_or_404(Experiment, slug=slug)
+    try:
+        experiment = Experiment.objects.get(slug=slug)
+    except Experiment.DoesNotExist:
+        raise Http404('404 - Not Found')
 
     gender_grouping = {}
     age_grouping = {}

Diff for: functional_tests/test_experiment_detail.py

@@ -133,20 +133,10 @@ def test_can_view_detail_page(self):
         study_start_date = self.browser.find_element_by_id(
             'study_startdate').text
         self.assertIn('Start date:', study_start_date)
-        ##
-        # To conform to study_start_date format in template. For month
-        # September (9) we have to do something more.
-        # TODO: search for better solution
-        ##
-        if self.experiment.study.start_date.month == 9:
-            strdate = self.experiment.study.start_date.strftime(
-                "%b. %d, %Y"
-            ).lstrip("0").replace(". ", "t. ")
-        else:
-            strdate = self.experiment.study.start_date.strftime(
-                "%b. %d, %Y"
-            ).lstrip("0").replace(" 0", " ")
-        self.assertIn(strdate, study_start_date)
+        self.assertIn(
+            self.experiment.study.start_date.strftime("%B %d, %Y"),
+            study_start_date
+        )
         study_end_date = self.browser.find_element_by_id(
             'study_enddate').text
         self.assertIn('End date:', study_end_date)
@@ -202,7 +192,8 @@ def test_can_view_detail_page(self):
         # expands displaying textual representation of the experimental
         # protocol.
         group = self.experiment.groups.first()
-        link_details = self.browser.find_element_by_link_text('Details')
+        link_details = self.browser.find_element_by_xpath(
+            "//a[@href='#collapse_group" + str(group.id) + "']")
         link_details.click()
 
         self.wait_for(lambda: self.assertIn(
@@ -1478,13 +1469,6 @@ def test_clicking_in_download_all_experiment_data_link_pops_up_a_modal_with_lice
         # In the modal there is also how to cite that experiment in her own
         # work
         self.assertIn('How to cite this experiment:', license_modal.text)
-        ##
-        # this is to mimic how datetime is displayed in template by default
-        ##
-        sent_date = \
-            self.experiment.sent_date.strftime("%b. %d, %Y").lstrip("0").replace(
-                " 0", " "
-            )
         self.assertIn(
             'das Dores'.upper() + ', Anibal', license_modal.text
         )
@@ -1495,7 +1479,8 @@ def test_clicking_in_download_all_experiment_data_link_pops_up_a_modal_with_lice
             'Farias'.upper() + ', Antônio', license_modal.text
         )
         self.assertIn(
-            self.experiment.title + '. Sent date: ' + str(sent_date),
+            self.experiment.title + '. Sent date: ' + str(
+                self.experiment.sent_date.strftime('%B %d, %Y')),
             license_modal.text
         )
         self.assertNotIn(
@@ -1532,20 +1517,14 @@ def test_clicking_in_download_all_experiment_data_link_pops_up_a_modal_with_lice
         # In the modal there is also how to cite that experiment in her own
         # work
         self.assertIn('How to cite this experiment:', license_modal.text)
-        ##
-        # this is to mimic how datetime is displayed in template by default
-        ##
-        sent_date = \
-            self.experiment.sent_date.strftime("%b. %d, %Y").lstrip("0").replace(
-                " 0", " ")
-
         self.assertIn(
             self.experiment.study.researcher.last_name.upper() + ', ' +
             self.experiment.study.researcher.first_name,
             license_modal.text
         )
         self.assertIn(
-            self.experiment.title + '. Sent date: ' + str(sent_date) + '.',
+            self.experiment.title + '. Sent date: ' +
+            self.experiment.sent_date.strftime('%B %d, %Y') + '.',
             license_modal.text
         )
 
@@ -1613,9 +1592,7 @@ def test_how_to_cite_in_license_modal_is_equal_to_how_to_cite_in_citation_file_1
         self.assertIn(
             'SORIANO, Valdick. ' + self.experiment.title
             + '. Sent date: '
-            + str(self.experiment.sent_date.strftime('%b. %d, %Y').lstrip('0').replace(
-                ' 0', ' '
-            )),
+            + self.experiment.sent_date.strftime('%B %d, %Y'),
             license_modal.text
         )
 
@@ -1672,9 +1649,7 @@ def test_how_to_cite_in_license_modal_is_equal_to_how_to_cite_in_citation_file_2
         self.assertIn(
             'COSTA, Edimilson; ROSS B., Diana; BOULOS, Guilherme. '
             + self.experiment.title + '. Sent date: '
-            + str(self.experiment.sent_date.strftime('%b. %d, %Y').lstrip('0').replace(
-                ' 0', ' '
-            )),
+            + self.experiment.sent_date.strftime('%B %d, %Y'),
             license_modal.text
         )
 

Diff for: functional_tests/test_list_last_version_experiments.py

@@ -172,11 +172,13 @@ def test_can_view_home_page_when_there_is_new_version_not_approved(self):
                 str(self.experiment.version) for row in rows)
         )
 
-    def test_view_404_http_status_code_when_trying_access_not_existent_page(self):
+    def test_when_trying_to_access_not_existent_detail_page_display_404_not_found_page(self):
         # Josenilda is trying to access her experiment that she recently
         # sent to Portal, but she types the URL address incorrectly in
-        # Browser, so she sees a 404 error page
+        # Browser, so she sees the 404 error page
         broken_url = self.experiment.slug[:-3]
         self.browser.get(self.live_server_url + '/experiments/' + broken_url)
         body = self.browser.find_element_by_tag_name('body')
-        self.assertIn('Not Found', body.text)
+        self.assertIn('404 - Not Found', body.text)
+        self.assertIn('Neuroscience Experiments Database', body.text)
+        self.assertIn('RELATED PROJECTS', body.text)

Diff for: nep/settings.py

@@ -86,7 +86,7 @@
 TEMPLATES = [
     {
         'BACKEND': 'django.template.backends.django.DjangoTemplates',
-        'DIRS': [],
+        'DIRS': [os.path.join(BASE_DIR, 'templates')],
         'APP_DIRS': True,
         'OPTIONS': {
             'context_processors': [

Diff for: templates/404.html

@@ -0,0 +1,41 @@
+{% extends 'experiments/base.html' %}
+
+{% block style %}
+    {% load static %}
+    {# define id to functional tests #}
+    <link id="id_bs_select_css" rel="stylesheet" href="{% static 'bootstrap-select-1.12.4-dist/css/bootstrap-select.min.css' %}">
+{% endblock %}
+
+{% block header %}
+    {% load i18n %}
+    {% include 'experiments/header_home.html' %}
+{% endblock %}
+
+{% block content %}
+    <section class="container nep-content">
+        {% if messages %}
+            {% include 'experiments/messages.html' %}
+        {% endif %}
+        <h1 align="center">404 - Not Found</h1>
+    </section>
+{% endblock %}
+
+{% block script %}
+    <script src="{% url 'javascript-catalog' %}"></script>
+    {##}
+    {## Scripts related to experiments/header_home.html #}
+    {##}
+    {% load static %}
+    {# define id for functional tests #}
+    <script id="id_bs_select_js" src="{% static 'bootstrap-select-1.12.4-dist/js/bootstrap-select.js' %}"></script>
+    {##}
+    {## Script related to experiments/top.html #}
+    {##}
+    <script>
+        let to_be_analysed_count = {{ to_be_analysed_count }};
+        if (to_be_analysed_count) {
+            $('head').append('<style>.badger::after{content:"' +
+                to_be_analysed_count + '"}</style>');
+        }
+    </script>
+{% endblock %}