From 22f68f4d11fbb245fa3d8a711f39160cc1e16ff0 Mon Sep 17 00:00:00 2001 From: ilearnit Date: Thu, 11 Apr 2019 05:54:16 +0000 Subject: [PATCH] [test] fix --- .../file/test_view_file_via_shared_dir.py | 6 ++---- .../seahub/views/repo/test_view_shared_dir.py | 21 +++++++------------ 2 files changed, 9 insertions(+), 18 deletions(-) diff --git a/tests/seahub/views/file/test_view_file_via_shared_dir.py b/tests/seahub/views/file/test_view_file_via_shared_dir.py index b1c1919097..ec73f0a257 100644 --- a/tests/seahub/views/file/test_view_file_via_shared_dir.py +++ b/tests/seahub/views/file/test_view_file_via_shared_dir.py @@ -29,11 +29,9 @@ class ViewFileViaSharedDirTest(TestCase, Fixtures): '?p=%s' % self.file ) self.assertEqual(200, resp.status_code) - self.assertTemplateUsed(resp, 'shared_file_view.html') + self.assertTemplateUsed(resp, 'shared_file_view_react.html') self.assertContains(resp, os.path.basename(self.file)) - dl_url_tag = 'href="?p=%s&dl=1"' % self.file - self.assertContains(resp, dl_url_tag) def test_can_view_image_in_sub_dir(self): """View 3.jpg when share 'folder' will raise error. @@ -74,7 +72,7 @@ class ViewFileViaSharedDirTest(TestCase, Fixtures): '?p=/3.jpg' ) self.assertEqual(200, resp.status_code) - self.assertTemplateUsed(resp, 'shared_file_view.html') + self.assertTemplateUsed(resp, 'shared_file_view_react.html') self.assertContains(resp, '3.jpg') def test_can_download(self): diff --git a/tests/seahub/views/repo/test_view_shared_dir.py b/tests/seahub/views/repo/test_view_shared_dir.py index bcfa2c2bb7..1e5e0804f1 100644 --- a/tests/seahub/views/repo/test_view_shared_dir.py +++ b/tests/seahub/views/repo/test_view_shared_dir.py @@ -24,9 +24,7 @@ class SharedDirTest(TestCase, Fixtures): reverse('view_shared_dir', args=[self.fs.token]) ) self.assertEqual(200, resp.status_code) - self.assertTemplateUsed(resp, 'view_shared_dir.html') - - self.assertContains(resp, '

%s

' % self.repo.name) + self.assertTemplateUsed(resp, 'view_shared_dir_react.html') def test_cannot_render_enc_repo(self): share_file_info = { @@ -84,8 +82,7 @@ class EncryptSharedDirTest(TestCase, Fixtures): ) self.assertEqual(200, resp.status_code) - self.assertTemplateUsed(resp, 'view_shared_dir.html') - self.assertContains(resp, '

%s

' % self.repo.name) + self.assertTemplateUsed(resp, 'view_shared_dir_react.html') def test_wrong_password(self): resp = self.client.post( @@ -106,15 +103,14 @@ class EncryptSharedDirTest(TestCase, Fixtures): ) self.assertEqual(200, resp.status_code) - self.assertTemplateUsed(resp, 'view_shared_dir.html') - self.assertContains(resp, '

%s

' % self.repo.name) + self.assertTemplateUsed(resp, 'view_shared_dir_react.html') resp = self.client.get( reverse('view_shared_dir', args=[self.fs.token]) + '?p=' + self.sub_dir ) self.assertEqual(200, resp.status_code) self.assertTemplateNotUsed(resp, 'share_access_validation.html') - self.assertTemplateUsed(resp, 'view_shared_dir.html') + self.assertTemplateUsed(resp, 'view_shared_dir_react.html') def test_view_file_via_shared_dir(self): resp = self.client.post( @@ -125,16 +121,14 @@ class EncryptSharedDirTest(TestCase, Fixtures): self.assertEqual(200, resp.status_code) self.assertTemplateNotUsed(resp, 'share_access_validation.html') - self.assertTemplateUsed(resp, 'shared_file_view.html') - self.assertContains(resp, '%s' % self.filename) + self.assertTemplateUsed(resp, 'shared_file_view_react.html') resp = self.client.get( reverse('view_file_via_shared_dir', args=[self.fs.token]) + '?p=' + self.sub_file ) self.assertEqual(200, resp.status_code) self.assertTemplateNotUsed(resp, 'share_access_validation.html') - self.assertTemplateUsed(resp, 'shared_file_view.html') - self.assertContains(resp, '%s' % self.filename) + self.assertTemplateUsed(resp, 'shared_file_view_react.html') def test_view_raw_file_via_shared_dir(self): resp = self.client.post( @@ -145,8 +139,7 @@ class EncryptSharedDirTest(TestCase, Fixtures): self.assertEqual(200, resp.status_code) self.assertTemplateNotUsed(resp, 'share_access_validation.html') - self.assertTemplateUsed(resp, 'shared_file_view.html') - self.assertContains(resp, '%s' % self.filename) + self.assertTemplateUsed(resp, 'shared_file_view_react.html') resp = self.client.get( reverse('view_file_via_shared_dir', args=[self.fs.token]) + '?p=' + self.sub_file + '&raw=1'