updated snapshot and fix test (#5031)

* updated snapshot and fix test * Updated snapshot and removed unnecessary tests * chore: minor fix ci * refactor: updated the mac-os version supported by github actions * reverted: mac os version * refactor: updated mac os version and also changed docker-compose to docker compose
mattermost-community · Aug 14, 2024 · d804cb0 · d804cb0
1 parent 0377216
commit d804cb0
Show file tree

Hide file tree

Showing 25 changed files with 346 additions and 2,097 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -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
@@ -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:

diff --git a/.github/workflows/dev-release.yml b/.github/workflows/dev-release.yml
@@ -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:
 

diff --git a/.github/workflows/prod-release.yml b/.github/workflows/prod-release.yml
@@ -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:
 

diff --git a/Makefile b/Makefile
@@ -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

diff --git a/webapp/src/components/__snapshots__/cardDialog.test.tsx.snap b/webapp/src/components/__snapshots__/cardDialog.test.tsx.snap
@@ -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"
@@ -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"
@@ -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"
@@ -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"
@@ -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"
@@ -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"

diff --git a/webapp/src/components/__snapshots__/centerPanel.test.tsx.snap b/webapp/src/components/__snapshots__/centerPanel.test.tsx.snap
@@ -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
@@ -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
@@ -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
@@ -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

diff --git a/webapp/src/components/__snapshots__/topBar.test.tsx.snap b/webapp/src/components/__snapshots__/topBar.test.tsx.snap
@@ -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>
 `;