Merge pull request #122 from amosproj/develop

sprint-release-7

.devcontainer/Dockerfile

@@ -4,8 +4,24 @@ ARG NODE_VERSION="lts/*"
 RUN if [ "${NODE_VERSION}" != "none" ]; then su vscode -c "umask 0002 && . /usr/local/share/nvm/nvm.sh && nvm install ${NODE_VERSION} 2>&1"; fi
 
 # [Optional] Uncomment this section to install additional OS packages.
-# RUN apt-get update && export DEBIAN_FRONTEND=noninteractive \
-#     && apt-get -y install --no-install-recommends <your-package-list-here>
+RUN apt-get update && export DEBIAN_FRONTEND=noninteractive \
+    && apt-get -y install --no-install-recommends \
+        libgtk2.0-0 \
+        libgtk-3-0 \
+        libgbm-dev \
+        libnotify-dev \
+        libgconf-2-4 \
+        libnss3 \
+        libxss1 \
+        libasound2 \
+        libxtst6 xauth xvfb
+        ## Try to support webkit
+        # # librust-gobject-sys-dev \
+        # # libgstreamer1.0-dev \
+        # # libopengl-dev \
+        # webkit2gtk-driver \
+        # libevent-dev \
+        # libjpeg-dev \
 
 # [Optional] Uncomment this line to install global node packages.
 # RUN su vscode -c "source /usr/local/share/nvm/nvm.sh && npm install -g <your-package-here>" 2>&1

.devcontainer/devcontainer.json

@@ -18,7 +18,8 @@
         "esbenp.prettier-vscode",
         "eamodio.gitlens",
         "bradlc.vscode-tailwindcss",
-        "ms-vscode.vscode-typescript"
+        "ms-vscode.vscode-typescript",
+        "ms-playwright.playwright"
       ]
     }
   },

.github/workflows/dotnet.yml

@@ -21,27 +21,28 @@ jobs:
         with:
           dotnet-version: 6.0.x
 
-      - name: List files
-        run: ls -las
+      - name: Install pycorbura
+        run: pip install pycobertura
+
+      - name: Remove untestable files
+        run: |
+          rm -rf ../Deskstar/Migrations \
+          && rm -rf ../Deskstar/Controllers
 
       - name: Restore dependencies
-        run: dotnet restore && dotnet restore
+        run: dotnet restore
 
       - name: Build
         run: dotnet build --no-restore
 
       - name: Test
         run: dotnet test --no-build --verbosity normal --collect:"XPlat Code Coverage" --logger trx --results-directory coverage
+
       - name: Copy Coverage to Predictable Location
         run: cp coverage/*/coverage.cobertura.xml coverage/coverage.cobertura.xml
 
-      - name: Code Coverage Summary Report
-        uses: irongut/[email protected]
-        with:
-          filename: ./src/deskstar-backend/Teststar.Tests/coverage/coverage.cobertura.xml
-          badge: true
-          format: 'markdown'
-          output: 'both'
+      - name: Run pycobertura on coverage.corbertura.xml
+        run: pycobertura show coverage/coverage.cobertura.xml
 
       - name: Upload coverage output to artifacts
         uses: actions/upload-artifact@v3

.github/workflows/next.yml

@@ -17,20 +17,35 @@ jobs:
         working-directory: ./src/deskstar-frontend
 
     steps:
-    - uses: actions/checkout@v3
-
-    - name: Install NodeJS
-      uses: actions/setup-node@v3
-      with:
-        node-version: '16.16.0'
-        cache: 'yarn'
-        cache-dependency-path: './src/deskstar-frontend/yarn.lock'
-
-    - name: Install dependencies
-      run: yarn install
-
-    - name: Build Next.js app
-      run: yarn build 
-
-    # - name: Test Next App
-      # run: yarn test 
+      - uses: actions/checkout@v3
+
+      - name: Install NodeJS
+        uses: actions/setup-node@v3
+        with:
+          node-version: "16.16.0"
+          cache: "yarn"
+          cache-dependency-path: "./src/deskstar-frontend/yarn.lock"
+
+      - name: Install dependencies
+        run: yarn install
+
+      - name: Build Next.js app
+        run: yarn build
+
+  test:
+    runs-on: ubuntu-latest
+    defaults:
+      run:
+        working-directory: ./src/deskstar-frontend
+    steps:
+      - uses: actions/checkout@v3
+      - uses: actions/setup-node@v3
+
+      - name: Install dependencies
+        run: yarn install
+
+      - name: Install playwright browsers
+        run: yarn run playwright install --with-deps
+
+      - name: Test Next App
+        run: yarn test --reporter github

.gitignore

@@ -36,3 +36,4 @@ bin/
 .DS_Store
 src/deskstar-backend/DeskstarSolution.sln.DotSettings.user
 *.cs~
+src/deskstar-backend/Deskstar/out/