matching github

markhuot · Nov 22, 2023 · 56ed270 · 56ed270
1 parent 5b2d470
commit 56ed270
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 8 deletions.
diff --git a/src/behaviors/SnapshotableBehavior.php b/src/behaviors/SnapshotableBehavior.php
@@ -19,7 +19,7 @@ public function toSnapshot()
             ->except([
                 'id', 'postDate', 'sectionId', 'uid', 'siteSettingsId',
                 'fieldLayoutId', 'contentId', 'dateCreated', 'dateUpdated',
-                'canonicalId', 'typeId',
+                'canonicalId', 'typeId', 'siteId',
             ])
 
             // filter out any non-eager loaded queries because we can't snapshot on them, their

diff --git a/tests/.pest/snapshots/SnapshotTest/it_matches_collected_snapshots.snap b/tests/.pest/snapshots/SnapshotTest/it_matches_collected_snapshots.snap
@@ -1 +1 @@
-[{"expiryDate":null,"deletedWithEntryType":false,"_authorId":null,"tempId":null,"draftId":null,"revisionId":null,"isProvisionalDraft":false,"enabled":true,"archived":false,"siteId":2,"title":"Entry 0","slug":"entry-0","uri":"posts\/entry-0","dateLastMerged":null,"dateDeleted":null,"trashed":false,"isNewForSite":false,"isDraft":false,"isRevision":false,"isUnpublishedDraft":false,"ref":"posts\/entry-0","status":"live","structureId":null,"url":"http:\/\/localhost:8080\/index.php?p=posts\/entry-0","authorId":null},{"expiryDate":null,"deletedWithEntryType":false,"_authorId":null,"tempId":null,"draftId":null,"revisionId":null,"isProvisionalDraft":false,"enabled":true,"archived":false,"siteId":2,"title":"Entry 1","slug":"entry-1","uri":"posts\/entry-1","dateLastMerged":null,"dateDeleted":null,"trashed":false,"isNewForSite":false,"isDraft":false,"isRevision":false,"isUnpublishedDraft":false,"ref":"posts\/entry-1","status":"live","structureId":null,"url":"http:\/\/localhost:8080\/index.php?p=posts\/entry-1","authorId":null},{"expiryDate":null,"deletedWithEntryType":false,"_authorId":null,"tempId":null,"draftId":null,"revisionId":null,"isProvisionalDraft":false,"enabled":true,"archived":false,"siteId":2,"title":"Entry 2","slug":"entry-2","uri":"posts\/entry-2","dateLastMerged":null,"dateDeleted":null,"trashed":false,"isNewForSite":false,"isDraft":false,"isRevision":false,"isUnpublishedDraft":false,"ref":"posts\/entry-2","status":"live","structureId":null,"url":"http:\/\/localhost:8080\/index.php?p=posts\/entry-2","authorId":null}]
+[{"expiryDate":null,"deletedWithEntryType":false,"_authorId":null,"tempId":null,"draftId":null,"revisionId":null,"isProvisionalDraft":false,"enabled":true,"archived":false,"title":"Entry 0","slug":"entry-0","uri":"posts\/entry-0","dateLastMerged":null,"dateDeleted":null,"trashed":false,"isNewForSite":false,"isDraft":false,"isRevision":false,"isUnpublishedDraft":false,"ref":"posts\/entry-0","status":"live","structureId":null,"url":"http:\/\/localhost:8080\/posts\/entry-0","authorId":null},{"expiryDate":null,"deletedWithEntryType":false,"_authorId":null,"tempId":null,"draftId":null,"revisionId":null,"isProvisionalDraft":false,"enabled":true,"archived":false,"title":"Entry 1","slug":"entry-1","uri":"posts\/entry-1","dateLastMerged":null,"dateDeleted":null,"trashed":false,"isNewForSite":false,"isDraft":false,"isRevision":false,"isUnpublishedDraft":false,"ref":"posts\/entry-1","status":"live","structureId":null,"url":"http:\/\/localhost:8080\/posts\/entry-1","authorId":null},{"expiryDate":null,"deletedWithEntryType":false,"_authorId":null,"tempId":null,"draftId":null,"revisionId":null,"isProvisionalDraft":false,"enabled":true,"archived":false,"title":"Entry 2","slug":"entry-2","uri":"posts\/entry-2","dateLastMerged":null,"dateDeleted":null,"trashed":false,"isNewForSite":false,"isDraft":false,"isRevision":false,"isUnpublishedDraft":false,"ref":"posts\/entry-2","status":"live","structureId":null,"url":"http:\/\/localhost:8080\/posts\/entry-2","authorId":null}]
diff --git a/tests/.pest/snapshots/SnapshotTest/it_matches_entry_snapshots.snap b/tests/.pest/snapshots/SnapshotTest/it_matches_entry_snapshots.snap
@@ -8,7 +8,6 @@
     "isProvisionalDraft": false,
     "enabled": true,
     "archived": false,
-    "siteId": 2,
     "title": "foo bar",
     "slug": "foo-bar",
     "uri": "posts\/foo-bar",
@@ -22,6 +21,6 @@
     "ref": "posts\/foo-bar",
     "status": "live",
     "structureId": null,
-    "url": "http:\/\/localhost:8080\/index.php?p=posts\/foo-bar",
+    "url": "http:\/\/localhost:8080\/posts\/foo-bar",
     "authorId": null
 }
diff --git a/tests/.pest/snapshots/SnapshotTest/it_matches_nested_entry_snapshots.snap b/tests/.pest/snapshots/SnapshotTest/it_matches_nested_entry_snapshots.snap
@@ -8,7 +8,6 @@
     "isProvisionalDraft": false,
     "enabled": true,
     "archived": false,
-    "siteId": 2,
     "title": "foo bar",
     "slug": "foo-bar",
     "uri": "posts\/foo-bar",
@@ -22,7 +21,7 @@
     "ref": "posts\/foo-bar",
     "status": "live",
     "structureId": null,
-    "url": "http:\/\/localhost:8080\/index.php?p=posts\/foo-bar",
+    "url": "http:\/\/localhost:8080\/posts\/foo-bar",
     "authorId": null,
     "entriesField": [
         {
@@ -35,7 +34,6 @@
             "isProvisionalDraft": false,
             "enabled": true,
             "archived": false,
-            "siteId": 2,
             "title": "child",
             "slug": "child",
             "uri": "posts\/child",
@@ -49,7 +47,7 @@
             "ref": "posts\/child",
             "status": "live",
             "structureId": null,
-            "url": "http:\/\/localhost:8080\/index.php?p=posts\/child",
+            "url": "http:\/\/localhost:8080\/posts\/child",
             "authorId": null
         }
     ]
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		[{"expiryDate":null,"deletedWithEntryType":false,"_authorId":null,"tempId":null,"draftId":null,"revisionId":null,"isProvisionalDraft":false,"enabled":true,"archived":false,"siteId":2,"title":"Entry 0","slug":"entry-0","uri":"posts\/entry-0","dateLastMerged":null,"dateDeleted":null,"trashed":false,"isNewForSite":false,"isDraft":false,"isRevision":false,"isUnpublishedDraft":false,"ref":"posts\/entry-0","status":"live","structureId":null,"url":"http:\/\/localhost:8080\/index.php?p=posts\/entry-0","authorId":null},{"expiryDate":null,"deletedWithEntryType":false,"_authorId":null,"tempId":null,"draftId":null,"revisionId":null,"isProvisionalDraft":false,"enabled":true,"archived":false,"siteId":2,"title":"Entry 1","slug":"entry-1","uri":"posts\/entry-1","dateLastMerged":null,"dateDeleted":null,"trashed":false,"isNewForSite":false,"isDraft":false,"isRevision":false,"isUnpublishedDraft":false,"ref":"posts\/entry-1","status":"live","structureId":null,"url":"http:\/\/localhost:8080\/index.php?p=posts\/entry-1","authorId":null},{"expiryDate":null,"deletedWithEntryType":false,"_authorId":null,"tempId":null,"draftId":null,"revisionId":null,"isProvisionalDraft":false,"enabled":true,"archived":false,"siteId":2,"title":"Entry 2","slug":"entry-2","uri":"posts\/entry-2","dateLastMerged":null,"dateDeleted":null,"trashed":false,"isNewForSite":false,"isDraft":false,"isRevision":false,"isUnpublishedDraft":false,"ref":"posts\/entry-2","status":"live","structureId":null,"url":"http:\/\/localhost:8080\/index.php?p=posts\/entry-2","authorId":null}]
		[{"expiryDate":null,"deletedWithEntryType":false,"_authorId":null,"tempId":null,"draftId":null,"revisionId":null,"isProvisionalDraft":false,"enabled":true,"archived":false,"title":"Entry 0","slug":"entry-0","uri":"posts\/entry-0","dateLastMerged":null,"dateDeleted":null,"trashed":false,"isNewForSite":false,"isDraft":false,"isRevision":false,"isUnpublishedDraft":false,"ref":"posts\/entry-0","status":"live","structureId":null,"url":"http:\/\/localhost:8080\/posts\/entry-0","authorId":null},{"expiryDate":null,"deletedWithEntryType":false,"_authorId":null,"tempId":null,"draftId":null,"revisionId":null,"isProvisionalDraft":false,"enabled":true,"archived":false,"title":"Entry 1","slug":"entry-1","uri":"posts\/entry-1","dateLastMerged":null,"dateDeleted":null,"trashed":false,"isNewForSite":false,"isDraft":false,"isRevision":false,"isUnpublishedDraft":false,"ref":"posts\/entry-1","status":"live","structureId":null,"url":"http:\/\/localhost:8080\/posts\/entry-1","authorId":null},{"expiryDate":null,"deletedWithEntryType":false,"_authorId":null,"tempId":null,"draftId":null,"revisionId":null,"isProvisionalDraft":false,"enabled":true,"archived":false,"title":"Entry 2","slug":"entry-2","uri":"posts\/entry-2","dateLastMerged":null,"dateDeleted":null,"trashed":false,"isNewForSite":false,"isDraft":false,"isRevision":false,"isUnpublishedDraft":false,"ref":"posts\/entry-2","status":"live","structureId":null,"url":"http:\/\/localhost:8080\/posts\/entry-2","authorId":null}]