@@ -12,135 +12,132 @@ import io.ktor.server.plugins.conditionalheaders.*
1212import io.ktor.server.response.*
1313import io.ktor.server.routing.*
1414import io.ktor.server.testing.*
15- import io.ktor.util.*
1615import kotlin.test.*
1716
18- @Suppress(" DEPRECATION"
1917class WebjarsTest {
2018
2119 @Test
2220 fun resourceNotFound () {
23- withTestApplication {
24- application. install(Webjars )
25- handleRequest( HttpMethod . Get , " /webjars/foo.js" let { call ->
21+ testApplication {
22+ install(Webjars )
23+ client.get( " /webjars/foo.js" let { response ->
2624 // Should be handled by some other routing
27- assertEquals(HttpStatusCode .NotFound , call. response.status() )
25+ assertEquals(HttpStatusCode .NotFound , response.status)
2826 }
2927 }
3028 }
3129
3230 @Test
3331 fun pathLike () {
34- withTestApplication {
35- application. install(Webjars )
36- application. routing {
32+ testApplication {
33+ install(Webjars )
34+ routing {
3735 get(" /webjars-something/jquery"
3836 call.respondText { " Something Else"
3937 }
4038 }
41- handleRequest( HttpMethod . Get , " /webjars-something/jquery" let { call ->
42- assertEquals(HttpStatusCode .OK , call. response.status() )
43- assertEquals(" Something Else" call. response.content )
39+ client.get( " /webjars-something/jquery" let { response ->
40+ assertEquals(HttpStatusCode .OK , response.status)
41+ assertEquals(" Something Else" bodyAsText() )
4442 }
4543 }
4644 }
4745
4846 @Test
4947 fun nestedPath () {
50- withTestApplication {
51- application. install(Webjars ) {
48+ testApplication {
49+ install(Webjars ) {
5250 path = " /assets/webjars"
5351 }
54- handleRequest( HttpMethod . Get , " /assets/webjars/jquery/jquery.js" let { call ->
55- assertEquals(HttpStatusCode .OK , call. response.status() )
56- assertEquals(" application/javascript " , call. response.headers[ " Content-Type " ] )
52+ client.get( " /assets/webjars/jquery/jquery.js" let { response ->
53+ assertEquals(HttpStatusCode .OK , response.status)
54+ assertEquals(ContentType . Text . JavaScript , response.contentType()?.withoutParameters() )
5755 }
5856 }
5957 }
6058
6159 @Test
6260 fun rootPath () {
63- withTestApplication {
64- application. install(Webjars ) {
61+ testApplication {
62+ install(Webjars ) {
6563 path = " /"
6664 }
67- handleRequest( HttpMethod . Get , " /jquery/jquery.js" let { call ->
68- assertEquals(HttpStatusCode .OK , call. response.status() )
69- assertEquals(" application/javascript " , call. response.headers[ " Content-Type " ] )
65+ client.get( " /jquery/jquery.js" let { response ->
66+ assertEquals(HttpStatusCode .OK , response.status)
67+ assertEquals(ContentType . Text . JavaScript , response.contentType()?.withoutParameters() )
7068 }
7169 }
7270 }
7371
7472 @Test
7573 fun rootPath2 () {
76- withTestApplication {
77- application. install(Webjars ) {
74+ testApplication {
75+ install(Webjars ) {
7876 path = " /"
7977 }
80- application. routing {
78+ routing {
8179 get(" /" " Hello, World"
8280 }
83- handleRequest( HttpMethod . Get , " /" let { call ->
84- assertEquals(HttpStatusCode .OK , call. response.status() )
85- assertEquals(" Hello, World" call. response.content )
81+ client.get( " /" let { response ->
82+ assertEquals(HttpStatusCode .OK , response.status)
83+ assertEquals(" Hello, World" bodyAsText() )
8684 }
87- handleRequest( HttpMethod . Get , " /jquery/jquery.js" let { call ->
88- assertEquals(HttpStatusCode .OK , call. response.status() )
89- assertEquals(" application/javascript " , call. response.headers[ " Content-Type " ] )
85+ client.get( " /jquery/jquery.js" let { response ->
86+ assertEquals(HttpStatusCode .OK , response.status)
87+ assertEquals(ContentType . Text . JavaScript , response.contentType()?.withoutParameters() )
9088 }
9189 }
9290 }
9391
9492 @Test
9593 fun versionAgnostic () {
96- withTestApplication {
97- application. install(Webjars )
94+ testApplication {
95+ install(Webjars )
9896
99- handleRequest( HttpMethod . Get , " /webjars/jquery/jquery.js" let { call ->
100- assertEquals(HttpStatusCode .OK , call. response.status() )
101- assertEquals(" application/javascript " , call. response.headers[ " Content-Type " ] )
97+ client.get( " /webjars/jquery/jquery.js" let { response ->
98+ assertEquals(HttpStatusCode .OK , response.status)
99+ assertEquals(ContentType . Text . JavaScript , response.contentType()?.withoutParameters() )
102100 }
103101 }
104102 }
105103
106104 @Test
107105 fun withGetParameters () {
108- withTestApplication {
109- application. install(Webjars )
106+ testApplication {
107+ install(Webjars )
110108
111- handleRequest( HttpMethod . Get , " /webjars/jquery/jquery.js?param1=value1" let { call ->
112- assertEquals(HttpStatusCode .OK , call. response.status() )
113- assertEquals(" application/javascript " , call. response.headers[ " Content-Type " ] )
109+ client.get( " /webjars/jquery/jquery.js?param1=value1" let { response ->
110+ assertEquals(HttpStatusCode .OK , response.status)
111+ assertEquals(ContentType . Text . JavaScript , response.contentType()?.withoutParameters() )
114112 }
115113 }
116114 }
117115
118116 @Test
119117 fun withSpecificVersion () {
120- withTestApplication {
121- application. install(Webjars )
118+ testApplication {
119+ install(Webjars )
122120
123- handleRequest( HttpMethod . Get , " /webjars/jquery/3.6.4/jquery.js" let { call ->
124- assertEquals(HttpStatusCode .OK , call. response.status() )
125- assertEquals(" application/javascript " , call. response.headers[ " Content-Type " ] )
121+ client.get( " /webjars/jquery/3.6.4/jquery.js" let { response ->
122+ assertEquals(HttpStatusCode .OK , response.status)
123+ assertEquals(ContentType . Text . JavaScript , response.contentType()?.withoutParameters() )
126124 }
127125 }
128126 }
129127
130128 @Test
131- fun withConditionalHeaders () {
132- withTestApplication {
133- application. install(Webjars )
134- application. install(ConditionalHeaders )
135- handleRequest( HttpMethod . Get , " /webjars/jquery/3.6.4/jquery.js" let { call ->
136- assertEquals(HttpStatusCode .OK , call. response.status() )
137- assertEquals(" application/javascript " , call. response.headers[ " Content-Type " ] )
138- assertNotNull(call. response.headers[" Last-Modified"
129+ fun withConditionalAndCachingHeaders () {
130+ testApplication {
131+ install(Webjars )
132+ install(ConditionalHeaders )
133+ client.get( " /webjars/jquery/3.6.4/jquery.js" let { response ->
134+ assertEquals(HttpStatusCode .OK , response.status)
135+ assertEquals(ContentType . Text . JavaScript , response.contentType()?.withoutParameters() )
136+ assertNotNull(response.headers[" Last-Modified"
139137 }
140138 }
141139 }
142140
143- @OptIn(InternalAPI ::class )
144141 @Test
145142 fun callHandledBeforeWebjars () {
146143 val alwaysRespondHello = object : Hook <Unit > {
@@ -161,7 +158,7 @@ class WebjarsTest {
161158 val response = client.get(" /webjars/jquery/3.3.1/jquery.js"
162159 assertEquals(HttpStatusCode .OK , response.status)
163160 assertEquals(" Hello"
164- assertNotEquals(" application/javascript " headers[ " Content-Type " ] )
161+ assertNotEquals(ContentType . Text . JavaScript , response.contentType()?.withoutParameters() )
165162 }
166163 }
167164}
0 commit comments