From f79a76a9c94835f1adba4468944f030ea89b9fba Mon Sep 17 00:00:00 2001 From: hyihua Date: Sat, 18 Nov 2023 22:24:02 -0500 Subject: [PATCH 01/26] Create unittest.yml --- .github/workflows/unittest.yml | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) create mode 100644 .github/workflows/unittest.yml diff --git a/.github/workflows/unittest.yml b/.github/workflows/unittest.yml new file mode 100644 index 000000000..e212603e9 --- /dev/null +++ b/.github/workflows/unittest.yml @@ -0,0 +1,33 @@ +name: Unit Test +on: + push: + paths: + - '**/*.py' + - '**/*.js' + - '.github/workflows/unittest.yml' + + pull_request: + paths: + - '**/*.py' + - '**/*.js' + - '.github/workflows/unittest.yml' + +jobs: + Run-Unit-Test: + runs-on: ubuntu-latest + + steps: + - name: Checkout Repository + uses: actions/checkout@v2 + + - name: Build Docker Image + run: docker build -t Dockerfile . + + - name: Set up Python + uses: actions/setup-python@v2 + with: + python-version: 3.10 + + - name: Run Tests + run: | + python manage.py test \ No newline at end of file From 750f12fa39fd55da4b5017839ab40c8ef6e225f9 Mon Sep 17 00:00:00 2001 From: JunhaoQiu <56094690+qchiujunhao@users.noreply.github.com> Date: Sat, 18 Nov 2023 22:38:29 -0500 Subject: [PATCH 02/26] changed python3.8 -> 3 so that I can pass the pre-commit --- .pre-commit-config.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 8852cb598..b887b4652 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -1,5 +1,5 @@ default_language_version: - python: python3.8 + python: python3 repos: - repo: https://github.com/pre-commit/pre-commit-hooks rev: v4.3.0 From 4e714870c6a321ba7265701d7e3249f96c4d3173 Mon Sep 17 00:00:00 2001 From: JunhaoQiu <56094690+qchiujunhao@users.noreply.github.com> Date: Sat, 18 Nov 2023 22:38:49 -0500 Subject: [PATCH 03/26] removed the action for push --- .github/workflows/unittest.yml | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/.github/workflows/unittest.yml b/.github/workflows/unittest.yml index e212603e9..38ea65b72 100644 --- a/.github/workflows/unittest.yml +++ b/.github/workflows/unittest.yml @@ -1,11 +1,5 @@ name: Unit Test on: - push: - paths: - - '**/*.py' - - '**/*.js' - - '.github/workflows/unittest.yml' - pull_request: paths: - '**/*.py' @@ -30,4 +24,4 @@ jobs: - name: Run Tests run: | - python manage.py test \ No newline at end of file + python manage.py test From 1329aca9ac30e834d7da0eadb47dd8099f91081b Mon Sep 17 00:00:00 2001 From: hyihua Date: Sat, 18 Nov 2023 22:40:41 -0500 Subject: [PATCH 04/26] rectify the name of the docker image --- .github/workflows/unittest.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/unittest.yml b/.github/workflows/unittest.yml index 38ea65b72..376656b3b 100644 --- a/.github/workflows/unittest.yml +++ b/.github/workflows/unittest.yml @@ -15,7 +15,7 @@ jobs: uses: actions/checkout@v2 - name: Build Docker Image - run: docker build -t Dockerfile . + run: docker build -t civictechexchange-image . - name: Set up Python uses: actions/setup-python@v2 From fc528e5164b922711a19f3d8a11d5ee40ce495a8 Mon Sep 17 00:00:00 2001 From: hyihua Date: Sat, 18 Nov 2023 22:48:31 -0500 Subject: [PATCH 05/26] Correct the python version --- .github/workflows/unittest.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/unittest.yml b/.github/workflows/unittest.yml index 376656b3b..17f0a0a36 100644 --- a/.github/workflows/unittest.yml +++ b/.github/workflows/unittest.yml @@ -20,7 +20,7 @@ jobs: - name: Set up Python uses: actions/setup-python@v2 with: - python-version: 3.10 + python-version: '3.10' - name: Run Tests run: | From f682233228a11da79a5f896f2fbef0c8012ff9e4 Mon Sep 17 00:00:00 2001 From: hyihua Date: Sat, 18 Nov 2023 23:00:26 -0500 Subject: [PATCH 06/26] set up the step to run docker container --- .github/workflows/unittest.yml | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/.github/workflows/unittest.yml b/.github/workflows/unittest.yml index 17f0a0a36..8ef52a33d 100644 --- a/.github/workflows/unittest.yml +++ b/.github/workflows/unittest.yml @@ -17,11 +17,5 @@ jobs: - name: Build Docker Image run: docker build -t civictechexchange-image . - - name: Set up Python - uses: actions/setup-python@v2 - with: - python-version: '3.10' - - - name: Run Tests - run: | - python manage.py test + - name: Run Docker Container Python Test + run: docker run test-image python manager.py test From 07212e9f80dd2aee13fb4911beb0b399d9ebb03f Mon Sep 17 00:00:00 2001 From: hyihua Date: Sat, 18 Nov 2023 23:04:01 -0500 Subject: [PATCH 07/26] change the docker image name. --- .github/workflows/unittest.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/unittest.yml b/.github/workflows/unittest.yml index 8ef52a33d..13413ab21 100644 --- a/.github/workflows/unittest.yml +++ b/.github/workflows/unittest.yml @@ -18,4 +18,4 @@ jobs: run: docker build -t civictechexchange-image . - name: Run Docker Container Python Test - run: docker run test-image python manager.py test + run: docker run civictechexchange-image python manager.py test From 9be8c220f3d061f6fcad0001fc860eb0668f427b Mon Sep 17 00:00:00 2001 From: hyihua Date: Sat, 18 Nov 2023 23:07:09 -0500 Subject: [PATCH 08/26] correct typo --- .github/workflows/unittest.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/unittest.yml b/.github/workflows/unittest.yml index 13413ab21..b1c9c5c76 100644 --- a/.github/workflows/unittest.yml +++ b/.github/workflows/unittest.yml @@ -18,4 +18,4 @@ jobs: run: docker build -t civictechexchange-image . - name: Run Docker Container Python Test - run: docker run civictechexchange-image python manager.py test + run: docker run civictechexchange-image python manage.py test From c783e5b40700eec1575af0703398bd8b83934f3f Mon Sep 17 00:00:00 2001 From: JunhaoQiu <56094690+qchiujunhao@users.noreply.github.com> Date: Sat, 18 Nov 2023 23:25:25 -0500 Subject: [PATCH 09/26] javascript unittest --- .github/workflows/unittest.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.github/workflows/unittest.yml b/.github/workflows/unittest.yml index b1c9c5c76..84f51722d 100644 --- a/.github/workflows/unittest.yml +++ b/.github/workflows/unittest.yml @@ -19,3 +19,7 @@ jobs: - name: Run Docker Container Python Test run: docker run civictechexchange-image python manage.py test + + - name: Run JavaScript Tests + run: | + docker run npm run test From e57637ea79385c4302eb61dcbeb69d1d6b6b6701 Mon Sep 17 00:00:00 2001 From: hyihua Date: Thu, 23 Nov 2023 18:40:28 -0500 Subject: [PATCH 10/26] update commands for running tests using docker-compose --- .github/workflows/unittest.yml | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/.github/workflows/unittest.yml b/.github/workflows/unittest.yml index 84f51722d..d37c9bba6 100644 --- a/.github/workflows/unittest.yml +++ b/.github/workflows/unittest.yml @@ -14,12 +14,14 @@ jobs: - name: Checkout Repository uses: actions/checkout@v2 - - name: Build Docker Image - run: docker build -t civictechexchange-image . + - name: Build and run Docker containers + run: docker-compose -f docker-compose.yml up --build --detach - - name: Run Docker Container Python Test - run: docker run civictechexchange-image python manage.py test + - name: Run Python tests + run: docker-compose -f docker-compose.yml exec myapp python manage.py test - name: Run JavaScript Tests - run: | - docker run npm run test + run: docker-compose -f docker-compose.yml exec myapp npm run test + + - name: Stop and remove containers + run: docker-compose -f path/to/your/docker-compose.yml down From 676043d8cea84cd3cdc58d7f6af38ed957012aed Mon Sep 17 00:00:00 2001 From: hyihua Date: Thu, 23 Nov 2023 19:08:15 -0500 Subject: [PATCH 11/26] run commands without using docker --- .github/workflows/unittest.yml | 42 +++++++++++++++++++++++++++------- 1 file changed, 34 insertions(+), 8 deletions(-) diff --git a/.github/workflows/unittest.yml b/.github/workflows/unittest.yml index d37c9bba6..c4ca40a80 100644 --- a/.github/workflows/unittest.yml +++ b/.github/workflows/unittest.yml @@ -14,14 +14,40 @@ jobs: - name: Checkout Repository uses: actions/checkout@v2 - - name: Build and run Docker containers - run: docker-compose -f docker-compose.yml up --build --detach + # - name: Build and run Docker containers + # run: docker-compose -f docker-compose.yml up --build --detach - - name: Run Python tests - run: docker-compose -f docker-compose.yml exec myapp python manage.py test + # - name: Run Python tests + # run: docker-compose -f docker-compose.yml exec myapp python manage.py test - - name: Run JavaScript Tests - run: docker-compose -f docker-compose.yml exec myapp npm run test + # - name: Run JavaScript Tests + # run: docker-compose -f docker-compose.yml exec myapp npm run test + + # - name: Stop and remove containers + # run: docker-compose -f path/to/your/docker-compose.yml down + + - name: Set up Python + uses: actions/setup-python@v2 + with: + python-version: 3.10 + + - name: Install Python Dependencies + run: | + pip install -r requirements.txt - - name: Stop and remove containers - run: docker-compose -f path/to/your/docker-compose.yml down + - name: Run Tests + run: | + python manage.py test + + - name: Set up Node.js + uses: actions/setup-node@v2 + with: + node-version: '16' + + - name: Install Node.js Dependencies + run: | + npm install + + - name: Run JavaScript Tests + run: | + npm run test From 9a76cd19b67e425765b2a93ba1fb1a9198ce8777 Mon Sep 17 00:00:00 2001 From: hyihua Date: Thu, 23 Nov 2023 19:18:15 -0500 Subject: [PATCH 12/26] generate .env file for using docker-compose --- .github/workflows/unittest.yml | 44 ++++++++++------------------------ 1 file changed, 12 insertions(+), 32 deletions(-) diff --git a/.github/workflows/unittest.yml b/.github/workflows/unittest.yml index c4ca40a80..85ecb4c5a 100644 --- a/.github/workflows/unittest.yml +++ b/.github/workflows/unittest.yml @@ -14,40 +14,20 @@ jobs: - name: Checkout Repository uses: actions/checkout@v2 - # - name: Build and run Docker containers - # run: docker-compose -f docker-compose.yml up --build --detach + - name: Get env File + run: cp ./example.env ./.env - # - name: Run Python tests - # run: docker-compose -f docker-compose.yml exec myapp python manage.py test + - name: Build and run Docker containers + run: docker-compose -f docker-compose.yml up --build --detach - # - name: Run JavaScript Tests - # run: docker-compose -f docker-compose.yml exec myapp npm run test + - name: Run Python tests + run: docker-compose -f docker-compose.yml exec myapp python manage.py test - # - name: Stop and remove containers - # run: docker-compose -f path/to/your/docker-compose.yml down - - - name: Set up Python - uses: actions/setup-python@v2 - with: - python-version: 3.10 - - - name: Install Python Dependencies - run: | - pip install -r requirements.txt - - - name: Run Tests - run: | - python manage.py test - - - name: Set up Node.js - uses: actions/setup-node@v2 - with: - node-version: '16' + - name: Run JavaScript Tests + run: docker-compose -f docker-compose.yml exec myapp npm run test - - name: Install Node.js Dependencies - run: | - npm install + - name: Stop and remove containers + run: docker-compose -f path/to/your/docker-compose.yml down - - name: Run JavaScript Tests - run: | - npm run test + - name: Remove Copied Env file + run: rm ./.env \ No newline at end of file From 85822b91f20ff4d081c33c26fe40c2eb80b0ab0a Mon Sep 17 00:00:00 2001 From: hyihua Date: Sat, 2 Dec 2023 16:21:19 -0500 Subject: [PATCH 13/26] print docker compose log for debugging --- .github/workflows/unittest.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/unittest.yml b/.github/workflows/unittest.yml index 85ecb4c5a..60f1e063f 100644 --- a/.github/workflows/unittest.yml +++ b/.github/workflows/unittest.yml @@ -23,6 +23,9 @@ jobs: - name: Run Python tests run: docker-compose -f docker-compose.yml exec myapp python manage.py test + - name: Print Docker Compose Logs + run: docker-compose -f docker-compose.yml logs + - name: Run JavaScript Tests run: docker-compose -f docker-compose.yml exec myapp npm run test From 37c3769bd49a0eb7143da8d956587efcdfa2a0c4 Mon Sep 17 00:00:00 2001 From: hyihua Date: Sat, 2 Dec 2023 16:54:32 -0500 Subject: [PATCH 14/26] add a service `test` in docker-compose.yml --- .github/workflows/unittest.yml | 7 ++----- docker-compose.yml | 11 +++++++++++ 2 files changed, 13 insertions(+), 5 deletions(-) diff --git a/.github/workflows/unittest.yml b/.github/workflows/unittest.yml index 60f1e063f..34646aebd 100644 --- a/.github/workflows/unittest.yml +++ b/.github/workflows/unittest.yml @@ -21,13 +21,10 @@ jobs: run: docker-compose -f docker-compose.yml up --build --detach - name: Run Python tests - run: docker-compose -f docker-compose.yml exec myapp python manage.py test - - - name: Print Docker Compose Logs - run: docker-compose -f docker-compose.yml logs + run: docker-compose -f docker-compose.yml exec test python manage.py test - name: Run JavaScript Tests - run: docker-compose -f docker-compose.yml exec myapp npm run test + run: docker-compose -f docker-compose.yml exec test npm run test - name: Stop and remove containers run: docker-compose -f path/to/your/docker-compose.yml down diff --git a/docker-compose.yml b/docker-compose.yml index f97feb739..0fac9a7d5 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -67,6 +67,17 @@ services: - ./manage.py:/code/manage.py - ./webpack.common.js:/code/webpack.common.js - ./webpack.dev.js:/code/webpack.dev.js + test: + build: . + env_file: + - ./.env + command: + - python manage.py test + - npm run test + depends_on: + - db + - create_table + - migrate volumes: demolab: From febe27ad5bbcfff8b3d0a2c03cd9e380e59760bf Mon Sep 17 00:00:00 2001 From: hyihua Date: Sat, 2 Dec 2023 17:07:38 -0500 Subject: [PATCH 15/26] update the service `test` in docker-compose.yml --- .github/workflows/unittest.yml | 4 ++-- docker-compose.yml | 15 ++++++++++----- 2 files changed, 12 insertions(+), 7 deletions(-) diff --git a/.github/workflows/unittest.yml b/.github/workflows/unittest.yml index 34646aebd..cdaa42688 100644 --- a/.github/workflows/unittest.yml +++ b/.github/workflows/unittest.yml @@ -21,10 +21,10 @@ jobs: run: docker-compose -f docker-compose.yml up --build --detach - name: Run Python tests - run: docker-compose -f docker-compose.yml exec test python manage.py test + run: docker-compose -f docker-compose.yml exec test bash -c 'python manage.py test' - name: Run JavaScript Tests - run: docker-compose -f docker-compose.yml exec test npm run test + run: docker-compose -f docker-compose.yml exec test bash -c 'npm run test' - name: Stop and remove containers run: docker-compose -f path/to/your/docker-compose.yml down diff --git a/docker-compose.yml b/docker-compose.yml index 0fac9a7d5..106f4fda2 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -71,13 +71,18 @@ services: build: . env_file: - ./.env - command: - - python manage.py test - - npm run test + command: bash -c 'python manage.py test && npm run test' + volumes: + - ./civictechprojects/:/code/civictechprojects/ + - ./common/:/code/common/ + - ./democracylab/:/code/democracylab/ + - ./oauth2/:/code/oauth2/ + - ./.babelrc:/code/.babelrc + - ./manage.py:/code/manage.py + - ./webpack.common.js:/code/webpack.common.js + - ./webpack.dev.js:/code/webpack.dev.js depends_on: - db - - create_table - - migrate volumes: demolab: From ac15ae599cd4ff3a57380821713f38ff3cea4942 Mon Sep 17 00:00:00 2001 From: hyihua Date: Sat, 2 Dec 2023 17:35:00 -0500 Subject: [PATCH 16/26] remove the steps for js test for debugging --- .github/workflows/unittest.yml | 6 +++--- docker-compose.yml | 3 ++- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/.github/workflows/unittest.yml b/.github/workflows/unittest.yml index cdaa42688..7fc60f6e4 100644 --- a/.github/workflows/unittest.yml +++ b/.github/workflows/unittest.yml @@ -21,10 +21,10 @@ jobs: run: docker-compose -f docker-compose.yml up --build --detach - name: Run Python tests - run: docker-compose -f docker-compose.yml exec test bash -c 'python manage.py test' + run: docker-compose -f docker-compose.yml exec test python manage.py test - - name: Run JavaScript Tests - run: docker-compose -f docker-compose.yml exec test bash -c 'npm run test' + # - name: Run JavaScript Tests + # run: docker-compose -f docker-compose.yml exec test bash -c 'npm run test' - name: Stop and remove containers run: docker-compose -f path/to/your/docker-compose.yml down diff --git a/docker-compose.yml b/docker-compose.yml index 106f4fda2..e40c8c2ba 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -71,8 +71,9 @@ services: build: . env_file: - ./.env - command: bash -c 'python manage.py test && npm run test' + command: python manage.py test volumes: + - demolab:/var/lib/postgresql/data/ - ./civictechprojects/:/code/civictechprojects/ - ./common/:/code/common/ - ./democracylab/:/code/democracylab/ From b0af506f2bf0ab159faf8182021baacfd477dc85 Mon Sep 17 00:00:00 2001 From: hyihua Date: Sat, 2 Dec 2023 21:55:24 -0500 Subject: [PATCH 17/26] Create unittest_without_docker.yml --- .github/workflows/unittest_without_docker.yml | 40 +++++++++++++++++++ 1 file changed, 40 insertions(+) create mode 100644 .github/workflows/unittest_without_docker.yml diff --git a/.github/workflows/unittest_without_docker.yml b/.github/workflows/unittest_without_docker.yml new file mode 100644 index 000000000..b15566261 --- /dev/null +++ b/.github/workflows/unittest_without_docker.yml @@ -0,0 +1,40 @@ +name: Run Tests + +on: + pull_request: + branches: + - main + push: + branches: + - main + +jobs: + test: + runs-on: ubuntu-latest + + steps: + - name: Checkout code + uses: actions/checkout@v2 + + - name: Set up Python + uses: actions/setup-python@v2 + with: + python-version: 3.10 + + - name: Set up Node.js + uses: actions/setup-node@v3 + with: + node-version: 16 + + - name: Install dependencies + run: | + pip install -r requirements.txt + npm install + + - name: Run Django Tests + run: | + python manage.py test + + - name: Run Node.js Tests + run: | + npm run test From 40e8b6988f19aafbfb059fec7a1cbd6f20400d3e Mon Sep 17 00:00:00 2001 From: hyihua Date: Sat, 2 Dec 2023 22:00:58 -0500 Subject: [PATCH 18/26] remove unittest_without_docker.yml --- .github/workflows/unittest.yml | 63 ++++++++++++++----- .github/workflows/unittest_without_docker.yml | 40 ------------ 2 files changed, 47 insertions(+), 56 deletions(-) delete mode 100644 .github/workflows/unittest_without_docker.yml diff --git a/.github/workflows/unittest.yml b/.github/workflows/unittest.yml index 7fc60f6e4..9f7d0079e 100644 --- a/.github/workflows/unittest.yml +++ b/.github/workflows/unittest.yml @@ -6,28 +6,59 @@ on: - '**/*.js' - '.github/workflows/unittest.yml' +# jobs: +# Run-Unit-Test: +# runs-on: ubuntu-latest + +# steps: +# - name: Checkout Repository +# uses: actions/checkout@v2 + +# - name: Get env File +# run: cp ./example.env ./.env + +# - name: Build and run Docker containers +# run: docker-compose -f docker-compose.yml up --build --detach + +# - name: Run Python tests +# run: docker-compose -f docker-compose.yml exec test python manage.py test + +# # - name: Run JavaScript Tests +# # run: docker-compose -f docker-compose.yml exec test bash -c 'npm run test' + +# - name: Stop and remove containers +# run: docker-compose -f path/to/your/docker-compose.yml down + +# - name: Remove Copied Env file +# run: rm ./.env + jobs: - Run-Unit-Test: + test: runs-on: ubuntu-latest steps: - - name: Checkout Repository - uses: actions/checkout@v2 - - - name: Get env File - run: cp ./example.env ./.env + - name: Checkout code + uses: actions/checkout@v2 - - name: Build and run Docker containers - run: docker-compose -f docker-compose.yml up --build --detach + - name: Set up Python + uses: actions/setup-python@v2 + with: + python-version: 3.10 - - name: Run Python tests - run: docker-compose -f docker-compose.yml exec test python manage.py test + - name: Set up Node.js + uses: actions/setup-node@v3 + with: + node-version: 16 - # - name: Run JavaScript Tests - # run: docker-compose -f docker-compose.yml exec test bash -c 'npm run test' + - name: Install dependencies + run: | + pip install -r requirements.txt + npm install - - name: Stop and remove containers - run: docker-compose -f path/to/your/docker-compose.yml down + - name: Run Django Tests + run: | + python manage.py test - - name: Remove Copied Env file - run: rm ./.env \ No newline at end of file + - name: Run Node.js Tests + run: | + npm run test \ No newline at end of file diff --git a/.github/workflows/unittest_without_docker.yml b/.github/workflows/unittest_without_docker.yml deleted file mode 100644 index b15566261..000000000 --- a/.github/workflows/unittest_without_docker.yml +++ /dev/null @@ -1,40 +0,0 @@ -name: Run Tests - -on: - pull_request: - branches: - - main - push: - branches: - - main - -jobs: - test: - runs-on: ubuntu-latest - - steps: - - name: Checkout code - uses: actions/checkout@v2 - - - name: Set up Python - uses: actions/setup-python@v2 - with: - python-version: 3.10 - - - name: Set up Node.js - uses: actions/setup-node@v3 - with: - node-version: 16 - - - name: Install dependencies - run: | - pip install -r requirements.txt - npm install - - - name: Run Django Tests - run: | - python manage.py test - - - name: Run Node.js Tests - run: | - npm run test From 5213e8c28b17d829a4f3bd1e6821d894c3eef5f4 Mon Sep 17 00:00:00 2001 From: hyihua Date: Sat, 2 Dec 2023 22:01:55 -0500 Subject: [PATCH 19/26] correct typo --- .github/workflows/unittest.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/unittest.yml b/.github/workflows/unittest.yml index 9f7d0079e..af7cccd23 100644 --- a/.github/workflows/unittest.yml +++ b/.github/workflows/unittest.yml @@ -43,7 +43,7 @@ jobs: - name: Set up Python uses: actions/setup-python@v2 with: - python-version: 3.10 + python-version: '3.10' - name: Set up Node.js uses: actions/setup-node@v3 From 0cdb69e17ca568d7916d6d19f51a4f1c20191ec4 Mon Sep 17 00:00:00 2001 From: hyihua Date: Sun, 10 Dec 2023 16:32:55 -0500 Subject: [PATCH 20/26] update unittest.yml by executing tests inside the docker container --- .github/workflows/unittest.yml | 63 +++++++++------------------------- 1 file changed, 16 insertions(+), 47 deletions(-) diff --git a/.github/workflows/unittest.yml b/.github/workflows/unittest.yml index af7cccd23..f62e41236 100644 --- a/.github/workflows/unittest.yml +++ b/.github/workflows/unittest.yml @@ -6,59 +6,28 @@ on: - '**/*.js' - '.github/workflows/unittest.yml' -# jobs: -# Run-Unit-Test: -# runs-on: ubuntu-latest - -# steps: -# - name: Checkout Repository -# uses: actions/checkout@v2 - -# - name: Get env File -# run: cp ./example.env ./.env - -# - name: Build and run Docker containers -# run: docker-compose -f docker-compose.yml up --build --detach - -# - name: Run Python tests -# run: docker-compose -f docker-compose.yml exec test python manage.py test - -# # - name: Run JavaScript Tests -# # run: docker-compose -f docker-compose.yml exec test bash -c 'npm run test' - -# - name: Stop and remove containers -# run: docker-compose -f path/to/your/docker-compose.yml down - -# - name: Remove Copied Env file -# run: rm ./.env - jobs: - test: + Run-Unit-Test: runs-on: ubuntu-latest steps: - - name: Checkout code - uses: actions/checkout@v2 + - name: Checkout Repository + uses: actions/checkout@v2 + + - name: Get env File + run: cp ./example.env ./.env - - name: Set up Python - uses: actions/setup-python@v2 - with: - python-version: '3.10' + - name: Build and run Docker containers + run: docker-compose -f docker-compose.yml up --build --detach - - name: Set up Node.js - uses: actions/setup-node@v3 - with: - node-version: 16 + - name: Run Python tests + run: docker-compose -f docker-compose.yml exec web python manage.py test - - name: Install dependencies - run: | - pip install -r requirements.txt - npm install + - name: Run JavaScript Tests + run: docker-compose -f docker-compose.yml exec web npm run test - - name: Run Django Tests - run: | - python manage.py test + - name: Stop and remove containers + run: docker-compose -f docker-compose.yml down - - name: Run Node.js Tests - run: | - npm run test \ No newline at end of file + - name: Remove Copied Env file + run: rm ./.env \ No newline at end of file From 487bf5dc7e6cbe7ab4e6426fa428199819f309ad Mon Sep 17 00:00:00 2001 From: JunhaoQiu <56094690+qchiujunhao@users.noreply.github.com> Date: Sun, 10 Dec 2023 16:34:45 -0500 Subject: [PATCH 21/26] deleted the test service After discussion with Yihua, we do not need this service for unittest, we use web service --- docker-compose.yml | 17 ----------------- 1 file changed, 17 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index e40c8c2ba..f97feb739 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -67,23 +67,6 @@ services: - ./manage.py:/code/manage.py - ./webpack.common.js:/code/webpack.common.js - ./webpack.dev.js:/code/webpack.dev.js - test: - build: . - env_file: - - ./.env - command: python manage.py test - volumes: - - demolab:/var/lib/postgresql/data/ - - ./civictechprojects/:/code/civictechprojects/ - - ./common/:/code/common/ - - ./democracylab/:/code/democracylab/ - - ./oauth2/:/code/oauth2/ - - ./.babelrc:/code/.babelrc - - ./manage.py:/code/manage.py - - ./webpack.common.js:/code/webpack.common.js - - ./webpack.dev.js:/code/webpack.dev.js - depends_on: - - db volumes: demolab: From c00db0c5d0e03b2620081b6c28b8665f3693bd11 Mon Sep 17 00:00:00 2001 From: hyihua Date: Sun, 10 Dec 2023 16:59:29 -0500 Subject: [PATCH 22/26] add "-T" flag to avoid "not TTY" error. --- .github/workflows/unittest.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/unittest.yml b/.github/workflows/unittest.yml index f62e41236..1a3f40fae 100644 --- a/.github/workflows/unittest.yml +++ b/.github/workflows/unittest.yml @@ -20,11 +20,12 @@ jobs: - name: Build and run Docker containers run: docker-compose -f docker-compose.yml up --build --detach + # adding the "-T" flag to tell the docker to run the command without allocating a TTY (interact with a terminal). - name: Run Python tests - run: docker-compose -f docker-compose.yml exec web python manage.py test + run: docker-compose -f docker-compose.yml exec -T web python manage.py test - name: Run JavaScript Tests - run: docker-compose -f docker-compose.yml exec web npm run test + run: docker-compose -f docker-compose.yml exec -T web npm run test - name: Stop and remove containers run: docker-compose -f docker-compose.yml down From 14a961657fc57f623c75ea0a0f5d3aed41aeb791 Mon Sep 17 00:00:00 2001 From: JunhaoQiu <56094690+qchiujunhao@users.noreply.github.com> Date: Sun, 10 Dec 2023 17:05:00 -0500 Subject: [PATCH 23/26] commented python unittest for testing other actions --- .github/workflows/unittest.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/unittest.yml b/.github/workflows/unittest.yml index f62e41236..492ae3b8b 100644 --- a/.github/workflows/unittest.yml +++ b/.github/workflows/unittest.yml @@ -20,8 +20,8 @@ jobs: - name: Build and run Docker containers run: docker-compose -f docker-compose.yml up --build --detach - - name: Run Python tests - run: docker-compose -f docker-compose.yml exec web python manage.py test + # - name: Run Python tests + # run: docker-compose -f docker-compose.yml exec web python manage.py test - name: Run JavaScript Tests run: docker-compose -f docker-compose.yml exec web npm run test @@ -30,4 +30,4 @@ jobs: run: docker-compose -f docker-compose.yml down - name: Remove Copied Env file - run: rm ./.env \ No newline at end of file + run: rm ./.env From 9d31673d606348c2ede2f77bb6f2456bbf6304f0 Mon Sep 17 00:00:00 2001 From: JunhaoQiu <56094690+qchiujunhao@users.noreply.github.com> Date: Sun, 10 Dec 2023 17:14:50 -0500 Subject: [PATCH 24/26] uncommented python unittest --- .github/workflows/unittest.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/unittest.yml b/.github/workflows/unittest.yml index 2d56ec614..52baa6ea3 100644 --- a/.github/workflows/unittest.yml +++ b/.github/workflows/unittest.yml @@ -20,8 +20,8 @@ jobs: - name: Build and run Docker containers run: docker-compose -f docker-compose.yml up --build --detach - # - name: Run Python tests - # run: docker-compose -f docker-compose.yml exec web python manage.py test + - name: Run Python tests + run: docker-compose -f docker-compose.yml exec -T web python manage.py test - name: Run JavaScript Tests run: docker-compose -f docker-compose.yml exec -T web npm run test From 6be4d8364da0586509cc70b1129253b35e5490a8 Mon Sep 17 00:00:00 2001 From: hyihua Date: Sun, 10 Dec 2023 17:16:41 -0500 Subject: [PATCH 25/26] Revert "changed python3.8 -> 3" This reverts commit 750f12fa39fd55da4b5017839ab40c8ef6e225f9. --- .pre-commit-config.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index b887b4652..8852cb598 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -1,5 +1,5 @@ default_language_version: - python: python3 + python: python3.8 repos: - repo: https://github.com/pre-commit/pre-commit-hooks rev: v4.3.0 From d6c7090d5c684d7ed8b8f1c52268aa92a536307f Mon Sep 17 00:00:00 2001 From: hyihua Date: Sun, 10 Dec 2023 17:20:07 -0500 Subject: [PATCH 26/26] add comment for flag "-T" --- .github/workflows/unittest.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/unittest.yml b/.github/workflows/unittest.yml index 52baa6ea3..f38956bd7 100644 --- a/.github/workflows/unittest.yml +++ b/.github/workflows/unittest.yml @@ -20,6 +20,7 @@ jobs: - name: Build and run Docker containers run: docker-compose -f docker-compose.yml up --build --detach + # adding the "-T" flag to tell the docker to run the command without allocating a TTY (interact with a terminal). - name: Run Python tests run: docker-compose -f docker-compose.yml exec -T web python manage.py test