mirror of
https://github.com/ether/etherpad-lite.git
synced 2025-04-24 17:36:14 -04:00
restructure: Prefix bin/
and tests/
with src/
This is a follow-up to commit
2ea8ea1275
.
This commit is contained in:
parent
2ea8ea1275
commit
8b28e00784
51 changed files with 182 additions and 170 deletions
8
.github/workflows/backend-tests.yml
vendored
8
.github/workflows/backend-tests.yml
vendored
|
@ -24,11 +24,11 @@ jobs:
|
|||
sudo apt install -y --no-install-recommends libreoffice libreoffice-pdfimport
|
||||
|
||||
- name: Install all dependencies and symlink for ep_etherpad-lite
|
||||
run: bin/installDeps.sh
|
||||
run: src/bin/installDeps.sh
|
||||
|
||||
# configures some settings and runs npm run test
|
||||
- name: Run the backend tests
|
||||
run: tests/frontend/travis/runnerBackend.sh
|
||||
run: src/tests/frontend/travis/runnerBackend.sh
|
||||
|
||||
withplugins:
|
||||
# run on pushes to any branch
|
||||
|
@ -73,8 +73,8 @@ jobs:
|
|||
# if npm correctly hoists the dependencies, the hoisting seems to confuse
|
||||
# tools such as `npm outdated`, `npm update`, and some ESLint rules.
|
||||
- name: Install all dependencies and symlink for ep_etherpad-lite
|
||||
run: bin/installDeps.sh
|
||||
run: src/bin/installDeps.sh
|
||||
|
||||
# configures some settings and runs npm run test
|
||||
- name: Run the backend tests
|
||||
run: tests/frontend/travis/runnerBackend.sh
|
||||
run: src/tests/frontend/travis/runnerBackend.sh
|
||||
|
|
2
.github/workflows/dockerfile.yml
vendored
2
.github/workflows/dockerfile.yml
vendored
|
@ -21,6 +21,6 @@ jobs:
|
|||
run: |
|
||||
docker build -t etherpad:test .
|
||||
docker run -d -p 9001:9001 etherpad:test
|
||||
./bin/installDeps.sh
|
||||
./src/bin/installDeps.sh
|
||||
sleep 3 # delay for startup?
|
||||
cd src && npm run test-container
|
||||
|
|
14
.github/workflows/frontend-tests.yml
vendored
14
.github/workflows/frontend-tests.yml
vendored
|
@ -17,10 +17,10 @@ jobs:
|
|||
SAUCE_USERNAME: ${{ secrets.SAUCE_USERNAME }}
|
||||
SAUCE_ACCESS_KEY: ${{ secrets.SAUCE_ACCESS_KEY }}
|
||||
TRAVIS_JOB_NUMBER: ${{ github.run_id }}-${{ github.run_number }}-${{ github.job }}
|
||||
run: tests/frontend/travis/sauce_tunnel.sh
|
||||
run: src/tests/frontend/travis/sauce_tunnel.sh
|
||||
|
||||
- name: Install all dependencies and symlink for ep_etherpad-lite
|
||||
run: bin/installDeps.sh
|
||||
run: src/bin/installDeps.sh
|
||||
|
||||
- name: export GIT_HASH to env
|
||||
id: environment
|
||||
|
@ -37,7 +37,7 @@ jobs:
|
|||
TRAVIS_JOB_NUMBER: ${{ github.run_id }}-${{ github.run_number }}-${{ github.job }}
|
||||
GIT_HASH: ${{ steps.environment.outputs.sha_short }}
|
||||
run: |
|
||||
tests/frontend/travis/runner.sh
|
||||
src/tests/frontend/travis/runner.sh
|
||||
|
||||
withplugins:
|
||||
name: with plugins
|
||||
|
@ -53,7 +53,7 @@ jobs:
|
|||
SAUCE_USERNAME: ${{ secrets.SAUCE_USERNAME }}
|
||||
SAUCE_ACCESS_KEY: ${{ secrets.SAUCE_ACCESS_KEY }}
|
||||
TRAVIS_JOB_NUMBER: ${{ github.run_id }}-${{ github.run_number }}-${{ github.job }}
|
||||
run: tests/frontend/travis/sauce_tunnel.sh
|
||||
run: src/tests/frontend/travis/sauce_tunnel.sh
|
||||
|
||||
- name: Install Etherpad plugins
|
||||
run: >
|
||||
|
@ -79,7 +79,7 @@ jobs:
|
|||
# if npm correctly hoists the dependencies, the hoisting seems to confuse
|
||||
# tools such as `npm outdated`, `npm update`, and some ESLint rules.
|
||||
- name: Install all dependencies and symlink for ep_etherpad-lite
|
||||
run: bin/installDeps.sh
|
||||
run: src/bin/installDeps.sh
|
||||
|
||||
- name: export GIT_HASH to env
|
||||
id: environment
|
||||
|
@ -90,7 +90,7 @@ jobs:
|
|||
|
||||
# XXX we should probably run all tests, because plugins could effect their results
|
||||
- name: Remove standard frontend test files, so only plugin tests are run
|
||||
run: rm tests/frontend/specs/*
|
||||
run: rm src/tests/frontend/specs/*
|
||||
|
||||
- name: Run the frontend tests
|
||||
shell: bash
|
||||
|
@ -100,4 +100,4 @@ jobs:
|
|||
TRAVIS_JOB_NUMBER: ${{ github.run_id }}-${{ github.run_number }}-${{ github.job }}
|
||||
GIT_HASH: ${{ steps.environment.outputs.sha_short }}
|
||||
run: |
|
||||
tests/frontend/travis/runner.sh
|
||||
src/tests/frontend/travis/runner.sh
|
||||
|
|
8
.github/workflows/load-test.yml
vendored
8
.github/workflows/load-test.yml
vendored
|
@ -18,13 +18,13 @@ jobs:
|
|||
uses: actions/checkout@v2
|
||||
|
||||
- name: Install all dependencies and symlink for ep_etherpad-lite
|
||||
run: bin/installDeps.sh
|
||||
run: src/bin/installDeps.sh
|
||||
|
||||
- name: Install etherpad-load-test
|
||||
run: sudo npm install -g etherpad-load-test
|
||||
|
||||
- name: Run load test
|
||||
run: tests/frontend/travis/runnerLoadTest.sh
|
||||
run: src/tests/frontend/travis/runnerLoadTest.sh
|
||||
|
||||
withplugins:
|
||||
# run on pushes to any branch
|
||||
|
@ -66,8 +66,8 @@ jobs:
|
|||
# if npm correctly hoists the dependencies, the hoisting seems to confuse
|
||||
# tools such as `npm outdated`, `npm update`, and some ESLint rules.
|
||||
- name: Install all dependencies and symlink for ep_etherpad-lite
|
||||
run: bin/installDeps.sh
|
||||
run: src/bin/installDeps.sh
|
||||
|
||||
# configures some settings and runs npm run test
|
||||
- name: Run load test
|
||||
run: tests/frontend/travis/runnerLoadTest.sh
|
||||
run: src/tests/frontend/travis/runnerLoadTest.sh
|
||||
|
|
8
.github/workflows/rate-limit.yml
vendored
8
.github/workflows/rate-limit.yml
vendored
|
@ -22,8 +22,8 @@ jobs:
|
|||
- name: build docker image
|
||||
run: |
|
||||
docker build -f Dockerfile -t epl-debian-slim .
|
||||
docker build -f tests/ratelimit/Dockerfile.nginx -t nginx-latest .
|
||||
docker build -f tests/ratelimit/Dockerfile.anotherip -t anotherip .
|
||||
docker build -f src/tests/ratelimit/Dockerfile.nginx -t nginx-latest .
|
||||
docker build -f src/tests/ratelimit/Dockerfile.anotherip -t anotherip .
|
||||
- name: run docker images
|
||||
run: |
|
||||
docker run --name etherpad-docker -p 9000:9001 --rm --network ep_net --ip 172.23.42.2 -e 'TRUST_PROXY=true' epl-debian-slim &
|
||||
|
@ -31,9 +31,9 @@ jobs:
|
|||
docker run --rm --network ep_net --ip 172.23.42.3 --name anotherip -dt anotherip
|
||||
|
||||
- name: install dependencies and create symlink for ep_etherpad-lite
|
||||
run: bin/installDeps.sh
|
||||
run: src/bin/installDeps.sh
|
||||
|
||||
- name: run rate limit test
|
||||
run: |
|
||||
cd tests/ratelimit
|
||||
cd src/tests/ratelimit
|
||||
./testlimits.sh
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue