test: add docker run (#126)

matter-labs · Mar 14, 2024 · 4feb99e · 4feb99e
1 parent cc39561
commit 4feb99e
Show file tree

Hide file tree

Showing 3 changed files with 55 additions and 27 deletions.
diff --git a/.github/workflows/test-cli.yml b/.github/workflows/test-cli.yml
@@ -2,25 +2,17 @@ name: Tests
 
 on: pull_request
 
-
 jobs:
-  preparation_and_running_tests:
+  tests:
     permissions:
       contents: read
     strategy:
       matrix:
-        os: [
-              ubuntu-latest,
-              windows-latest,
-              macos-latest
-            ]
-        node-version: ['18.17.1', '20.11.0'] # or 18.17.1
-        tags: [
-                "common.test.ts"
-              ]
+        os: [macos-latest, ubuntu-latest, windows-latest]
+        node-version: ['18.17.1', '20.11.0'] # lts/* for lts node
     runs-on: ${{ matrix.os }}
-              
-    name: 'Node ${{ matrix.node-version }} / ${{ matrix.os }}'
+
+    name: '${{ matrix.os }} / Node ${{ matrix.node-version }}'
     steps:
       - uses: actions/checkout@v4
 
@@ -41,5 +33,12 @@ jobs:
           CI: true
           E2E_TESTNET_PK: ${{ secrets.E2E_TESTNET_PK }}
         run: |
-          npx jest --verbose --testPathPattern=${{ matrix.tags }}
+          echo "Run tests"
+            if [ $RUNNER_OS != 'Linux' ]; then
+                echo "Run without docker tests"
+                npx jest --verbose --testPathIgnorePatterns=dev.test.ts
+            else
+                echo "Run all tests"
+                npx jest --verbose --testPathPattern=
+            fi
         shell: bash
diff --git a/test/common.test.ts b/test/common.test.ts
@@ -1,5 +1,7 @@
 import { adresses, contracts, wallet } from "./src/entities";
 import { executeCommand } from "./src/helper";
+import { setTimeout } from "timers/promises";
+
 
 describe("Common tests", () => {
 
@@ -130,19 +132,6 @@ describe("Common tests", () => {
     });
   });
 
-  //id1718 - excluded
-  xdescribe("Specific package can be updated using zksync-cli dev update module name", () => {
-    // need to find out the way how to make "npx zksync-cli dev start"
-
-    it("npx zksync-cli dev update module", () => {
-      const command = "npx zksync-cli dev update zkcli-portal";
-      const result = executeCommand(command);
-      expect(result.output).toMatch(/(Updating module)/i);
-      expect(result.output).not.toMatch(/([Ee]rror|[Ww]arning|[Ff]ail)/i);
-      expect(result.exitCode).toBe(0);
-    });
-  });
-
   //id1874
   describe("User can call read method from deployed contract on network", () => {
     it("npx zksync-cli contract read", () => {
@@ -169,6 +158,7 @@ describe("Common tests", () => {
           --contract ${contracts.sepoliaTestnet} --method "setGreeting(string _greeting) "\
           --args "New Test ARG" --private-key ${wallet.testnetPK} ${optionalRedirection}`;
       const result = executeCommand(command);
+      setTimeout(3000)
       expect(result.output).toMatch(/(Transaction submitted.)/i);
       expect(result.output).toMatch(/(Transaction processed successfully.)/i);
       expect(result.output).not.toMatch(/([Ee]rror|[Ww]arning|[Ff]ail)/i);

diff --git a/test/dev.test.ts b/test/dev.test.ts
@@ -0,0 +1,39 @@
+import { executeCommand } from "./src/helper";
+
+
+describe("Check zksync-cli dev", () => {
+
+    it("npx zksync-cli dev config", () => {
+        const command = "yes | npx zksync-cli dev config";
+        const result = executeCommand(command);
+        expect(result.exitCode).toBe(0);
+    });
+
+    it("npx zksync-cli dev start", () => {
+        const command = "npx zksync-cli dev start";
+        const result = executeCommand(command);
+        expect(result.exitCode).toBe(0);
+    });
+
+    //id1718
+    it("npx zksync-cli dev update module", () => {
+        const command = "npx zksync-cli dev update zkcli-portal";
+        const result = executeCommand(command);
+        expect(result.output).toMatch(/(Updating module)/i);
+        expect(result.exitCode).toBe(0);
+    });
+
+    it("npx zksync-cli dev restart", () => {
+        const command = "npx zksync-cli dev restart";
+        const result = executeCommand(command);
+        // console.log(result.output);
+        expect(result.exitCode).toBe(0);
+    });
+
+    it("npx zksync-cli dev stop", () => {
+        const command = "npx zksync-cli dev stop";
+        const result = executeCommand(command);
+        // console.log(result.output);
+        expect(result.exitCode).toBe(0);
+    });
+});