diff --git a/rowers/tests/test_interactivecharts.py b/rowers/tests/test_interactivecharts.py index 011c5f70..2b720400 100644 --- a/rowers/tests/test_interactivecharts.py +++ b/rowers/tests/test_interactivecharts.py @@ -88,12 +88,16 @@ class InteractiveChartTest(TestCase): @patch('rowers.dataprep.create_engine') @patch('rowers.dataprep.read_df_sql') - def test_interactive_chart1(self, mocked_sqlalchemy,mocked_read_df_sql): + @patch('rowers.dataprep.getsmallrowdata_db',side_effect=mocked_getsmallrowdata_db) + def test_interactive_chart1(self, mocked_sqlalchemy,mocked_read_df_sql, + mocked_getsmallrowdata_db): res = iplots.interactive_chart(self.wote.id) @patch('rowers.dataprep.create_engine') @patch('rowers.dataprep.read_df_sql') - def test_interactive_chart2(self, mocked_sqlalchemy,mocked_read_df_sql): + @patch('rowers.dataprep.getsmallrowdata_db',side_effect=mocked_getsmallrowdata_db) + def test_interactive_chart2(self, mocked_sqlalchemy,mocked_read_df_sql, + mocked_getsmallrowdata_db): res = iplots.interactive_chart(self.wote.id,promember=1) @patch('rowers.dataprep.create_engine') diff --git a/rowers/tests/test_teams.py b/rowers/tests/test_teams.py index a0fcf2bc..62deb412 100644 --- a/rowers/tests/test_teams.py +++ b/rowers/tests/test_teams.py @@ -23,6 +23,9 @@ workoutstarttime = row.rowdatetime.strftime('%H:%M:%S') from rowers.teams import * +# add following tests: +# - when member leaves team, his name should be removed from planned sessions + class UserFactory(factory.DjangoModelFactory): class Meta: model = User diff --git a/rowers/tests/test_uploads.py b/rowers/tests/test_uploads.py index ab46b4b5..69577eea 100644 --- a/rowers/tests/test_uploads.py +++ b/rowers/tests/test_uploads.py @@ -71,7 +71,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) diff --git a/rowers/tests/testdata/testdata.csv.gz b/rowers/tests/testdata/testdata.csv.gz index 2d1f2af3..b44857fa 100644 Binary files a/rowers/tests/testdata/testdata.csv.gz and b/rowers/tests/testdata/testdata.csv.gz differ diff --git a/rowers/tests/testdata/testdata.tcx b/rowers/tests/testdata/testdata.tcx index 9e7d9929..b7743be5 100644 --- a/rowers/tests/testdata/testdata.tcx +++ b/rowers/tests/testdata/testdata.tcx @@ -2502,7 +2502,7 @@ - <Element 'Notes' at 0x14e07da0> + <Element 'Notes' at 0x13f289b0>