tests(e2e): Refactor branch protection test

- ensuring the afterEach hook runs should reduce flakiness and allow retries
- the hook cleans up a rule if it exists or does nothing if not
This commit is contained in:
Otto Richter 2024-09-11 20:45:14 +02:00
parent a46a9ef307
commit 5bf0af1aaf

View file

@ -25,24 +25,33 @@ test('repo webhook settings', async ({browser}, workerInfo) => {
await expect(page.locator('.hide-unless-checked')).toBeHidden(); await expect(page.locator('.hide-unless-checked')).toBeHidden();
}); });
test('repo branch protection settings', async ({browser}, workerInfo) => { test.describe('repo branch protection settings', () => {
test.skip(workerInfo.project.name === 'Mobile Safari', 'Cannot get it to work - as usual'); test('form', async ({browser}, workerInfo) => {
const page = await login({browser}, workerInfo); test.skip(workerInfo.project.name === 'Mobile Safari', 'Cannot get it to work - as usual');
const response = await page.goto('/user2/repo1/settings/branches/edit'); const page = await login({browser}, workerInfo);
await expect(response?.status()).toBe(200); const response = await page.goto('/user2/repo1/settings/branches/edit');
await expect(response?.status()).toBe(200);
await validate_form({page}, 'fieldset'); await validate_form({page}, 'fieldset');
// verify header is new // verify header is new
await expect(page.locator('h4')).toContainText('new'); await expect(page.locator('h4')).toContainText('new');
await page.locator('input[name="rule_name"]').fill('testrule'); await page.locator('input[name="rule_name"]').fill('testrule');
await page.getByText('Save rule').click(); await page.getByText('Save rule').click();
// verify header is in edit mode // verify header is in edit mode
await page.waitForLoadState('networkidle'); await page.waitForLoadState('domcontentloaded');
await page.getByText('Edit').click(); await page.getByText('Edit').click();
await expect(page.locator('h4')).toContainText('Protection rules for branch'); await expect(page.locator('h4')).toContainText('Protection rules for branch');
// delete the rule for the next test });
await page.goBack();
await page.getByText('Delete rule').click(); test.afterEach(async ({browser}, workerInfo) => {
await page.getByText('Yes').click(); const page = await login({browser}, workerInfo);
// delete the rule for the next test
await page.goto('/user2/repo1/settings/branches/');
await page.waitForLoadState('domcontentloaded');
test.skip(await page.getByText('Delete rule').isHidden(), 'Nothing to delete at this time');
await page.getByText('Delete rule').click();
await page.getByText('Yes').click();
await page.waitForLoadState('load');
});
}); });