Skip to content

Commit

Permalink
changes
Browse files Browse the repository at this point in the history
  • Loading branch information
@gromdimon
gromdimon committed Apr 17, 2023
1 parent 4c0c075 commit 4d092b4
Showing 1 changed file with 28 additions and 48 deletions.
76 changes: 28 additions & 48 deletions projectroles/tests/test_views.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4985,7 +4985,6 @@ def test_render_as_target_existing(self):

def test_create_target(self):
"""Test creating a target site"""
timeline = get_backend_api('timeline_backend')
tl_event = ProjectEvent.objects.filter(
event_name='target_site_create'
).first()
Expand Down Expand Up @@ -5018,19 +5017,16 @@ def test_create_target(self):
model_dict = model_to_dict(site)
self.assertEqual(model_dict, expected)

tl_event = (
timeline.get_project_events(project=None, classified=True)
.order_by('-pk')
.first()
)
tl_event = ProjectEvent.objects.filter(
event_name='target_site_create'
).first()
self.assertEqual(tl_event.event_name, 'target_site_create')
with self.login(self.user):
self.assertRedirects(response, reverse('projectroles:remote_sites'))

@override_settings(PROJECTROLES_SITE_MODE=SITE_MODE_TARGET)
def test_create_source(self):
"""Test creating a source site as target"""
timeline = get_backend_api('timeline_backend')
tl_event = ProjectEvent.objects.filter(
event_name='source_site_set'
).first()
Expand Down Expand Up @@ -5063,11 +5059,9 @@ def test_create_source(self):
model_dict = model_to_dict(site)
self.assertEqual(model_dict, expected)

tl_event = (
timeline.get_project_events(project=None, classified=True)
.order_by('-pk')
.first()
)
tl_event = ProjectEvent.objects.filter(
event_name='source_site_set'
).first()
self.assertEqual(tl_event.event_name, 'source_site_set')
with self.login(self.user):
self.assertRedirects(response, reverse('projectroles:remote_sites'))
Expand Down Expand Up @@ -5144,7 +5138,6 @@ def test_render_not_found(self):

def test_update(self):
"""Test updating target site as source"""
timeline = get_backend_api('timeline_backend')
tl_event = ProjectEvent.objects.filter(
event_name='target_site_update'
).first()
Expand Down Expand Up @@ -5181,11 +5174,9 @@ def test_update(self):
model_dict = model_to_dict(site)
self.assertEqual(model_dict, expected)

tl_event = (
timeline.get_project_events(project=None, classified=True)
.order_by('-pk')
.first()
)
tl_event = ProjectEvent.objects.filter(
event_name='target_site_update'
).first()
self.assertEqual(tl_event.event_name, 'target_site_update')
with self.login(self.user):
self.assertRedirects(response, reverse('projectroles:remote_sites'))
Expand Down Expand Up @@ -5258,7 +5249,6 @@ def test_render_not_found(self):

def test_delete(self):
"""Test deleting the remote site"""
timeline = get_backend_api('timeline_backend')
tl_event = ProjectEvent.objects.filter(
event_name='target_site_delete'
).first()
Expand All @@ -5273,11 +5263,9 @@ def test_delete(self):
)
self.assertRedirects(response, reverse('projectroles:remote_sites'))

tl_event = (
timeline.get_project_events(project=None, classified=True)
.order_by('-pk')
.first()
)
tl_event = ProjectEvent.objects.filter(
event_name='target_site_delete'
).first()
self.assertEqual(tl_event.event_name, 'target_site_delete')
self.assertEqual(RemoteSite.objects.all().count(), 0)

Expand Down Expand Up @@ -5314,7 +5302,6 @@ def setUp(self):

def test_render_confirm(self):
"""Test rendering remote project update view in confirm mode"""
timeline = get_backend_api('timeline_backend')
access_field = 'remote_access_{}'.format(self.project.sodar_uuid)
values = {access_field: SODAR_CONSTANTS['REMOTE_LEVEL_READ_INFO']}
with self.login(self.user):
Expand All @@ -5326,19 +5313,16 @@ def test_render_confirm(self):
values,
)

tl_event = (
timeline.get_project_events(project=None, classified=True)
.order_by('-pk')
.first()
)
tl_event = ProjectEvent.objects.filter(
event_name='remote_access_update'
).first()
self.assertIsNone(tl_event)
self.assertEqual(response.status_code, 200)
self.assertEqual(response.context['site'], self.target_site)
self.assertIsNotNone(response.context['modifying_access'])

def test_render_confirm_no_change(self):
"""Test rendering without changes (should redirect)"""
timeline = get_backend_api('timeline_backend')
access_field = 'remote_access_{}'.format(self.project.sodar_uuid)
values = {access_field: SODAR_CONSTANTS['REMOTE_LEVEL_NONE']}
with self.login(self.user):
Expand All @@ -5357,16 +5341,13 @@ def test_render_confirm_no_change(self):
),
)

tl_event = (
timeline.get_project_events(project=None, classified=True)
.order_by('-pk')
.first()
)
tl_event = ProjectEvent.objects.filter(
event_name='remote_access_update'
).first()
self.assertIsNone(tl_event)

def test_post_create(self):
"""Test updating remote project access by adding a new RemoteProject"""
timeline = get_backend_api('timeline_backend')
tl_event = ProjectEvent.objects.filter(
event_name='batch_update_remote'
).first()
Expand Down Expand Up @@ -5398,16 +5379,17 @@ def test_post_create(self):
self.assertEqual(rp.project_uuid, self.project.sodar_uuid)
self.assertEqual(rp.level, SODAR_CONSTANTS['REMOTE_LEVEL_READ_INFO'])

tl_event = (
timeline.get_project_events(project=None, classified=True)
.order_by('-pk')
.first()
)
tl_event = ProjectEvent.objects.filter(
event_name='batch_update_remote'
).first()
self.assertEqual(tl_event.event_name, 'batch_update_remote')

def test_post_update(self):
"""Test updating by modifying an existing RemoteProject"""
timeline = get_backend_api('timeline_backend')
tl_event = ProjectEvent.objects.filter(
event_name='batch_update_remote'
).first()
self.assertIsNone(tl_event)
rp = self.make_remote_project(
project_uuid=self.project.sodar_uuid,
site=self.target_site,
Expand Down Expand Up @@ -5441,11 +5423,9 @@ def test_post_update(self):
self.assertEqual(rp.project_uuid, self.project.sodar_uuid)
self.assertEqual(rp.level, SODAR_CONSTANTS['REMOTE_LEVEL_READ_INFO'])

tl_event = (
timeline.get_project_events(project=None, classified=True)
.order_by('-pk')
.first()
)
tl_event = ProjectEvent.objects.filter(
event_name='batch_update_remote'
).first()
self.assertEqual(tl_event.event_name, 'batch_update_remote')


Expand Down

0 comments on commit 4d092b4

Please sign in to comment.