Merge remote-tracking branch 'origin/master'

Arquisoft · May 2, 2022 · df15096 · df15096
2 parents 4e606ce + 382d435
commit df15096
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 12 deletions.
diff --git a/.github/workflows/asw2122.yml b/.github/workflows/asw2122.yml
@@ -32,18 +32,18 @@ jobs:
     - run: npm ci
     - run: npm test
     - uses: codecov/codecov-action@v2
-  e2e-tests:
-     needs: [unit-test-webapp, unit-test-restapi]
-     runs-on: ubuntu-latest
-     steps:
-     - uses: actions/checkout@v2
-     - uses: actions/setup-node@v2
-       with:
-         node-version: 16
-     - run: npm --prefix webapp install
-     - run: npm --prefix restapi install
-     - run: npm --prefix webapp run build
-     - run: npm --prefix webapp run test:e2e
+  #e2e-tests:
+  #   needs: [unit-test-webapp, unit-test-restapi]
+  #   runs-on: ubuntu-latest
+  #   steps:
+  #   - uses: actions/checkout@v2
+  #   - uses: actions/setup-node@v2
+  #     with:
+  #       node-version: 16
+  #   - run: npm --prefix webapp install
+  #   - run: npm --prefix restapi install
+  #   - run: npm --prefix webapp run build
+  #   - run: npm --prefix webapp run test:e2e
   docker-push-webapp:
     name: Push webapp Docker Image to GitHub Packages
     runs-on: ubuntu-latest

diff --git a/docs/index.adoc b/docs/index.adoc
@@ -91,6 +91,10 @@ include::11_technical_risks.adoc[]
 // 12. Glossary
 include::12_glossary.adoc[]
 
+<<<<
+// 13. Testing
+include::13_testing.adoc[]
+
 <<<<
 // About
 include::about-arc42.adoc[]