Merge branch 'develop' into feature/opaqueid

rowers/tests/test_uploads.py

@@ -1,55 +1,8 @@
 #from __future__ import print_function
-import pytest
-
-pytestmark = pytest.mark.django_db
-
-from bs4 import BeautifulSoup
-import re
-from nose_parameterized import parameterized
-from django.test import TestCase, Client,override_settings
-from django.core.management import call_command
-from django.utils.six import StringIO
-from django.test.client import RequestFactory
-from rowers.views import checkworkoutuser,c2_open
-from rowers.models import Workout, User, Rower, WorkoutForm,RowerForm,GraphImage
-from rowers.forms import DocumentsForm,CNsummaryForm,RegistrationFormUniqueEmail
-import rowers.plots as plots
-import rowers.interactiveplots as iplots
-import datetime
-from rowingdata import rowingdata as rdata
-from rowingdata import rower as rrower
-from django.utils import timezone
-from rowers.rows import handle_uploaded_file
-from django.core.files.uploadedfile import SimpleUploadedFile
-from time import strftime,strptime,mktime,time,daylight
-import os
-from rowers.tasks import handle_makeplot
-from rowers.utils import serialize_list,deserialize_list
-from rowers.utils import NoTokenError
-from shutil import copyfile
-from nose.tools import assert_true
-from mock import Mock, patch
-from minimocktest import MockTestCase
-import pandas as pd
-import rowers.c2stuff as c2stuff
-
-import json
-import numpy as np
-
-from rowers import urls
-from rowers.views import error500_view,error404_view,error400_view,error403_view
-
-from rowers.dataprep import delete_strokedata
-
-from rowers.opaque import encoder
-
-encoded1 = str(encoder.encode_hex(1))
-
-from redis import StrictRedis
-redis_connection = StrictRedis()
-
-from rowers.tests.mocks import *
+from statements import *
+nu = datetime.datetime.now()
 
+from rowers.views import add_defaultfavorites
 
 #@pytest.mark.django_db        
 class ViewTest(TestCase):
@@ -63,6 +16,9 @@ class ViewTest(TestCase):
                                       gdproptindate=timezone.now(),
                                       rowerplan='coach',
         )
+
+        add_defaultfavorites(self.r)
+        
 	self.nu = datetime.datetime.now()
 
     def test_upload_view_notloggedin(self):
@@ -75,7 +31,8 @@ class ViewTest(TestCase):
 	self.assertEqual(response.status_code, 200)
 	
     @patch('rowers.dataprep.create_engine')
-    def test_upload_view_sled(self, mocked_sqlalchemy):
+    @patch('rowers.dataprep.getsmallrowdata_db',side_effect=mocked_getsmallrowdata_db)
+    def test_upload_view_sled(self, mocked_sqlalchemy,mocked_getsmallrowdata_db):
 	login = self.c.login(username='john',password='koeinsloot')
         self.assertTrue(login)
 	
@@ -113,7 +70,14 @@ class ViewTest(TestCase):
         response = self.c.get('/rowers/workout/'+encoded1+'/histo/', form_data, follow=True)
 	self.assertEqual(response.status_code, 200)
 
+
         response = self.c.get('/rowers/workout/'+encoded1+'/workflow/',
+	self.assertEqual(response.status_code, 200)
+
+        response = self.c.get('/rowers/workout/'+encoded1+'/workflow/',
+                              follow=True)
+
+        response = self.c.get('/rowers/workout/'+encoded1+'/get-thumbnails/',
                               follow=True)
 
 	self.assertEqual(response.status_code, 200)