Skip to content

Commit 9c232e5

Browse files
fix unit tests
1 parent db70e99 commit 9c232e5

File tree

3 files changed

+9
-20
lines changed

3 files changed

+9
-20
lines changed

addons/base/views.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -611,7 +611,6 @@ def create_waterbutler_log(payload, **kwargs):
611611
target_node = AbstractNode.load(metadata.get('nid'))
612612
if target_node and payload['action'] != 'download_file':
613613
update_storage_usage_with_size(payload)
614-
615614
with transaction.atomic():
616615
file_signals.file_updated.send(target=node, user=user, event_type=action, payload=payload)
617616
return {'status': 'success'}

tests/test_addons.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1569,7 +1569,7 @@ def test_delete_action_creates_trashed_file_node(self):
15691569
'materialized': '/test/Test'
15701570
}
15711571
}
1572-
views.addon_delete_file_node(self=None, target=self.project, user=self.user, payload=payload)
1572+
views.addon_delete_file_node(self=None, target=self.project, user=self.user, event_type='file_removed', payload=payload)
15731573
assert not GithubFileNode.load(file_node._id)
15741574
assert TrashedFileNode.load(file_node._id)
15751575

@@ -1590,7 +1590,7 @@ def test_delete_action_for_folder_deletes_subfolders_and_creates_trashed_file_no
15901590
'materialized': '/test/'
15911591
}
15921592
}
1593-
views.addon_delete_file_node(self=None, target=self.project, user=self.user, payload=payload)
1593+
views.addon_delete_file_node(self=None, target=self.project, user=self.user, event_type='file_removed', payload=payload)
15941594
assert not GithubFileNode.load(subfolder._id)
15951595
assert TrashedFileNode.load(file_node._id)
15961596

tests/test_preprints.py

Lines changed: 7 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -2174,8 +2174,7 @@ def test_add_log(self):
21742174
url = self.preprint.api_url_for('create_waterbutler_log')
21752175
payload = self.build_payload(metadata={'nid': self.preprint._id, 'materialized': path, 'kind': 'file', 'path': path})
21762176
nlogs = self.preprint.logs.count()
2177-
with capture_notifications():
2178-
self.app.put(url, json=payload)
2177+
self.app.put(url, json=payload)
21792178
self.preprint.reload()
21802179
assert self.preprint.logs.count() == nlogs + 1
21812180

@@ -2244,14 +2243,11 @@ def test_action_file_rename(self):
22442243
'kind': 'file',
22452244
},
22462245
)
2247-
with capture_notifications() as notifications:
2248-
self.app.put(
2249-
url,
2250-
json=payload,
2251-
)
2246+
self.app.put(
2247+
url,
2248+
json=payload,
2249+
)
22522250
self.preprint.reload()
2253-
assert len(notifications['emits']) == 1
2254-
assert notifications['emits'][0]['type'] == NotificationType.Type.ADDON_FILE_RENAMED
22552251
assert self.preprint.logs.latest().action == 'osf_storage_addon_file_renamed'
22562252

22572253
def test_action_downloads_contrib(self):
@@ -2279,11 +2275,8 @@ def test_add_file_osfstorage_log(self):
22792275
url = self.preprint.api_url_for('create_waterbutler_log')
22802276
payload = self.build_payload(metadata={'nid': self.preprint._id, 'materialized': path, 'kind': 'file', 'path': path})
22812277
nlogs = self.preprint.logs.count()
2282-
with capture_notifications() as notifications:
2283-
self.app.put(url, json=payload)
2278+
self.app.put(url, json=payload)
22842279
self.preprint.reload()
2285-
assert len(notifications['emits']) == 1
2286-
assert notifications['emits'][0]['type'] == NotificationType.Type.FILE_ADDED
22872280
assert self.preprint.logs.count() == nlogs + 1
22882281
assert ('urls' in self.preprint.logs.filter(action='osf_storage_file_added')[0].params)
22892282

@@ -2292,11 +2285,8 @@ def test_add_folder_osfstorage_log(self):
22922285
url = self.preprint.api_url_for('create_waterbutler_log')
22932286
payload = self.build_payload(metadata={'nid': self.preprint._id, 'materialized': path, 'kind': 'folder', 'path': path})
22942287
nlogs = self.preprint.logs.count()
2295-
with capture_notifications() as notifications:
2296-
self.app.put(url, json=payload)
2288+
self.app.put(url, json=payload)
22972289
self.preprint.reload()
2298-
assert len(notifications['emits']) == 1
2299-
assert notifications['emits'][0]['type'] == NotificationType.Type.FILE_ADDED
23002290
assert self.preprint.logs.count() == nlogs + 1
23012291
assert ('urls' not in self.preprint.logs.filter(action='osf_storage_file_added')[0].params)
23022292

0 commit comments

Comments
 (0)