From 8184c0ac8b7cd1d2c15aa7700d96dd11c69c92a8 Mon Sep 17 00:00:00 2001
From: Colin Lamont <colinlamont@gmail.com>
Date: Fri, 17 Feb 2017 09:33:18 -0800
Subject: [PATCH 1/2] added tests, modified views and edit data

---
 .../pychart_datarender/edit_data.html         |  2 +-
 pychart/pychart_datarender/tests.py           | 84 +++++++++++++++++++
 pychart/pychart_datarender/views.py           |  1 +
 3 files changed, 86 insertions(+), 1 deletion(-)

diff --git a/pychart/pychart_datarender/templates/pychart_datarender/edit_data.html b/pychart/pychart_datarender/templates/pychart_datarender/edit_data.html
index 8afb71b..08075ad 100644
--- a/pychart/pychart_datarender/templates/pychart_datarender/edit_data.html
+++ b/pychart/pychart_datarender/templates/pychart_datarender/edit_data.html
@@ -5,7 +5,7 @@
 <ul>
     <h3>Edit Data</h3>
 
-    <form method="POST" class="add-photo-form" enctype="multipart/form-data">
+    <form method="POST" class="edit-data-form" enctype="multipart/form-data">
     {% csrf_token %}
     {{ form.as_p }}
     <button type="submit">Edit</button>
diff --git a/pychart/pychart_datarender/tests.py b/pychart/pychart_datarender/tests.py
index c33debe..daeb6b4 100644
--- a/pychart/pychart_datarender/tests.py
+++ b/pychart/pychart_datarender/tests.py
@@ -10,6 +10,7 @@
 import pandas as pd
 from django.urls import reverse_lazy
 import os
+from django.utils.functional import SimpleLazyObject
 
 BASE_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
 TEST_FILE_PATH = os.path.join(BASE_DIR, 'MEDIA/data/drug.csv')
@@ -285,6 +286,8 @@ def test_logged_in_user_can_get_to_render_detail_page(self):
 
     def test_data_detail_return_200(self):
         """Test that data detail page is accessible."""
+        user = self.user_login()
+        self.client.force_login(user)
         data = Data.objects.first()
         response = self.client.get(reverse_lazy('data_detail',
                                                 kwargs={'pk': data.id}))
@@ -292,6 +295,8 @@ def test_data_detail_return_200(self):
 
     def test_data_edit_return_200(self):
         """Test that data detail page is accessible."""
+        user = self.user_login()
+        self.client.force_login(user)
         data = Data.objects.first()
         response = self.client.get(reverse_lazy('data_edit',
                                                 kwargs={'pk': data.id}))
@@ -368,6 +373,85 @@ def test_retrieve_data_returns_html_json_response(self):
         self.assertEqual(res.status_code, 200)
         self.assertIn(b'application/json', res.serialize_headers())
 
+    def test_title_is_saved_using_render_to_db_function(self):
+        """Test title is saved via render_to_db."""
+        from pychart_datarender.views import render_to_db
+        render_data = {"html": "text for html", "title": "my render", "description": "my first render ever.", "render_type": "Bar"}
+        render_data["user"] = SimpleLazyObject(lambda: self.users[0])
+        render_to_db(render_data)
+        new_render = Render.objects.get(title="my render")
+        self.assertEqual(new_render.title, "my render")
+
+    def test_description_is_saved_using_render_to_db_function(self):
+        """Test description is saved via render_to_db."""
+        from pychart_datarender.views import render_to_db
+        render_data = {"html": "text for html", "title": "my render", "description": "my first render ever.", "render_type": "Bar"}
+        render_data["user"] = SimpleLazyObject(lambda: self.users[0])
+        render_to_db(render_data)
+        new_render = Render.objects.get(description="my first render ever.")
+        self.assertTrue(new_render.description == "my first render ever.")
+
+    def test_html_is_saved_using_render_to_db_function(self):
+        """Test html is saved via render_to_db."""
+        from pychart_datarender.views import render_to_db
+        render_data = {"html": "text for html", "title": "my render", "description": "my first render ever.", "render_type": "Bar"}
+        render_data["user"] = SimpleLazyObject(lambda: self.users[0])
+        render_to_db(render_data)
+        new_render = Render.objects.get(render="text for html")
+        self.assertTrue(new_render.render == "text for html")
+
+    def test_render_type_is_saved_using_render_to_db_function(self):
+        """Test render_type is saved via render_to_db."""
+        from pychart_datarender.views import render_to_db
+        render_data = {"html": "text for html", "title": "my render", "description": "my first render ever.", "render_type": "Bar"}
+        render_data["user"] = SimpleLazyObject(lambda: self.users[0])
+        render_to_db(render_data)
+        new_render = Render.objects.get(render_type="Bar")
+        self.assertTrue(new_render.render_type == "Bar")
+
+    def test_owner_is_saved_using_render_to_db_function(self):
+        """Test owner exists when saved via render_to_db."""
+        from pychart_datarender.views import render_to_db
+        render_data = {"html": "text for html", "title": "my render", "description": "my first render ever.", "render_type": "Bar"}
+        render_data["user"] = SimpleLazyObject(lambda: self.users[0])
+        render_to_db(render_data)
+        new_render = Render.objects.get(render_type="Bar")
+        self.assertTrue(new_render.owner)
+
+    def test_render_edit_gets_redirected(self):
+        """Test that edit render submission redirects."""
+        user = self.users[0]
+        self.client.force_login(user)
+        new_chart = Render.objects.first()
+        new_chart.owner = user.profile
+        new_chart.save()
+        response = self.client.post('/data/render/' + str(new_chart.id) + '/edit/',{'title': 'hello'})
+        self.assertTrue(response.status_code == 302)
+
+    def test_render_edit_redirects_to_gallery(self):
+        """Test that edit render submission redirects to Gallery."""
+        user = self.users[0]
+        self.client.force_login(user)
+        new_chart = Render.objects.first()
+        new_chart.owner = user.profile
+        new_chart.save()
+        response = self.client.post('/data/render/' + str(new_chart.id) + '/edit/',{'title': 'hello'})
+        self.assertTrue(response.url == "/data/gallery/")
+
+    def test_data_edit_data_goes_to_data_library(self):
+        """Test that edit data submission redirects to data library."""
+        user = self.users[0]
+        self.client.force_login(user)
+        data2 = Data.objects.first()
+        response = self.client.post('/data/' + str(data2.id) + '/edit', {'title': 'hello'})
+        self.assertTrue(response.status_code == 301)    
+
+    # def test_render_detail_return_200(self):
+    #     """Test that data detail page is accessible."""
+    #     render = Render.objects.first()
+    #     response = self.client.get(reverse_lazy('render_detail',
+    #                                             kwargs={'pk': render.id}))
+    #     self.assertTrue(response.status_code == 200)
 
 class RenderTests(TestCase):
     """Test the render functions that we use to generate html."""
diff --git a/pychart/pychart_datarender/views.py b/pychart/pychart_datarender/views.py
index 2d37172..cf2646d 100644
--- a/pychart/pychart_datarender/views.py
+++ b/pychart/pychart_datarender/views.py
@@ -257,6 +257,7 @@ def build_html():
 def render_to_db(render_data):
     """Save the rendered chart to the database."""
     new_chart = Render()
+    # import pdb; pdb.set_trace()
     new_chart.render = render_data["html"]
     new_chart.owner = render_data["user"].profile
     new_chart.title = render_data["title"]

From aa8c4c25c29871b84e91d33168c1917eb140feaf Mon Sep 17 00:00:00 2001
From: Ted Callahan <CCallahanIV@gmail.com>
Date: Fri, 17 Feb 2017 09:36:19 -0800
Subject: [PATCH 2/2] Update views.py

---
 pychart/pychart_datarender/views.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/pychart/pychart_datarender/views.py b/pychart/pychart_datarender/views.py
index cf2646d..2d37172 100644
--- a/pychart/pychart_datarender/views.py
+++ b/pychart/pychart_datarender/views.py
@@ -257,7 +257,6 @@ def build_html():
 def render_to_db(render_data):
     """Save the rendered chart to the database."""
     new_chart = Render()
-    # import pdb; pdb.set_trace()
     new_chart.render = render_data["html"]
     new_chart.owner = render_data["user"].profile
     new_chart.title = render_data["title"]