mirror of
https://codeberg.org/forgejo/forgejo.git
synced 2024-12-23 07:43:18 -05:00
Merge pull request 'Fixes that the settings button moves in the overflow menu when the add more button is shown' (#3520) from Beowulf/forgejo:fix-setting-button-on-right into forgejo
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/3520 Reviewed-by: Otto <otto@codeberg.org> Reviewed-by: crystal <crystal@noreply.codeberg.org> Reviewed-by: Gergely Nagy <algernon@noreply.codeberg.org>
This commit is contained in:
commit
18a936e648
2 changed files with 15 additions and 1 deletions
|
@ -177,7 +177,7 @@
|
|||
{{$highlightSettings := true}}
|
||||
{{if and .SignedUser.EnableRepoUnitHints (not (.Repository.AllUnitsEnabled ctx))}}
|
||||
{{$highlightSettings = false}}
|
||||
<a id="settings-btn" class="{{if .PageIsRepoSettingsUnits}}active {{end}}right item" href="{{.RepoLink}}/settings/units">
|
||||
<a class="{{if .PageIsRepoSettingsUnits}}active {{end}}item" href="{{.RepoLink}}/settings/units">
|
||||
{{svg "octicon-diff-added"}} {{ctx.Locale.Tr "repo.settings.units.add_more"}}
|
||||
</a>
|
||||
{{end}}
|
||||
|
|
|
@ -22,6 +22,20 @@ test.describe('desktop viewport', () => {
|
|||
await expect(page.locator('.overflow-menu-button')).toHaveCount(0);
|
||||
});
|
||||
|
||||
test('Settings button on right of repo header also when add more button is shown', async ({browser}, workerInfo) => {
|
||||
await login_user(browser, workerInfo, 'user12');
|
||||
const context = await load_logged_in_context(browser, workerInfo, 'user12');
|
||||
const page = await context.newPage();
|
||||
|
||||
await page.goto('/user12/repo10');
|
||||
|
||||
const settingsBtn = page.locator('.overflow-menu-items>#settings-btn');
|
||||
await expect(settingsBtn).toBeVisible();
|
||||
await expect(settingsBtn).toHaveClass(/right/);
|
||||
|
||||
await expect(page.locator('.overflow-menu-button')).toHaveCount(0);
|
||||
});
|
||||
|
||||
test('Settings button on right of org header', async ({browser}, workerInfo) => {
|
||||
const context = await load_logged_in_context(browser, workerInfo, 'user2');
|
||||
const page = await context.newPage();
|
||||
|
|
Loading…
Reference in a new issue