Skip to content

Commit b16eece

Browse files
committed
fix tests for mail configs
1 parent 88d3887 commit b16eece

3 files changed

Lines changed: 26 additions & 29 deletions

File tree

webui/e2e/dashboard-demo/mail.spec.ts

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -166,7 +166,10 @@ test('Visit Mail Server', async ({ page }) => {
166166
await test.step('Verify Configs', async () => {
167167

168168
await page.getByRole('tab', { name: 'Configs' }).click();
169-
const table = page.getByRole('table', { name: 'Configs' });
169+
const panel = page.getByRole('tabpanel', { name: 'Configs' });
170+
await panel.waitFor({ state: 'visible' });
171+
172+
const table = panel.getByRole('table', { name: 'Configs' });
170173
await expect(await getCellByColumnName(table, 'URL')).toContainText('/mail.yaml');
171174
await expect(await getCellByColumnName(table, 'Provider')).toHaveText('File');
172175

webui/src/components/dashboard/ConfigCard.vue

Lines changed: 21 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -104,25 +104,27 @@ function formatProvider(config: ConfigRef) {
104104
</div>
105105
</section>
106106

107-
<table class="table dataTable selectable" style="table-layout: fixed;" aria-labelledby="configs" v-else>
108-
<thead>
109-
<tr>
110-
<th scope="col" class="text-left col-6 col-md-9">URL</th>
111-
<th scope="col" class="text-center col-2">Provider</th>
112-
<th scope="col" class="text-center col-2">Last Update</th>
113-
</tr>
114-
</thead>
115-
<tbody>
116-
<tr scope="row" v-for="config in configs" :key="config.url" @mouseup.left="gotToConfig(config)" @mousedown.middle="gotToConfig(config, true)">
117-
<td>
118-
<router-link @click.stop class="row-link" :to="{ name: getRouteName('config').value, params: { id: config.id } }">
119-
{{ config.url }}
120-
</router-link>
121-
</td>
122-
<td class="text-center">{{ formatProvider(config) }}</td>
123-
<td class="text-center">{{ format(config.time) }}</td>
124-
</tr>
125-
</tbody>
107+
<div v-else class="table-responsive-sm">
108+
<table class="table dataTable selectable" aria-label="Configs">
109+
<thead>
110+
<tr>
111+
<th scope="col" class="text-left col-6 col-md-9">URL</th>
112+
<th scope="col" class="text-center col-2">Provider</th>
113+
<th scope="col" class="text-center col-2">Last Update</th>
114+
</tr>
115+
</thead>
116+
<tbody>
117+
<tr scope="row" v-for="config in configs" :key="config.url" @mouseup.left="gotToConfig(config)" @mousedown.middle="gotToConfig(config, true)">
118+
<td>
119+
<router-link @click.stop class="row-link" :to="{ name: getRouteName('config').value, params: { id: config.id } }">
120+
{{ config.url }}
121+
</router-link>
122+
</td>
123+
<td class="text-center">{{ formatProvider(config) }}</td>
124+
<td class="text-center">{{ format(config.time) }}</td>
125+
</tr>
126+
</tbody>
126127
</table>
128+
</div>
127129

128130
</template>

webui/src/components/dashboard/mail/Service.vue

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -45,23 +45,15 @@ if (serviceName){
4545
<div class="tab-pane fade show active" id="servers" role="tabpanel" aria-labelledby="servers-tab">
4646
<servers :service="service" />
4747
</div>
48-
</div>
49-
<div class="tab-content">
5048
<div class="tab-pane fade" id="mailboxes" role="tabpanel" aria-labelledby="mailboxes-tab">
5149
<mailboxes :service="service" />
5250
</div>
53-
</div>
54-
<div class="tab-content" v-if="service.rules && service.rules.length > 0">
55-
<div class="tab-pane fade" id="rules" role="tabpanel" aria-labelledby="rules-tab">
51+
<div v-if="service.rules && service.rules.length > 0" class="tab-pane fade" id="rules" role="tabpanel" aria-labelledby="rules-tab">
5652
<rules :rules="service.rules" />
5753
</div>
58-
</div>
59-
<div class="tab-content">
6054
<div class="tab-pane fade" id="settings" role="tabpanel" aria-labelledby="settings-tab">
6155
<settings :settings="service.settings" />
6256
</div>
63-
</div>
64-
<div class="tab-content">
6557
<div class="tab-pane fade" id="configs-panel" role="tabpanel" aria-labelledby="configs-tab">
6658
<config-card :configs="service.configs" :use-card="false" />
6759
</div>

0 commit comments

Comments
 (0)