Skip to content

Commit 10b134f

Browse files
authored
Merge branch 'develop' into dependabot/go_modules/develop/github.com/blevesearch/bleve_index_api-1.3.9
2 parents 55b8da0 + 8853265 commit 10b134f

63 files changed

Lines changed: 305 additions & 393 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.github/actions/run-frontend-tests/action.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ runs:
2323
run: docker load --input /tmp/mokapi.tar
2424
shell: bash
2525
- name: Run mokapi image
26-
run: docker run --name mokapi --rm -d -p 8090:8090 -p 8091:8091 --mount type=bind,source=$(pwd)/examples/mokapi,target=/data --env MOKAPI_Log_Level=Debug --env MOKAPI_Api_Port=8091 --env MOKAPI_Api_Path=/mokapi --env MOKAPI_Providers_File_Directory=/data ${{ inputs.image-name }}
26+
run: docker run --name mokapi --rm -d -p 8090:8090 -p 8091:8091 --mount type=bind,source=$(pwd)/webui/e2e/mocks,target=/data --env MOKAPI_Log_Level=Debug --env MOKAPI_Api_Port=8091 --env MOKAPI_Api_Path=/mokapi --env MOKAPI_Providers_File_Directory=/data ${{ inputs.image-name }}
2727
shell: bash
2828
- uses: actions/setup-node@v4
2929
with:
@@ -49,7 +49,7 @@ runs:
4949
uses: actions/upload-artifact@v4
5050
with:
5151
name: ${{ inputs.artifact-test-report }}
52-
path: webui/playwright-report
52+
path: ./webui/playwright-report
5353
- name: Save Mokapi logs
5454
if: always()
5555
run: docker logs mokapi > /var/tmp/mokapi.log 2>&1

imap/idle_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -240,9 +240,9 @@ func TestSendUpdatesWhileIdle(t *testing.T) {
240240
require.NoError(t, err)
241241
require.Equal(t, "* 1 EXPUNGE", res)
242242

243-
res, err = c.SendRaw("A01 FINISHED")
243+
res, err = c.SendRaw("DONE")
244244
require.NoError(t, err)
245-
require.Equal(t, "A01 BAD Expected DONE to end IDLE", res)
245+
require.Equal(t, "A01 OK IDLE terminated", res)
246246
}
247247

248248
func TestIdle_DisconnectWithoutDone(t *testing.T) {

webui/.gitignore

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,6 @@ dist-ssr
1414
coverage
1515
*.local
1616

17-
/cypress/videos/
18-
/cypress/screenshots/
19-
2017
# Editor directories and files
2118
.vscode/*
2219
!.vscode/extensions.json
@@ -27,8 +24,9 @@ coverage
2724
*.sln
2825
*.sw?
2926

30-
test-results/
31-
playwright-report/
3227
src/assets/docs
3328
public/sitemap.xml
3429
public/demo/
30+
31+
test-results/
32+
playwright-report/

webui/README.md

Lines changed: 0 additions & 17 deletions

0 commit comments

Comments
 (0)