Skip to content

Commit 005e69b

Browse files
authored
File Tree Diff: enabled by default (#12010)
* Requires readthedocs/ext-theme#564
1 parent cdd9597 commit 005e69b

File tree

4 files changed

+44
-9
lines changed

4 files changed

+44
-9
lines changed
Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
# Generated by Django 4.2.19 on 2025-02-20 11:56
2+
3+
from django.db import migrations, models
4+
from django_safemigrate import Safe
5+
6+
7+
def migrate(apps, schema_editor):
8+
AddonsConfig = apps.get_model("projects", "AddonsConfig")
9+
AddonsConfig.objects.filter(filetreediff_enabled__isnull=True).update(filetreediff_enabled=True)
10+
11+
12+
class Migration(migrations.Migration):
13+
14+
safe = Safe.after_deploy
15+
16+
dependencies = [
17+
('projects', '0146_addons_filetreediff_ignored_files'),
18+
]
19+
20+
operations = [
21+
migrations.RunPython(migrate),
22+
migrations.AlterField(
23+
model_name='addonsconfig',
24+
name='filetreediff_enabled',
25+
field=models.BooleanField(default=True),
26+
),
27+
migrations.AlterField(
28+
model_name='historicaladdonsconfig',
29+
name='filetreediff_enabled',
30+
field=models.BooleanField(default=True),
31+
),
32+
]

readthedocs/projects/models.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -193,7 +193,7 @@ class AddonsConfig(TimeStampedModel):
193193
ethicalads_enabled = models.BooleanField(default=True)
194194

195195
# File Tree Diff
196-
filetreediff_enabled = models.BooleanField(default=False, null=True, blank=True)
196+
filetreediff_enabled = models.BooleanField(default=True)
197197
filetreediff_ignored_files = models.JSONField(
198198
help_text=_("List of ignored files. One per line."),
199199
null=True,

readthedocs/proxito/tests/responses/v1.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -155,7 +155,7 @@
155155
"inject_styles": true
156156
},
157157
"filetreediff": {
158-
"enabled": false
158+
"enabled": true
159159
},
160160
"flyout": {
161161
"enabled": true,

readthedocs/rtd_tests/tests/test_imported_file.py

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,11 @@ class ImportedFileTests(TestCase):
2525

2626
def setUp(self):
2727
self.project = get(Project)
28+
29+
# Disable File Tree Diff because these tests are not prepared
30+
self.project.addons.filetreediff_enabled = False
31+
self.project.addons.save()
32+
2833
self.version = self.project.versions.get(slug=LATEST)
2934
self.build = get(
3035
Build,
@@ -351,31 +356,29 @@ def test_update_content(self):
351356
@mock.patch("readthedocs.projects.tasks.search.write_manifest")
352357
def test_create_file_tree_manifest(self, write_manifest):
353358
assert self.version.slug == LATEST
354-
index_build(self.build.pk)
355-
# File Tree Diff is not enabled by default
356-
write_manifest.assert_not_called()
357359

358360
self.project.addons.filetreediff_enabled = True
359361
self.project.addons.save()
362+
360363
index_build(self.build.pk)
361364
manifest = FileTreeDiffManifest(
362365
build_id=self.build.pk,
363366
files=[
364367
FileTreeDiffFile(
365368
path="index.html",
366-
main_content_hash="f3336aabed1ae8057ffb0cca20d23d4c",
369+
main_content_hash=mock.ANY,
367370
),
368371
FileTreeDiffFile(
369372
path="404.html",
370-
main_content_hash="b855c3d54f84e075b70faa9958123377",
373+
main_content_hash=mock.ANY,
371374
),
372375
FileTreeDiffFile(
373376
path="test.html",
374-
main_content_hash="04e5dc4003413e36b8bec86bc5e28b07",
377+
main_content_hash=mock.ANY,
375378
),
376379
FileTreeDiffFile(
377380
path="api/index.html",
378-
main_content_hash="15958dc725d925c8524b1766cde73d66",
381+
main_content_hash=mock.ANY,
379382
),
380383
],
381384
)

0 commit comments

Comments
 (0)