Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

updated snapshot and fix test #5031

Merged
merged 6 commits into from
Aug 14, 2024
Merged

updated snapshot and fix test #5031

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
035ab04
updated snapshot and fix test
Rajat-Dabade Jul 29, 2024
e30cb88
Updated snapshot and removed unnecessary tests
Rajat-Dabade Jul 29, 2024
5d0a9ca
chore: minor fix ci
Rajat-Dabade Jul 30, 2024
e36ae05
refactor: updated the mac-os version supported by github actions
Rajat-Dabade Aug 14, 2024
cff6508
reverted: mac os version
Rajat-Dabade Aug 14, 2024
c119438
refactor: updated mac os version and also changed docker-compose to d…
Rajat-Dabade Aug 14, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 2 additions & 3 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,8 +46,7 @@ jobs:
with:
path: "focalboard"
- name: npm ci
run: |
cd focalboard/webapp && npm ci && cd -
run: cd focalboard/webapp && npm ci && cd -

- name: Set up Go
uses: actions/setup-go@v3
Expand Down Expand Up @@ -97,7 +96,7 @@ jobs:
run: cd focalboard; make server-test-mini-${{matrix['db']}}

ci-mac-server:
runs-on: macos-11
runs-on: macos-12

strategy:
matrix:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/dev-release.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ jobs:
path: ${{ github.workspace }}/focalboard/linux/dist/focalboard-linux.tar.gz

macos:
runs-on: macos-11
runs-on: macos-12

steps:

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/prod-release.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ jobs:
path: ${{ github.workspace }}/focalboard/linux/dist/focalboard-linux.tar.gz

macos:
runs-on: macos-11
runs-on: macos-12

steps:

Expand Down
18 changes: 9 additions & 9 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -142,35 +142,35 @@ server-test-mysql: export FOCALBOARD_STORE_TEST_DOCKER_PORT=44446

server-test-mysql: ## Run server tests using mysql
@echo Starting docker container for mysql
docker-compose -f ./docker-testing/docker-compose-mysql.yml down -v --remove-orphans
docker-compose -f ./docker-testing/docker-compose-mysql.yml run start_dependencies
docker compose -f ./docker-testing/docker-compose-mysql.yml down -v --remove-orphans
docker compose -f ./docker-testing/docker-compose-mysql.yml run start_dependencies
cd server; go test -tags '$(BUILD_TAGS)' -race -v -coverpkg=./... -coverprofile=server-mysql-profile.coverage -count=1 -timeout=30m ./...
cd server; go tool cover -func server-mysql-profile.coverage
docker-compose -f ./docker-testing/docker-compose-mysql.yml down -v --remove-orphans
docker compose -f ./docker-testing/docker-compose-mysql.yml down -v --remove-orphans

server-test-mariadb: export FOCALBOARD_UNIT_TESTING=1
server-test-mariadb: export FOCALBOARD_STORE_TEST_DB_TYPE=mariadb
server-test-mariadb: export FOCALBOARD_STORE_TEST_DOCKER_PORT=44445

server-test-mariadb: templates-archive ## Run server tests using mysql
@echo Starting docker container for mariadb
docker-compose -f ./docker-testing/docker-compose-mariadb.yml down -v --remove-orphans
docker-compose -f ./docker-testing/docker-compose-mariadb.yml run start_dependencies
docker compose -f ./docker-testing/docker-compose-mariadb.yml down -v --remove-orphans
docker compose -f ./docker-testing/docker-compose-mariadb.yml run start_dependencies
cd server; go test -tags '$(BUILD_TAGS)' -race -v -coverpkg=./... -coverprofile=server-mariadb-profile.coverage -count=1 -timeout=30m ./...
cd server; go tool cover -func server-mariadb-profile.coverage
docker-compose -f ./docker-testing/docker-compose-mariadb.yml down -v --remove-orphans
docker compose -f ./docker-testing/docker-compose-mariadb.yml down -v --remove-orphans

server-test-postgres: export FOCALBOARD_UNIT_TESTING=1
server-test-postgres: export FOCALBOARD_STORE_TEST_DB_TYPE=postgres
server-test-postgres: export FOCALBOARD_STORE_TEST_DOCKER_PORT=44447

server-test-postgres: ## Run server tests using postgres
@echo Starting docker container for postgres
docker-compose -f ./docker-testing/docker-compose-postgres.yml down -v --remove-orphans
docker-compose -f ./docker-testing/docker-compose-postgres.yml run start_dependencies
docker compose -f ./docker-testing/docker-compose-postgres.yml down -v --remove-orphans
docker compose -f ./docker-testing/docker-compose-postgres.yml run start_dependencies
cd server; go test -tags '$(BUILD_TAGS)' -race -v -coverpkg=./... -coverprofile=server-postgres-profile.coverage -count=1 -timeout=30m ./...
cd server; go tool cover -func server-postgres-profile.coverage
docker-compose -f ./docker-testing/docker-compose-postgres.yml down -v --remove-orphans
docker compose -f ./docker-testing/docker-compose-postgres.yml down -v --remove-orphans

webapp: ## Build webapp.
cd webapp; npm run pack
Expand Down
45 changes: 1 addition & 44 deletions webapp/src/components/__snapshots__/cardDialog.test.tsx.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,13 +41,6 @@ exports[`components/cardDialog already following card 1`] = `
Attach
</span>
</button>
<button
type="button"
>
<span>
Following
</span>
</button>
</div>
<div
aria-label="menuwrapper"
Expand Down Expand Up @@ -499,13 +492,6 @@ exports[`components/cardDialog return a cardDialog readonly 1`] = `
Attach
</span>
</button>
<button
type="button"
>
<span>
Follow
</span>
</button>
</div>
<button
aria-label="Close dialog"
Expand Down Expand Up @@ -630,13 +616,6 @@ exports[`components/cardDialog return cardDialog menu content 1`] = `
Attach
</span>
</button>
<button
type="button"
>
<span>
Follow
</span>
</button>
</div>
<div
aria-label="menuwrapper"
Expand Down Expand Up @@ -979,13 +958,6 @@ exports[`components/cardDialog return cardDialog menu content and cancel delete
Attach
</span>
</button>
<button
type="button"
>
<span>
Follow
</span>
</button>
</div>
<div
aria-label="menuwrapper"
Expand Down Expand Up @@ -1191,13 +1163,6 @@ exports[`components/cardDialog should match snapshot 1`] = `
Attach
</span>
</button>
<button
type="button"
>
<span>
Follow
</span>
</button>
</div>
<div
aria-label="menuwrapper"
Expand Down Expand Up @@ -1392,15 +1357,7 @@ exports[`components/cardDialog should match snapshot without permissions 1`] = `
>
<div
class="d-flex"
>
<button
type="button"
>
<span>
Follow
</span>
</button>
</div>
/>
<div
aria-label="menuwrapper"
class="MenuWrapper"
Expand Down
16 changes: 8 additions & 8 deletions webapp/src/components/__snapshots__/centerPanel.test.tsx.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1167,13 +1167,13 @@ exports[`components/centerPanel return centerPanel and click on card to show car
class="octo-board-column"
>
<div
class="KanbanCard false"
class="KanbanCard"
draggable="true"
style="opacity: 1;"
>
<div
aria-label="menuwrapper"
class="MenuWrapper optionsMenu "
class="MenuWrapper optionsMenu"
role="button"
>
<button
Expand Down Expand Up @@ -1201,13 +1201,13 @@ exports[`components/centerPanel return centerPanel and click on card to show car
</div>
</div>
<div
class="KanbanCard false"
class="KanbanCard"
draggable="true"
style="opacity: 1;"
>
<div
aria-label="menuwrapper"
class="MenuWrapper optionsMenu "
class="MenuWrapper optionsMenu"
role="button"
>
<button
Expand Down Expand Up @@ -8974,13 +8974,13 @@ exports[`components/centerPanel should match snapshot for Kanban 1`] = `
class="octo-board-column"
>
<div
class="KanbanCard false"
class="KanbanCard"
draggable="true"
style="opacity: 1;"
>
<div
aria-label="menuwrapper"
class="MenuWrapper optionsMenu "
class="MenuWrapper optionsMenu"
role="button"
>
<button
Expand Down Expand Up @@ -9493,13 +9493,13 @@ exports[`components/centerPanel should match snapshot for Kanban, not shared 1`]
class="octo-board-column"
>
<div
class="KanbanCard false"
class="KanbanCard"
draggable="true"
style="opacity: 1;"
>
<div
aria-label="menuwrapper"
class="MenuWrapper optionsMenu "
class="MenuWrapper optionsMenu"
role="button"
>
<button
Expand Down
19 changes: 9 additions & 10 deletions webapp/src/components/__snapshots__/topBar.test.tsx.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,22 +7,21 @@ exports[`src/components/topBar should match snapshot for focalboardPlugin 1`] =
>
<a
class="link"
href="https://www.focalboard.com/fwlink/feedback-boards.html?v=1.0.0"
href="https://www.focalboard.com/fwlink/feedback-focalboard.html?v=1.0.0"
rel="noreferrer"
target="_blank"
>
Give feedback
</a>
<div
class="versionFrame"
<a
href="https://www.focalboard.com/guide/user?utm_source=webapp"
rel="noreferrer"
target="_blank"
>
<div
class="version"
title="v1.0.0"
>
v1.0.0
</div>
</div>
<i
class="CompassIcon icon-help-circle-outline HelpIcon"
/>
</a>
</div>
</div>
`;
Expand Down
Loading
Loading