Fix tests

fabry_perot/tests.py

@@ -4,53 +4,58 @@
 
 class TestPage(TestCase):
     def assert_updates_graph(self, data, code, content=None):
-        url = reverse('index') + 'graph/'
-        response = self.client.post(url, data)
+        url = reverse('fp-index') + 'graph/'
+        response = self.client.post(url, data, 'application/json')
         self.assertEqual(response.status_code, code)
+
         if content:
             self.assertEqual(response.content, content)
 
     def assert_saves_preset(self, data, code, content=None):
-        data["preset_operation"] = "save_preset"
-        url = reverse('index') + 'preset/'
+        data['preset_operation'] = 'save_preset'
+        url = reverse('fp-index') + 'preset/'
         response = self.client.post(url, data)
         self.assertEqual(response.status_code, code)
+
         if content:
             self.assertContains(response, content)
 
     def assert_deletes_preset(self, preset_id, code, content=None):
         data = {
-            "delete_preset": preset_id,
-            "preset_operation": "delete_preset"
+            'delete_preset': preset_id,
+            'preset_operation': 'delete_preset'
         }
-        url = reverse('index') + 'preset/'
+        url = reverse('fp-index') + 'preset/'
         response = self.client.post(url, data)
         self.assertEqual(response.status_code, code)
+
         if content:
             self.assertContains(response, content)
 
     def assert_update_history(self, data, code, content=None):
-        url = reverse('index') + 'history/'
+        url = reverse('fp-index') + 'history/'
         response = self.client.post(url, data)
         self.assertEqual(response.status_code, code)
+
         if content:
             self.assertContains(response, content)
 
     def get_data(self, **kwargs):
         data = self.basic_data.copy()
         data.update(kwargs)
+
         return data
 
     def setUp(self):
         self.basic_data = {
-            "wave_length": "630",
-            "glasses_distance": "15",
-            "focal_distance": "100",
-            "stroke_difference": "0",
-            "reflectivity": "0.7",
-            "refractive_index": "1",
-            "picture_size": "5",
-            "N": "500"
+            'wave_length': '630',
+            'wave_length_diff': '0',
+            'glasses_distance': '15',
+            'focal_distance': '100',
+            'reflection_coefficient': '0.7',
+            'refractive_index': '1',
+            'picture_size': '5',
+            'N': '500'
         }
         self.client = Client()
 
@@ -65,42 +70,43 @@ def test_interferometer_generation(self):
 
     def test_interferometer_generation_with_wrong_wavelength(self):
         request_data = self.get_data(wave_length=1000)
-        self.assert_updates_graph(request_data, 200, b'None')
+        self.assert_updates_graph(request_data, 200, None)
 
         request_data = self.get_data(wave_length=0)
-        self.assert_updates_graph(request_data, 200, b'None')
+        self.assert_updates_graph(request_data, 200, None)
+
+    def test_interferometer_generation_with_wrong_wave_length_diff(self):
+        request_data = self.get_data(wave_length_diff=-1)
+        self.assert_updates_graph(request_data, 200, None)
 
     def test_interferometer_generation_with_wrong_glasses_distance(self):
         request_data = self.get_data(glasses_distance=-1)
-        self.assert_updates_graph(request_data, 200, b'None')
+        self.assert_updates_graph(request_data, 200, None)
 
     def test_interferometer_generation_with_wrong_focal_distance(self):
         request_data = self.get_data(focal_distance=-1)
-        self.assert_updates_graph(request_data, 200, b'None')
+        self.assert_updates_graph(request_data, 200, None)
+
+    def test_interferometer_generation_with_wrong_reflectivity(self):
+        request_data = self.get_data(reflection_coefficient=-1)
+        self.assert_updates_graph(request_data, 200, None)
 
-    def test_interferometer_generation_with_wrong_stroke_difference(self):
-        request_data = self.get_data(stroke_difference=-1)
-        self.assert_updates_graph(request_data, 200, b'None')
+        request_data = self.get_data(reflection_coefficient=1.5)
+        self.assert_updates_graph(request_data, 200, None)
+
+    def test_interferometer_generation_with_wrong_refractive_index(self):
+        request_data = self.get_data(refractive_index=-1)
+        self.assert_updates_graph(request_data, 200, None)
 
     def test_interferometer_generation_with_wrong_picture_size(self):
         request_data = self.get_data(picture_size=-1)
-        self.assert_updates_graph(request_data, 200, b'None')
+        self.assert_updates_graph(request_data, 200, None)
 
     def test_interferometer_generation_with_wrong_n(self):
+        # N less than 0
         request_data = self.get_data(N=-1)
-        self.assert_updates_graph(request_data, 200, b'None')
+        self.assert_updates_graph(request_data, 200, None)
 
-        # N more than 4000
+        # N more than 1000
         request_data = self.get_data(N=1001)
-        self.assert_updates_graph(request_data, 200, b'None')
-
-    def test_interferometer_generation_with_wrong_reflectivity(self):
-        request_data = self.get_data(reflectivity=-1)
-        self.assert_updates_graph(request_data, 200, b'None')
-
-        request_data = self.get_data(reflectivity=1.5)
-        self.assert_updates_graph(request_data, 200, b'None')
-
-    def test_interferometer_generation_with_wrong_refractive_index(self):
-        request_data = self.get_data(refractive_index=-1)
-        self.assert_updates_graph(request_data, 200, b'None')
+        self.assert_updates_graph(request_data, 200, None)

fabry_perot/urls.py

@@ -3,7 +3,7 @@
 from . import views
 
 urlpatterns = [
-    path('', views.IndexPage.as_view(), name='index'),
+    path('', views.IndexPage.as_view(), name='fp-index'),
     path('graph/', views.Graph.as_view()),
     path('history/', views.HistoryTable.as_view()),
     path('preset/', views.PresetsTable.as_view())

michelson/urls.py

@@ -3,7 +3,7 @@
 from . import views
 
 urlpatterns = [
-    path('', views.IndexPage.as_view(), name='index'),
+    path('', views.IndexPage.as_view(), name='m-index'),
     path('graph/', views.Graph.as_view()),
     path('history/', views.HistoryTable.as_view()),
     path('preset/', views.PresetsTable.as_view())

misc/mixins/graph.py

@@ -15,7 +15,7 @@ def post(self, request, *args, **kwargs) -> JsonResponse:
             form_dict = dict(form.cleaned_data)
             graph = self.get_graph(form_dict)
 
-        return JsonResponse(graph)
+        return JsonResponse(graph, safe=False)
 
     @staticmethod
     def get_graph(form_dict: dict) -> Optional[dict[str, Union[str, tuple[str, ...]]]]: