Rename script type parameter

skrobinson · skrobinson · commit db906f0a9a59 · 2019-09-06T06:43:38.000-07:00
Signed-off-by: Sean Robinson &lt;sean.robinson@scottsdalecc.edu&gt;
diff --git a/test/data/mock.php b/test/data/mock.php
@@ -218,7 +218,7 @@ protected function cspClean( $req ) {
 
 	protected function errorWithScript( $req ) {
 		header( 'HTTP/1.0 404 Not Found' );
-		if ( isset( $req->query['scriptReply'] ) ) {
+		if ( isset( $req->query['withScriptContentType'] ) ) {
 			header( 'Content-Type: application/javascript' );
 		}
 		if ( isset( $req->query['callback'] ) ) {
diff --git a/test/middleware-mockserver.js b/test/middleware-mockserver.js
@@ -228,7 +228,7 @@ var mocks = {
 		resp.end();
 	},
 	errorWithScript: function( req, resp ) {
-		if ( req.query.scriptReply ) {
+		if ( req.query.withScriptContentType ) {
 			resp.writeHead( 404, { "Content-Type": "application/javascript" } );
 		} else {
 			resp.writeHead( 404 );
diff --git a/test/unit/ajax.js b/test/unit/ajax.js
@@ -853,7 +853,7 @@ QUnit.module( "ajax", {
 			request(
 				"script reply",
 				{
-					url: url( "mock.php?action=errorWithScript&scriptReply" )
+					url: url( "mock.php?action=errorWithScript&withScriptContentType" )
 				}
 			),
 			request(
@@ -866,7 +866,7 @@ QUnit.module( "ajax", {
 				"script reply with dataType",
 				{
 					dataType: "script",
-					url: url( "mock.php?action=errorWithScript&scriptReply" )
+					url: url( "mock.php?action=errorWithScript&withScriptContentType" )
 				}
 			),
 			request(
@@ -880,7 +880,7 @@ QUnit.module( "ajax", {
 				"script reply with converter",
 				{
 					converters: failConverters,
-					url: url( "mock.php?action=errorWithScript&scriptReply" )
+					url: url( "mock.php?action=errorWithScript&withScriptContentType" )
 				}
 			),
 			request(
@@ -895,7 +895,7 @@ QUnit.module( "ajax", {
 				{
 					converters: failConverters,
 					dataType: "script",
-					url: url( "mock.php?action=errorWithScript&scriptReply" )
+					url: url( "mock.php?action=errorWithScript&withScriptContentType" )
 				}
 			),
 			request(

Original file line number	Diff line number	Diff line change
`@@ -218,7 +218,7 @@ protected function cspClean( $req ) {`
`218`	`218`
`219`	`219`	`protected function errorWithScript( $req ) {`
`220`	`220`	`header( 'HTTP/1.0 404 Not Found' );`
`221`		`- if ( isset( $req->query['scriptReply'] ) ) {`
	`221`	`+ if ( isset( $req->query['withScriptContentType'] ) ) {`
`222`	`222`	`header( 'Content-Type: application/javascript' );`
`223`	`223`	`}`
`224`	`224`	`if ( isset( $req->query['callback'] ) ) {`
Original file line number	Diff line number	Diff line change
`@@ -853,7 +853,7 @@ QUnit.module( "ajax", {`
`853`	`853`	`request(`
`854`	`854`	`"script reply",`
`855`	`855`	`{`
`856`		`- url: url( "mock.php?action=errorWithScript&scriptReply" )`
	`856`	`+ url: url( "mock.php?action=errorWithScript&withScriptContentType" )`
`857`	`857`	`}`
`858`	`858`	`),`
`859`	`859`	`request(`
`@@ -866,7 +866,7 @@ QUnit.module( "ajax", {`
`866`	`866`	`"script reply with dataType",`
`867`	`867`	`{`
`868`	`868`	`dataType: "script",`
`869`		`- url: url( "mock.php?action=errorWithScript&scriptReply" )`
	`869`	`+ url: url( "mock.php?action=errorWithScript&withScriptContentType" )`
`870`	`870`	`}`
`871`	`871`	`),`
`872`	`872`	`request(`
`@@ -880,7 +880,7 @@ QUnit.module( "ajax", {`
`880`	`880`	`"script reply with converter",`
`881`	`881`	`{`
`882`	`882`	`converters: failConverters,`
`883`		`- url: url( "mock.php?action=errorWithScript&scriptReply" )`
	`883`	`+ url: url( "mock.php?action=errorWithScript&withScriptContentType" )`
`884`	`884`	`}`
`885`	`885`	`),`
`886`	`886`	`request(`
`@@ -895,7 +895,7 @@ QUnit.module( "ajax", {`
`895`	`895`	`{`
`896`	`896`	`converters: failConverters,`
`897`	`897`	`dataType: "script",`
`898`		`- url: url( "mock.php?action=errorWithScript&scriptReply" )`
	`898`	`+ url: url( "mock.php?action=errorWithScript&withScriptContentType" )`
`899`	`899`	`}`
`900`	`900`	`),`
`901`	`901`	`request(`