Skip to content

Commit 39fbf74

Browse files
KobzolKobzol
committed
Refactor PR edit webhooks in tests
1 parent c99351b commit 39fbf74

File tree

5 files changed

+215
-277
lines changed

5 files changed

+215
-277
lines changed

‎src/bors/handlers/pr_events.rs‎

Lines changed: 85 additions & 157 deletions
Original file line numberDiff line numberDiff line change
@@ -140,32 +140,22 @@ mod tests {
140140
async fn unapprove_on_base_edited(pool: sqlx::PgPool) {
141141
run_test(pool, |mut tester| async {
142142
tester.post_comment("@bors r+").await?;
143-
assert_eq!(
144-
tester.get_comment().await?,
145-
format!(
146-
"Commit pr-{}-sha has been approved by `{}`",
147-
default_pr_number(),
148-
User::default_pr_author().name
149-
),
150-
);
143+
tester.expect_comments(1).await;
144+
let branch = tester.create_branch("beta").clone();
151145
tester
152-
.edit_pull_request(
153-
default_pr_number(),
154-
PullRequestChangeEvent {
155-
from_base_sha: Some("main-sha".to_string()),
156-
from_base_ref: Some("main".to_string()),
157-
},
158-
)
146+
.edit_pr(default_repo_name(), default_pr_number(), |pr| {
147+
pr.base_branch = branch;
148+
})
159149
.await?;
160150

161-
assert_eq!(
151+
insta::assert_snapshot!(
162152
tester.get_comment().await?,
163-
r#":warning: The base branch changed to `main`, and the
164-
PR will need to be re-approved."#,
153+
@r"
154+
:warning: The base branch changed to `beta`, and the
155+
PR will need to be re-approved.
156+
"
165157
);
166-
tester
167-
.expect_pr_unapproved(default_pr_number().into())
168-
.await;
158+
tester.default_pr().await.expect_unapproved();
169159
Ok(tester)
170160
})
171161
.await;
@@ -175,31 +165,15 @@ PR will need to be re-approved."#,
175165
async fn edit_pr_do_nothing_when_base_not_edited(pool: sqlx::PgPool) {
176166
run_test(pool, |mut tester| async {
177167
tester.post_comment("@bors r+").await?;
178-
assert_eq!(
179-
tester.get_comment().await?,
180-
format!(
181-
"Commit pr-{}-sha has been approved by `{}`",
182-
default_pr_number(),
183-
User::default_pr_author().name
184-
),
185-
);
168+
tester.expect_comments(1).await;
186169
tester
187-
.edit_pull_request(
188-
default_pr_number(),
189-
PullRequestChangeEvent {
190-
from_base_sha: None,
191-
from_base_ref: None,
192-
},
193-
)
170+
.edit_pr(default_repo_name(), default_pr_number(), |_| {})
194171
.await?;
195172

196173
tester
197-
.expect_pr_approved_by(
198-
&default_repo_name(),
199-
default_pr_number(),
200-
&User::default_pr_author().name,
201-
)
202-
.await?;
174+
.default_pr()
175+
.await
176+
.expect_approved_by(&User::default_pr_author().name);
203177
Ok(tester)
204178
})
205179
.await;
@@ -208,14 +182,11 @@ PR will need to be re-approved."#,
208182
#[sqlx::test]
209183
async fn edit_pr_do_nothing_when_not_approved(pool: sqlx::PgPool) {
210184
run_test(pool, |mut tester| async {
185+
let branch = tester.create_branch("beta").clone();
211186
tester
212-
.edit_pull_request(
213-
default_pr_number(),
214-
PullRequestChangeEvent {
215-
from_base_sha: Some("main-sha".to_string()),
216-
from_base_ref: Some("main".to_string()),
217-
},
218-
)
187+
.edit_pr(default_repo_name(), default_pr_number(), |pr| {
188+
pr.base_branch = branch;
189+
})
219190
.await?;
220191

221192
// No comment should be posted
@@ -228,29 +199,19 @@ PR will need to be re-approved."#,
228199
async fn unapprove_on_push(pool: sqlx::PgPool) {
229200
run_test(pool, |mut tester| async {
230201
tester.post_comment("@bors r+").await?;
231-
assert_eq!(
232-
tester.get_comment().await?,
233-
format!(
234-
"Commit pr-{}-sha has been approved by `{}`",
235-
default_pr_number(),
236-
User::default_pr_author().name
237-
),
238-
);
202+
tester.expect_comments(1).await;
239203
tester
240204
.push_to_pr(default_repo_name(), default_pr_number())
241205
.await?;
242206

243-
assert_eq!(
207+
insta::assert_snapshot!(
244208
tester.get_comment().await?,
245-
format!(
246-
r#":warning: A new commit `pr-{}-sha` was pushed to the branch, the
247-
PR will need to be re-approved."#,
248-
default_pr_number()
249-
)
209+
@r"
210+
:warning: A new commit `pr-1-commit-1` was pushed to the branch, the
211+
PR will need to be re-approved.
212+
"
250213
);
251-
tester
252-
.expect_pr_unapproved(default_pr_number().into())
253-
.await;
214+
tester.default_pr().await.expect_unapproved();
254215
Ok(tester)
255216
})
256217
.await;
@@ -270,15 +231,15 @@ PR will need to be re-approved."#,
270231
}
271232

272233
#[sqlx::test]
273-
async fn update_base_branch_on_pr_opened(pool: sqlx::PgPool) {
234+
async fn store_base_branch_on_pr_opened(pool: sqlx::PgPool) {
274235
run_test(pool, |mut tester| async {
275-
tester.open_pr(default_pr_number()).await?;
236+
let pr = tester.open_pr(default_repo_name()).await?;
276237
tester
277238
.wait_for(|| async {
278-
let Some(pr) = tester.default_pr_db().await? else {
239+
let Some(pr) = tester.pr_db(default_repo_name(), pr.number.0).await? else {
279240
return Ok(false);
280241
};
281-
Ok(pr.base_branch == "main".to_string())
242+
Ok(pr.base_branch == default_branch_name().to_string())
282243
})
283244
.await?;
284245
Ok(tester)
@@ -289,109 +250,76 @@ PR will need to be re-approved."#,
289250
#[sqlx::test]
290251
async fn update_base_branch_on_pr_edited(pool: sqlx::PgPool) {
291252
run_test(pool.clone(), |mut tester| async {
253+
let branch = tester.create_branch("foo").clone();
292254
tester
293-
.edit_pull_request_with_pr(
294-
default_pr_number(),
295-
PullRequestChangeEvent {
296-
from_base_sha: Some(default_branch_sha().to_string()),
297-
from_base_ref: Some(default_branch_name().to_string()),
298-
},
299-
GitHubPullRequest::new(default_pr_number())
300-
.with_base("new".to_string(), "new-sha".to_string()),
301-
)
302-
.await?;
303-
tester
304-
.wait_for(|| async {
305-
let pr = get_pull_request(
306-
&pool,
307-
&default_repo_name(),
308-
PullRequestNumber(default_pr_number()),
309-
)
310-
.await?;
311-
Ok(pr.map_or(false, |pr| pr.base_branch == "new"))
255+
.edit_pr(default_repo_name(), default_pr_number(), |pr| {
256+
pr.base_branch = branch;
312257
})
313258
.await?;
314-
Ok(tester)
315-
})
316-
.await;
317-
}
318-
319-
#[sqlx::test]
320-
async fn preserve_base_branch_on_pr_edited_when_base_not_edited(pool: sqlx::PgPool) {
321-
run_test(pool, |mut tester| async {
322-
tester
323-
.edit_pull_request(
324-
default_pr_number(),
325-
PullRequestChangeEvent {
326-
from_base_sha: None,
327-
from_base_ref: None,
328-
},
329-
)
330-
.await?;
331-
332259
tester
333260
.wait_for(|| async {
334261
let Some(pr) = tester.default_pr_db().await? else {
335262
return Ok(false);
336263
};
337-
Ok(pr.base_branch == "main".to_string())
264+
Ok(pr.base_branch == "foo")
338265
})
339266
.await?;
340267
Ok(tester)
341268
})
342269
.await;
343270
}
344271

345-
#[sqlx::test]
346-
async fn update_mergeable_state_on_pr_edited(pool: sqlx::PgPool) {
347-
run_test(pool.clone(), |mut tester| async {
348-
tester
349-
.edit_pull_request_with_pr(
350-
default_pr_number(),
351-
PullRequestChangeEvent {
352-
from_base_sha: None,
353-
from_base_ref: None,
354-
},
355-
GitHubPullRequest::new(default_pr_number())
356-
.with_mergeable_state(octocrab::models::pulls::MergeableState::Dirty),
357-
)
358-
.await?;
359-
tester
360-
.wait_for(|| async {
361-
let pr = get_pull_request(
362-
&pool,
363-
&default_repo_name(),
364-
PullRequestNumber(default_pr_number()),
365-
)
366-
.await?;
367-
Ok(pr.map_or(false, |pr| {
368-
pr.mergeable_state == MergeableState::HasConflicts
369-
}))
370-
})
371-
.await?;
372-
Ok(tester)
373-
})
374-
.await;
375-
}
272+
// TODO
273+
// #[sqlx::test]
274+
// async fn update_mergeable_state_on_pr_edited(pool: sqlx::PgPool) {
275+
// run_test(pool.clone(), |mut tester| async {
276+
// tester
277+
// .edit_pull_request_with_pr(
278+
// default_pr_number(),
279+
// PullRequestChangeEvent {
280+
// from_base_sha: None,
281+
// from_base_ref: None,
282+
// },
283+
// GitHubPullRequest::new(default_pr_number())
284+
// .with_mergeable_state(octocrab::models::pulls::MergeableState::Dirty),
285+
// )
286+
// .await?;
287+
// tester
288+
// .wait_for(|| async {
289+
// let pr = get_pull_request(
290+
// &pool,
291+
// &default_repo_name(),
292+
// PullRequestNumber(default_pr_number()),
293+
// )
294+
// .await?;
295+
// Ok(pr.map_or(false, |pr| {
296+
// pr.mergeable_state == MergeableState::HasConflicts
297+
// }))
298+
// })
299+
// .await?;
300+
// Ok(tester)
301+
// })
302+
// .await;
303+
// }
376304

377-
#[sqlx::test]
378-
async fn update_mergeable_state_on_pr_push(pool: sqlx::PgPool) {
379-
run_test(pool, |mut tester| async {
380-
tester
381-
.push_to_pr(default_repo_name(), default_pr_number())
382-
.await?;
383-
tester
384-
.wait_for(|| async {
385-
let Some(pr) = tester.default_pr_db().await? else {
386-
return Ok(false);
387-
};
388-
Ok(pr.mergeable_state == MergeableState::Unknown)
389-
})
390-
.await?;
391-
Ok(tester)
392-
})
393-
.await;
394-
}
305+
// #[sqlx::test]
306+
// async fn update_mergeable_state_on_pr_push(pool: sqlx::PgPool) {
307+
// run_test(pool, |mut tester| async {
308+
// tester
309+
// .push_to_pr(default_repo_name(), default_pr_number())
310+
// .await?;
311+
// tester
312+
// .wait_for(|| async {
313+
// let Some(pr) = tester.default_pr_db().await? else {
314+
// return Ok(false);
315+
// };
316+
// Ok(pr.mergeable_state == MergeableState::Unknown)
317+
// })
318+
// .await?;
319+
// Ok(tester)
320+
// })
321+
// .await;
322+
// }
395323

396324
// TODO: fix test
397325
// #[sqlx::test]

‎src/bors/mod.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ mod context;
1919
pub mod event;
2020
mod handlers;
2121

22-
#[derive(Clone, Debug)]
22+
#[derive(Clone, Debug, PartialEq, Eq)]
2323
pub enum CheckSuiteStatus {
2424
Pending,
2525
Failure,

0 commit comments

Comments
 (0)