@@ -2,12 +2,14 @@ import path from 'path'
22import process from 'process'
33import { fileURLToPath } from 'url'
44
5+ import { load } from 'cheerio'
56import execa from 'execa'
67import fetch from 'node-fetch'
7- import { afterAll , beforeAll , describe , test } from 'vitest'
8+ import { afterAll , beforeAll , describe , expect , test } from 'vitest'
89
910import { callCli } from '../../utils/call-cli.js'
1011import { createLiveTestSite , generateSiteName } from '../../utils/create-live-test-site.js'
12+ import { FixtureTestContext , setupFixtureTests } from '../../utils/fixture.js'
1113import { pause } from '../../utils/pause.js'
1214import { withSiteBuilder } from '../../utils/site-builder.ts'
1315
@@ -16,29 +18,41 @@ const __dirname = path.dirname(fileURLToPath(import.meta.url))
1618
1719const SITE_NAME = generateSiteName ( 'netlify-test-deploy-' )
1820
19- // eslint-disable-next-line no-shadow
20- const validateContent = async ( { content, path, siteUrl, t } ) => {
21- const response = await fetch ( `${ siteUrl } ${ path } )
21+ const validateContent = async ( { content, path : pathname , siteUrl } ) => {
22+ const response = await fetch ( `${ siteUrl } ${ pathname } )
2223 const body = await response . text ( )
2324 if ( content === undefined ) {
24- t . expect ( response . status ) . toBe ( 404 )
25+ expect ( response . status ) . toBe ( 404 )
2526 return
2627 }
27- t . expect ( response . status , `status should be 200. request id: ${ response . headers . get ( 'x-nf-request-id' ) } ) . toBe ( 200 )
28- t . expect ( body , `body should be as expected. request id: ${ response . headers . get ( 'x-nf-request-id' ) } ) . toEqual ( content )
28+ expect ( response . status , `status should be 200. request id: ${ response . headers . get ( 'x-nf-request-id' ) } ) . toBe ( 200 )
29+ expect ( body , `body should be as expected. request id: ${ response . headers . get ( 'x-nf-request-id' ) } ) . toEqual ( content )
2930}
3031
31- const validateDeploy = async ( { content, contentMessage, deploy, siteName, t } ) => {
32- t . expect ( deploy . site_name ) . toBeTruthy ( )
33- t . expect ( deploy . deploy_url ) . toBeTruthy ( )
34- t . expect ( deploy . deploy_id ) . toBeTruthy ( )
35- t . expect ( deploy . logs ) . toBeTruthy ( )
36- t . expect ( deploy . site_name , contentMessage ) . toEqual ( siteName )
37-
38- await validateContent ( { siteUrl : deploy . deploy_url , path : '' , content, t } )
32+ const validateDeploy = async ( {
33+ content,
34+ contentMessage,
35+ deploy,
36+ siteName,
37+ } : {
38+ contentMessage ?: string
39+ siteName : string
40+ content ?: string
41+ deploy : { site_name : string ; deploy_url : string ; deploy_id : string ; logs : string }
42+ } ) => {
43+ expect ( deploy . site_name ) . toBeTruthy ( )
44+ expect ( deploy . deploy_url ) . toBeTruthy ( )
45+ expect ( deploy . deploy_id ) . toBeTruthy ( )
46+ expect ( deploy . logs ) . toBeTruthy ( )
47+ expect ( deploy . site_name , contentMessage ) . toEqual ( siteName )
48+
49+ await validateContent ( { siteUrl : deploy . deploy_url , path : '' , content } )
3950}
4051
41- const context = { }
52+ const context : { account : unknown ; siteId : string } = {
53+ siteId : '' ,
54+ account : undefined ,
55+ }
4256
4357describe . skipIf ( process . env . NETLIFY_TEST_DISABLE_LIVE === 'true' ) . concurrent ( 'commands/deploy' , ( ) => {
4458 beforeAll ( async ( ) => {
@@ -68,7 +82,7 @@ describe.skipIf(process.env.NETLIFY_TEST_DISABLE_LIVE === 'true').concurrent('co
6882 env : { NETLIFY_SITE_ID : context . siteId } ,
6983 } ) . then ( ( output ) => JSON . parse ( output ) )
7084
71- await validateDeploy ( { deploy, siteName : SITE_NAME , content, t } )
85+ await validateDeploy ( { deploy, siteName : SITE_NAME , content } )
7286 } )
7387 } )
7488
@@ -92,7 +106,7 @@ describe.skipIf(process.env.NETLIFY_TEST_DISABLE_LIVE === 'true').concurrent('co
92106 cwd : builder . directory ,
93107 } ) . then ( ( output ) => JSON . parse ( output ) )
94108
95- await validateDeploy ( { deploy, siteName : SITE_NAME , content, t } )
109+ await validateDeploy ( { deploy, siteName : SITE_NAME , content } )
96110 } )
97111 } )
98112
@@ -117,7 +131,7 @@ describe.skipIf(process.env.NETLIFY_TEST_DISABLE_LIVE === 'true').concurrent('co
117131 env : { NETLIFY_SITE_ID : context . siteId } ,
118132 } ) . then ( ( output ) => JSON . parse ( output ) )
119133
120- await validateDeploy ( { deploy, siteName : SITE_NAME , content, t } )
134+ await validateDeploy ( { deploy, siteName : SITE_NAME , content } )
121135 } )
122136 } )
123137
@@ -158,7 +172,6 @@ describe.skipIf(process.env.NETLIFY_TEST_DISABLE_LIVE === 'true').concurrent('co
158172 siteName : SITE_NAME ,
159173 content : 'Edge Function works' ,
160174 contentMessage : 'Edge function did not execute correctly or was not deployed correctly' ,
161- t,
162175 } )
163176 } )
164177 } )
@@ -205,7 +218,6 @@ describe.skipIf(process.env.NETLIFY_TEST_DISABLE_LIVE === 'true').concurrent('co
205218 siteName : SITE_NAME ,
206219 content : 'Edge Function works' ,
207220 contentMessage : 'Edge function did not execute correctly or was not deployed correctly' ,
208- t,
209221 } )
210222 } )
211223 } )
@@ -228,7 +240,7 @@ describe.skipIf(process.env.NETLIFY_TEST_DISABLE_LIVE === 'true').concurrent('co
228240 name : 'log-env' ,
229241 plugin : {
230242 async onSuccess ( ) {
231- // eslint-disable-next-line n/global-require, no-undef
243+ // eslint-disable-next-line n/global-require, @typescript-eslint/ no-var-requires
232244 const { DEPLOY_ID , DEPLOY_URL } = require ( 'process' ) . env
233245 console . log ( `DEPLOY_ID: ${ DEPLOY_ID } )
234246 console . log ( `DEPLOY_URL: ${ DEPLOY_URL } )
@@ -310,24 +322,21 @@ describe.skipIf(process.env.NETLIFY_TEST_DISABLE_LIVE === 'true').concurrent('co
310322 env : { NETLIFY_SITE_ID : context . siteId } ,
311323 } ) . then ( ( output ) => JSON . parse ( output ) )
312324
313- await validateDeploy ( { deploy, siteName : SITE_NAME , content : 'index' , t } )
325+ await validateDeploy ( { deploy, siteName : SITE_NAME , content : 'index' } )
314326 await validateContent ( {
315327 siteUrl : deploy . deploy_url ,
316328 content : undefined ,
317329 path : '/.hidden-file' ,
318- t,
319330 } )
320331 await validateContent ( {
321332 siteUrl : deploy . deploy_url ,
322333 content : undefined ,
323334 path : '/.hidden-dir' ,
324- t,
325335 } )
326336 await validateContent ( {
327337 siteUrl : deploy . deploy_url ,
328338 content : undefined ,
329339 path : '/__MACOSX' ,
330- t,
331340 } )
332341 } )
333342 } )
@@ -358,12 +367,11 @@ describe.skipIf(process.env.NETLIFY_TEST_DISABLE_LIVE === 'true').concurrent('co
358367 env : { NETLIFY_SITE_ID : context . siteId } ,
359368 } ) . then ( ( output ) => JSON . parse ( output ) )
360369
361- await validateDeploy ( { deploy, siteName : SITE_NAME , content : 'index' , t } )
370+ await validateDeploy ( { deploy, siteName : SITE_NAME , content : 'index' } )
362371 await validateContent ( {
363372 siteUrl : deploy . deploy_url ,
364373 content : undefined ,
365374 path : '/node_modules/package.json' ,
366- t,
367375 } )
368376 } )
369377 } )
@@ -394,12 +402,11 @@ describe.skipIf(process.env.NETLIFY_TEST_DISABLE_LIVE === 'true').concurrent('co
394402 env : { NETLIFY_SITE_ID : context . siteId } ,
395403 } ) . then ( ( output ) => JSON . parse ( output ) )
396404
397- await validateDeploy ( { deploy, siteName : SITE_NAME , content : 'index' , t } )
405+ await validateDeploy ( { deploy, siteName : SITE_NAME , content : 'index' } )
398406 await validateContent ( {
399407 siteUrl : deploy . deploy_url ,
400408 content : '{}' ,
401409 path : '/node_modules/package.json' ,
402- t,
403410 } )
404411 } )
405412 } )
@@ -414,7 +421,7 @@ describe.skipIf(process.env.NETLIFY_TEST_DISABLE_LIVE === 'true').concurrent('co
414421 env : { NETLIFY_SITE_ID : context . siteId } ,
415422 } )
416423 } catch ( error ) {
417- t . expect ( error . stderr . includes ( 'Error: No files or functions to deploy' ) ) . toBe ( true )
424+ expect ( error . stderr . includes ( 'Error: No files or functions to deploy' ) ) . toBe ( true )
418425 }
419426 } )
420427 } )
@@ -437,7 +444,7 @@ describe.skipIf(process.env.NETLIFY_TEST_DISABLE_LIVE === 'true').concurrent('co
437444 name : 'mutator' ,
438445 plugin : {
439446 onPreBuild : async ( { netlifyConfig } ) => {
440- // eslint-disable-next-line no-undef, n/global-require
447+ // eslint-disable-next-line n/global-require, @typescript-eslint/no-var-requires
441448 const { mkdir, writeFile } = require ( 'fs/promises' )
442449
443450 const generatedFunctionsDir = 'new_functions'
@@ -690,7 +697,7 @@ describe.skipIf(process.env.NETLIFY_TEST_DISABLE_LIVE === 'true').concurrent('co
690697 const redirectsMessage = fullDeploy . summary . messages . find ( ( { title } ) => title === '3 redirect rules processed' )
691698 t . expect ( redirectsMessage . description ) . toEqual ( 'All redirect rules deployed without errors.' )
692699
693- await validateDeploy ( { deploy, siteName : SITE_NAME , content, t } )
700+ await validateDeploy ( { deploy, siteName : SITE_NAME , content } )
694701
695702 const [ pluginRedirectResponse , _redirectsResponse , netlifyTomResponse ] = await Promise . all ( [
696703 fetch ( `${ deploy . deploy_url } ) . then ( ( res ) => res . text ( ) ) ,
@@ -762,7 +769,7 @@ describe.skipIf(process.env.NETLIFY_TEST_DISABLE_LIVE === 'true').concurrent('co
762769 true ,
763770 )
764771 const response = await fetch ( `${ deployUrl } ) . then ( ( res ) => res . text ( ) )
765- t . expect ( response ) . toEqual ( 'Pre-bundled' )
772+ expect ( response ) . toEqual ( 'Pre-bundled' )
766773 } )
767774 } )
768775
@@ -945,4 +952,26 @@ describe.skipIf(process.env.NETLIFY_TEST_DISABLE_LIVE === 'true').concurrent('co
945952 t . expect ( response ) . toEqual ( 'hello from the blob' )
946953 } )
947954 } )
955+
956+ setupFixtureTests ( 'next-app-without-config' , ( ) => {
957+ test < FixtureTestContext > ( 'should run deploy with --build without any netlify specific configuration' , async ( {
958+ fixture,
959+ } ) => {
960+ const { deploy_url : deployUrl } = await callCli (
961+ [ 'deploy' , '--build' , '--json' ] ,
962+ {
963+ cwd : fixture . directory ,
964+ env : { NETLIFY_SITE_ID : context . siteId } ,
965+ } ,
966+ true ,
967+ )
968+
969+ const html = await fetch ( deployUrl ) . then ( ( res ) => res . text ( ) )
970+ // eslint-disable-next-line id-length
971+ const $ = load ( html )
972+
973+ expect ( $ ( 'title' ) . text ( ) ) . toEqual ( 'Create Next App' )
974+ expect ( $ ( 'img[alt="Next.js Logo"]' ) . attr ( 'src' ) ) . toBe ( '/next.svg' )
975+ } )
976+ } )
948977} )
2 commit comments
github-actions[bot] commentedon Jul 15, 2024
📊 Benchmark results
github-actions[bot] commentedon Jul 15, 2024
📊 Benchmark results