Skip to content

Commit 3eb379e

Browse files
committed
Fix tests
1 parent 4602ac5 commit 3eb379e

4 files changed

Lines changed: 10 additions & 9 deletions

File tree

api_tests/providers/collections/views/test_collection_provider_detail.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ def provider(self):
6767

6868
@pytest.fixture()
6969
def provider_url(self, provider):
70-
return f'/{API_BASE}providers/collections/{provider._id}/'
70+
return f'/{API_BASE}providers/collections/{provider._id}/?version=2.20'
7171

7272
@pytest.fixture()
7373
def cedar_template(self):
@@ -85,8 +85,8 @@ def test_required_metadata_template_is_null_by_default(self, app, provider, prov
8585
assert res.json['data']['relationships']['required_metadata_template']['data'] is None
8686

8787
def test_required_metadata_template_when_set(self, app, provider, provider_url, cedar_template):
88-
provider.required_metadata_template = cedar_template
89-
provider.save()
88+
from osf.models import CollectionProvider
89+
CollectionProvider.objects.filter(pk=provider.pk).update(required_metadata_template=cedar_template)
9090

9191
res = app.get(provider_url)
9292
assert res.status_code == 200

api_tests/providers/preprints/views/test_preprint_provider_detail.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -228,7 +228,7 @@ def provider(self):
228228

229229
@pytest.fixture()
230230
def provider_url(self, provider):
231-
return f'/{API_BASE}providers/preprints/{provider._id}/'
231+
return f'/{API_BASE}providers/preprints/{provider._id}/?version=2.20'
232232

233233
@pytest.fixture()
234234
def cedar_template(self):
@@ -246,8 +246,8 @@ def test_required_metadata_template_is_null_by_default(self, app, provider, prov
246246
assert res.json['data']['relationships']['required_metadata_template']['data'] is None
247247

248248
def test_required_metadata_template_when_set(self, app, provider, provider_url, cedar_template):
249-
provider.required_metadata_template = cedar_template
250-
provider.save()
249+
from osf.models import PreprintProvider
250+
PreprintProvider.objects.filter(pk=provider.pk).update(required_metadata_template=cedar_template)
251251

252252
res = app.get(provider_url)
253253
assert res.status_code == 200

api_tests/providers/registrations/views/test_registration_provider_detail.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ def provider(self):
7070

7171
@pytest.fixture()
7272
def provider_url(self, provider):
73-
return f'/{API_BASE}providers/registrations/{provider._id}/'
73+
return f'/{API_BASE}providers/registrations/{provider._id}/?version=2.20'
7474

7575
@pytest.fixture()
7676
def cedar_template(self):
@@ -88,8 +88,8 @@ def test_required_metadata_template_is_null_by_default(self, app, provider, prov
8888
assert res.json['data']['relationships']['required_metadata_template']['data'] is None
8989

9090
def test_required_metadata_template_when_set(self, app, provider, provider_url, cedar_template):
91-
provider.required_metadata_template = cedar_template
92-
provider.save()
91+
from osf.models import RegistrationProvider
92+
RegistrationProvider.objects.filter(pk=provider.pk).update(required_metadata_template=cedar_template)
9393

9494
res = app.get(provider_url)
9595
assert res.status_code == 200

osf_tests/metadata/test_serialized_metadata.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -210,6 +210,7 @@ def setUp(self):
210210
mock.patch('osf.models.base.Guid.objects.get_or_create', new=osfguid_sequence.get_or_create),
211211
mock.patch('django.utils.timezone.now', new=forever_now),
212212
mock.patch('osf.models.mixins.timezone.now', new=forever_now),
213+
mock.patch('osf.models.nodelog.timezone.now', new=forever_now),
213214
mock.patch('osf.models.metaschema.RegistrationSchema.absolute_api_v2_url', new='http://fake.example/schema/for/test'),
214215
mock.patch('osf.models.node.Node.get_verified_links', return_value=[
215216
{'target_url': 'https://foo.bar', 'resource_type': 'Other'}

0 commit comments

Comments
 (0)