Skip to content

Commit 2a0e165

Browse files
hotate29hotate29
committed
cookie
1 parent 03bdeae commit 2a0e165

File tree

3 files changed

+60
-53
lines changed

3 files changed

+60
-53
lines changed

‎atcoder-problems-backend/tests/test_server_e2e_problem_list.rs

Lines changed: 29 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
use actix_web::{http::StatusCode, test};
1+
use actix_web::{cookie::Cookie, http::StatusCode, test};
22
use atcoder_problems_backend::server::middleware::github_auth::{
33
GithubAuthentication, GithubClient, GithubToken,
44
};
@@ -51,17 +51,19 @@ async fn test_list() {
5151

5252
assert_eq!(token, VALID_TOKEN);
5353

54+
let cookie = Cookie::new("token", token);
55+
5456
let request = test::TestRequest::get()
5557
.uri("/internal-api/list/my")
56-
.insert_header(("Cookie", format!("token={}", token)))
58+
.cookie(cookie.clone())
5759
.to_request();
5860
let response: Value = test::call_and_read_body_json(&app, request).await;
5961

6062
assert_eq!(response, json!([]));
6163

6264
let response = test::TestRequest::post()
6365
.uri("/internal-api/list/create")
64-
.insert_header(("Cookie", format!("token={}", token)))
66+
.cookie(cookie.clone())
6567
.set_json(json!({"list_name":"a"}))
6668
.send_request(&app)
6769
.await;
@@ -73,7 +75,7 @@ async fn test_list() {
7375

7476
let request = test::TestRequest::get()
7577
.uri("/internal-api/list/my")
76-
.insert_header(("Cookie", format!("token={}", token)))
78+
.cookie(cookie.clone())
7779
.to_request();
7880
let response: Value = test::call_and_read_body_json(&app, request).await;
7981

@@ -91,7 +93,7 @@ async fn test_list() {
9193

9294
let response = test::TestRequest::post()
9395
.uri("/internal-api/list/update")
94-
.insert_header(("Cookie", format!("token={}", token)))
96+
.cookie(cookie.clone())
9597
.set_json(json!({
9698
"internal_list_id":internal_list_id,
9799
"name":"b"
@@ -103,7 +105,7 @@ async fn test_list() {
103105

104106
let request = test::TestRequest::get()
105107
.uri("/internal-api/list/my")
106-
.insert_header(("Cookie", format!("token={}", token)))
108+
.cookie(cookie.clone())
107109
.to_request();
108110
let response: Value = test::call_and_read_body_json(&app, request).await;
109111

@@ -137,7 +139,7 @@ async fn test_list() {
137139

138140
let response = test::TestRequest::post()
139141
.uri("/internal-api/list/delete")
140-
.insert_header(("Cookie", format!("token={}", token)))
142+
.cookie(cookie.clone())
141143
.set_json(json!({ "internal_list_id": internal_list_id }))
142144
.send_request(&app)
143145
.await;
@@ -146,7 +148,7 @@ async fn test_list() {
146148

147149
let request = test::TestRequest::get()
148150
.uri("/internal-api/list/my")
149-
.insert_header(("Cookie", format!("token={}", token)))
151+
.cookie(cookie)
150152
.to_request();
151153
let response: Value = test::call_and_read_body_json(&app, request).await;
152154

@@ -173,17 +175,19 @@ async fn test_invalid_token() {
173175
)
174176
.await;
175177

178+
let cookie = Cookie::new("token", "invalid-token");
179+
176180
let response = test::TestRequest::get()
177181
.uri("/internal-api/list/my")
178-
.insert_header(("Cookie", "token=invalid-token"))
182+
.cookie(cookie.clone())
179183
.send_request(&app)
180184
.await;
181185

182186
assert!(!response.status().is_success());
183187

184188
let response = test::TestRequest::post()
185189
.uri("/internal-api/list/create")
186-
.insert_header(("Cookie", "token=invalid-token"))
190+
.cookie(cookie)
187191
.send_request(&app)
188192
.await;
189193

@@ -216,11 +220,12 @@ async fn test_list_item() {
216220
.send_request(&app)
217221
.await;
218222

219-
let cookie_header = format!("token={}", VALID_TOKEN);
223+
let cookie = Cookie::new("token", VALID_TOKEN);
224+
// let cookie_header = format!("token={}", VALID_TOKEN);
220225

221226
let response = test::TestRequest::post()
222227
.uri("/internal-api/list/create")
223-
.insert_header(("Cookie", cookie_header.as_str()))
228+
.cookie(cookie.clone())
224229
.set_json(json!({"list_name":"a"}))
225230
.send_request(&app)
226231
.await;
@@ -233,7 +238,7 @@ async fn test_list_item() {
233238

234239
let response = test::TestRequest::post()
235240
.uri("/internal-api/list/item/add")
236-
.insert_header(("Cookie", cookie_header.as_str()))
241+
.cookie(cookie.clone())
237242
.set_json(json!({
238243
"internal_list_id": internal_list_id,
239244
"internal_user_id": "0",
@@ -246,7 +251,7 @@ async fn test_list_item() {
246251

247252
let request = test::TestRequest::get()
248253
.uri("/internal-api/list/my")
249-
.insert_header(("Cookie", cookie_header.as_str()))
254+
.cookie(cookie.clone())
250255
.to_request();
251256
let list: Value = test::call_and_read_body_json(&app, request).await;
252257

@@ -263,7 +268,7 @@ async fn test_list_item() {
263268
);
264269
let response = test::TestRequest::post()
265270
.uri("/internal-api/list/item/update")
266-
.insert_header(("Cookie", cookie_header.as_str()))
271+
.cookie(cookie.clone())
267272
.set_json(json!({
268273
"internal_list_id": internal_list_id,
269274
"problem_id": "problem_1",
@@ -277,7 +282,7 @@ async fn test_list_item() {
277282

278283
let request = test::TestRequest::get()
279284
.uri("/internal-api/list/my")
280-
.insert_header(("Cookie", cookie_header.as_str()))
285+
.cookie(cookie.clone())
281286
.to_request();
282287
let list: Value = test::call_and_read_body_json(&app, request).await;
283288

@@ -295,7 +300,7 @@ async fn test_list_item() {
295300

296301
let response = test::TestRequest::post()
297302
.uri("/internal-api/list/item/delete")
298-
.insert_header(("Cookie", cookie_header.as_str()))
303+
.cookie(cookie.clone())
299304
.set_json(json!({
300305
"internal_list_id": internal_list_id,
301306
"problem_id": "problem_1"
@@ -307,7 +312,7 @@ async fn test_list_item() {
307312

308313
let request = test::TestRequest::get()
309314
.uri("/internal-api/list/my")
310-
.insert_header(("Cookie", cookie_header.as_str()))
315+
.cookie(cookie)
311316
.to_request();
312317
let list: Value = test::call_and_read_body_json(&app, request).await;
313318

@@ -350,11 +355,11 @@ async fn test_list_delete() {
350355
.send_request(&app)
351356
.await;
352357

353-
let cookie_header = format!("token={}", VALID_TOKEN);
358+
let cookie = Cookie::new("token", VALID_TOKEN);
354359

355360
let response = test::TestRequest::post()
356361
.uri("/internal-api/list/create")
357-
.insert_header(("Cookie", cookie_header.as_str()))
362+
.cookie(cookie.clone())
358363
.set_json(json!({"list_name":"a"}))
359364
.send_request(&app)
360365
.await;
@@ -367,7 +372,7 @@ async fn test_list_delete() {
367372

368373
let response = test::TestRequest::post()
369374
.uri("/internal-api/list/item/add")
370-
.insert_header(("Cookie", cookie_header.as_str()))
375+
.cookie(cookie.clone())
371376
.set_json(json!({"internal_list_id":internal_list_id, "problem_id":"problem_1"}))
372377
.send_request(&app)
373378
.await;
@@ -376,7 +381,7 @@ async fn test_list_delete() {
376381

377382
let request = test::TestRequest::get()
378383
.uri("/internal-api/list/my")
379-
.insert_header(("Cookie", cookie_header.as_str()))
384+
.cookie(cookie.clone())
380385
.to_request();
381386
let list: Value = test::call_and_read_body_json(&app, request).await;
382387

@@ -385,7 +390,7 @@ async fn test_list_delete() {
385390

386391
let response = test::TestRequest::post()
387392
.uri("/internal-api/list/delete")
388-
.insert_header(("Cookie", cookie_header.as_str()))
393+
.cookie(cookie.clone())
389394
.set_json(json!({ "internal_list_id": internal_list_id }))
390395
.send_request(&app)
391396
.await;
@@ -394,7 +399,7 @@ async fn test_list_delete() {
394399

395400
let request = test::TestRequest::get()
396401
.uri("/internal-api/list/my")
397-
.insert_header(("Cookie", cookie_header.as_str()))
402+
.cookie(cookie)
398403
.to_request();
399404
let list: Vec<Value> = test::call_and_read_body_json(&app, request).await;
400405

‎atcoder-problems-backend/tests/test_server_e2e_progress_reset.rs

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
use actix_web::{http::StatusCode, test};
1+
use actix_web::{cookie::Cookie, http::StatusCode, test};
22
use atcoder_problems_backend::server::middleware::github_auth::{
33
GithubAuthentication, GithubClient, GithubToken,
44
};
@@ -35,9 +35,11 @@ async fn test_progress_reset() {
3535

3636
assert_eq!(response.status(), StatusCode::FOUND);
3737

38+
let cookie = Cookie::new("token", token);
39+
3840
let request = test::TestRequest::get()
3941
.uri("/internal-api/progress_reset/list")
40-
.insert_header(("Cookie", format!("token={}", token)))
42+
.cookie(cookie.clone())
4143
.to_request();
4244
let response: Value = test::call_and_read_body_json(&app, request).await;
4345

@@ -50,7 +52,7 @@ async fn test_progress_reset() {
5052

5153
let response = test::TestRequest::post()
5254
.uri("/internal-api/progress_reset/add")
53-
.insert_header(("Cookie", format!("token={}", token)))
55+
.cookie(cookie.clone())
5456
.set_json(json!({"problem_id":"problem_1","reset_epoch_second":100}))
5557
.send_request(&app)
5658
.await;
@@ -59,7 +61,7 @@ async fn test_progress_reset() {
5961

6062
let request = test::TestRequest::get()
6163
.uri("/internal-api/progress_reset/list")
62-
.insert_header(("Cookie", format!("token={}", token)))
64+
.cookie(cookie.clone())
6365
.to_request();
6466
let response: Value = test::call_and_read_body_json(&app, request).await;
6567

@@ -75,7 +77,7 @@ async fn test_progress_reset() {
7577

7678
let response = test::TestRequest::post()
7779
.uri("/internal-api/progress_reset/add")
78-
.insert_header(("Cookie", format!("token={}", token)))
80+
.cookie(cookie.clone())
7981
.set_json(json!({"problem_id":"problem_1","reset_epoch_second":200}))
8082
.send_request(&app)
8183
.await;
@@ -84,7 +86,7 @@ async fn test_progress_reset() {
8486

8587
let request = test::TestRequest::get()
8688
.uri("/internal-api/progress_reset/list")
87-
.insert_header(("Cookie", format!("token={}", token)))
89+
.cookie(cookie.clone())
8890
.to_request();
8991
let response: Value = test::call_and_read_body_json(&app, request).await;
9092

@@ -100,7 +102,7 @@ async fn test_progress_reset() {
100102

101103
let response = test::TestRequest::post()
102104
.uri("/internal-api/progress_reset/add")
103-
.insert_header(("Cookie", format!("token={}", token)))
105+
.cookie(cookie.clone())
104106
.set_json(json!({"problem_id":"problem_2","reset_epoch_second":200}))
105107
.send_request(&app)
106108
.await;
@@ -109,7 +111,7 @@ async fn test_progress_reset() {
109111

110112
let response = test::TestRequest::post()
111113
.uri("/internal-api/progress_reset/delete")
112-
.insert_header(("Cookie", format!("token={}", token)))
114+
.cookie(cookie.clone())
113115
.set_json(json!({"problem_id":"problem_1"}))
114116
.send_request(&app)
115117
.await;
@@ -118,7 +120,7 @@ async fn test_progress_reset() {
118120

119121
let request = test::TestRequest::get()
120122
.uri("/internal-api/progress_reset/list")
121-
.insert_header(("Cookie", format!("token={}", token)))
123+
.cookie(cookie)
122124
.to_request();
123125
let response: Value = test::call_and_read_body_json(&app, request).await;
124126

0 commit comments

Comments
 (0)