chore: fix content collection tests (#14431)

Author: ascorbic

packages/astro/e2e/fixtures/actions-blog/db/seed.ts

@@ -3,12 +3,12 @@ import { db, Likes, Comment } from "astro:db";
 // https://astro.build/db/seed
 export default async function seed() {
   await db.insert(Likes).values({
-    postId: "first-post.md",
+    postId: "first-post",
     likes: 10,
   });
 
   await db.insert(Comment).values({
-    postId: "first-post.md",
+    postId: "first-post",
     author: "Alice",
     body: "Great post!",
   });

packages/astro/e2e/fixtures/actions-react-19/db/seed.ts

@@ -3,12 +3,12 @@ import { db, Likes, Comment } from "astro:db";
 // https://astro.build/db/seed
 export default async function seed() {
   await db.insert(Likes).values({
-    postId: "first-post.md",
+    postId: "first-post",
     likes: 10,
   });
 
   await db.insert(Comment).values({
-    postId: "first-post.md",
+    postId: "first-post",
     author: "Alice",
     body: "Great post!",
   });

packages/astro/e2e/fixtures/actions-react-19/src/pages/blog/[...slug].astro

@@ -1,5 +1,5 @@
 ---
-import { type CollectionEntry, getCollection, getEntry } from 'astro:content';
+import { type CollectionEntry, getCollection, getEntry, render } from 'astro:content';
 import BlogPost from '../../layouts/BlogPost.astro';
 import { db, eq, Likes } from 'astro:db';
 import { Like, LikeWithActionState } from '../../components/Like';
@@ -17,7 +17,7 @@ export async function getStaticPaths() {
 type Props = CollectionEntry<'blog'>;
 
 const post = await getEntry('blog', Astro.params.slug)!;
-const { Content } = await post.render();
+const { Content } = await render(post)
 
 const likesRes = await db.select().from(Likes).where(eq(Likes.postId, post.id)).get()!;
 ---

packages/astro/test/content-collections-render.test.js

@@ -142,17 +142,23 @@ describe('Content Collections - render()', () => {
 		it('getCollection should return new instances of the array to be mutated safely', async () => {
 			const app = await fixture.loadTestAdapterApp();
 
-			let request = new Request('http://example.com/sort-blog-collection');
+			let request = new Request('http://example.com/');
 			let response = await app.render(request);
 			let html = await response.text();
 			let $ = cheerio.load(html);
-			assert.equal($('li').first().text(), 'Launch week!');
+			const firstText = $('li').first().text();
+
+			request = new Request('http://example.com/sort-blog-collection');
+			response = await app.render(request);
+			html = await response.text();
+			$ = cheerio.load(html);
+			assert.notEqual($('li').first().text(), firstText);
 
 			request = new Request('http://example.com/');
 			response = await app.render(request);
 			html = await response.text();
 			$ = cheerio.load(html);
-			assert.equal($('li').first().text(), 'Hello world');
+			assert.equal($('li').first().text(), firstText);
 		});
 	});
 
@@ -212,24 +218,5 @@ describe('Content Collections - render()', () => {
 			assert.equal(h2.length, 1);
 			assert.equal(h2.attr('data-components-export-applied'), 'true');
 		});
-
-		it.skip('Supports layout prop with recursive getCollection() call - DEPRECATED: layout props removed in Astro 5', async () => {
-			const response = await fixture.fetch('/with-layout-prop', { method: 'GET' });
-			assert.equal(response.status, 200);
-
-			const html = await response.text();
-			const $ = cheerio.load(html);
-
-			const body = $('body');
-			assert.equal(body.attr('data-layout-prop'), 'true');
-
-			const h1 = $('h1');
-			assert.equal(h1.length, 1);
-			assert.equal(h1.text(), 'With Layout Prop');
-
-			const h2 = $('h2');
-			assert.equal(h2.length, 1);
-			assert.equal(h2.text(), 'Content with a layout prop');
-		});
 	});
 });

packages/astro/test/content-collections.test.js

@@ -233,10 +233,7 @@ describe('Content Collections', () => {
 			} catch (e) {
 				error = e.message;
 			}
-			assert.equal(
-				error,
-				'Found legacy content config file in "src/content/config.mjs". Please move this file to "src/content.config.mjs" and ensure each collection has a loader defined.',
-			);
+			assert.ok(error.startsWith('Found legacy content config file in'));
 		});
 	});
 

packages/astro/test/fixtures/content/src/content/blog/one.md renamed to packages/astro/test/fixtures/content/src/content/blog/1-one.md

@@ -1,5 +1,5 @@
 ---
-title: Hello world
+title: 1 Hello world
 description: Just a demo
 ---
 This is a post

packages/astro/test/fixtures/content/src/content/blog/promo/launch-week-component-scripts.mdx renamed to packages/astro/test/fixtures/content/src/content/blog/promo/2-launch-week-component-scripts.mdx

@@ -1,5 +1,5 @@
 ---
-title: 'Launch week!'
+title: '2 Launch week!'
 description: 'Join us for the exciting launch of SPACE BLOG'
 publishedDate: 'Sat May 21 2022 00:00:00 GMT-0400 (Eastern Daylight Time)'
 tags: ['announcement']

packages/astro/test/fixtures/content/src/content/blog/promo/launch-week-components-export.mdx renamed to packages/astro/test/fixtures/content/src/content/blog/promo/3-launch-week-components-export.mdx

@@ -1,5 +1,5 @@
 ---
-title: 'Launch week!'
+title: '3 Launch week!'
 description: 'Join us for the exciting launch of SPACE BLOG'
 publishedDate: 'Sat May 21 2022 00:00:00 GMT-0400 (Eastern Daylight Time)'
 tags: ['announcement']

packages/astro/test/fixtures/content/src/content/blog/promo/launch-week.mdx renamed to packages/astro/test/fixtures/content/src/content/blog/promo/4-launch-week.mdx

@@ -1,5 +1,5 @@
 ---
-title: 'Launch week!'
+title: '4 Launch week!'
 description: 'Join us for the exciting launch of SPACE BLOG'
 publishedDate: 'Sat May 21 2022 00:00:00 GMT-0400 (Eastern Daylight Time)'
 tags: ['announcement']

packages/astro/test/fixtures/content/src/pages/launch-week-component-scripts.astro

@@ -1,7 +1,7 @@
 ---
 import { getEntry, render } from 'astro:content';
 
-const entry = await getEntry('blog', 'promo/launch-week-component-scripts');
+const entry = await getEntry('blog', 'promo/2-launch-week-component-scripts');
 const { Content } = await render(entry);
 ---
 <html>