Merge branch 'main' into dev/filter-feature-type

shashankbrgowda · Jan 23, 2025 · ed7adf6 · ed7adf6
2 parents eee653d + 8f1c5d7
commit ed7adf6
Show file tree

Hide file tree

Showing 34 changed files with 2,020 additions and 1,632 deletions.
diff --git a/.github/workflows/deploy/compose.yml b/.github/workflows/deploy/compose.yml
@@ -29,7 +29,7 @@ services:
   client:
     build:
       args:
-        JBROWSE_VERSION: 2.13.1
+        JBROWSE_VERSION: 2.18.0
       context: .
     depends_on:
       - apollo-collaboration-server

diff --git a/.github/workflows/pull_request.yml b/.github/workflows/pull_request.yml
@@ -42,11 +42,11 @@ jobs:
           yarn --cwd packages/apollo-shared start &
           ALLOW_ROOT_USER=true ROOT_USER_PASSWORD=pass yarn --cwd packages/apollo-collaboration-server start &
       - name: Run CLI tests
-        run: python3 ./test/test.py TestCLI
+        run: yarn tsx src/test/test.ts
         working-directory: packages/apollo-cli
       # - name: Run docker tests
       #   working-directory: packages/apollo-cli
-      #   run: python3 ./test/test_docker.py
+      #   run: python3 ./src/test/test_docker.py
       - name: Upload coverage reports to Codecov
         uses: codecov/codecov-action@v4
         with:

diff --git a/packages/apollo-cli/README.md b/packages/apollo-cli/README.md
@@ -16,7 +16,7 @@ $ npm install -g @apollo-annotation/cli
 $ apollo COMMAND
 running command...
 $ apollo (--version)
-@apollo-annotation/cli/0.3.1 linux-x64 node-v20.17.0
+@apollo-annotation/cli/0.3.1 linux-x64 node-v20.13.0
 $ apollo --help [COMMAND]
 USAGE
   $ apollo COMMAND

diff --git a/packages/apollo-cli/package.json b/packages/apollo-cli/package.json
@@ -91,10 +91,12 @@
     "@oclif/test": "^3.1.3",
     "@types/chai": "^4.3.19",
     "@types/cli-progress": "^3",
+    "@types/cross-spawn": "^6.0.6",
     "@types/inquirer": "^9.0.7",
     "@types/mocha": "^10",
     "@types/node": "^18.14.2",
     "babel-plugin-istanbul": "^6.1.1",
+    "cross-spawn": "^7.0.3",
     "mocha": "^10.2.0",
     "nyc": "^15.1.0",
     "oclif": "^4.4.2",

diff --git a/packages/apollo-cli/src/test/README.md b/packages/apollo-cli/src/test/README.md
@@ -0,0 +1,51 @@
+<!-- vim-markdown-toc GFM -->
+
+- [Setup](#setup)
+- [Run CLI tests](#run-cli-tests)
+- [Run docker test](#run-docker-test)
+
+<!-- vim-markdown-toc -->
+
+These are instructions to execute the CLI tests.
+
+# Setup
+
+In VSCode open the Apollo project as container as usual (Ctrl+Shift+P then
+`Dev container: Open folder in container`). Start Apollo for CLI testing:
+Ctrl+Shift+P then `Run task` (enter) `Start-cli-test`.
+
+Alternatively, the Apollo server must be configured to accept root user access.
+For this edit `packages/apollo-collaboration-server/.development.env` as:
+
+```
+sed -i'' 's/# ALLOW_ROOT_USER=false/ALLOW_ROOT_USER=true/;
+          s/# ROOT_USER_PASSWORD=password/ROOT_USER_PASSWORD=pass/' packages/apollo-collaboration-server/.development.env
+```
+
+then restart the collaboration server to make changes effective.
+
+# Run CLI tests
+
+Change to:
+
+```
+cd Apollo3/packages/apollo-cli
+```
+
+- To run all tests:
+
+```
+* yarn tsx src/test/test.ts
+```
+
+- To run only tests matching aregular expression:
+
+```
+ yarn tsx --test-name-pattern='Print help|Feature get' src/test/test.ts
+```
+
+# Run docker test
+
+```
+yarn tsx ./src/test/test_docker.ts
+```