Remove debug stuff

athena-framework · Dec 14, 2024 · 0701e79 · 0701e79
1 parent 0dd465d
commit 0701e79
Show file tree

Hide file tree

Showing 3 changed files with 90 additions and 95 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -49,70 +49,70 @@ jobs:
           SHARDS_OVERRIDE: shard.dev.yml
       - name: Ameba
         run: ./bin/ameba
-  # test_compiled:
-  #   strategy:
-  #     fail-fast: false
-  #     matrix:
-  #       crystal:
-  #         - latest
-  #         - nightly
-  #   runs-on: ubuntu-latest
-  #   steps:
-  #     - uses: actions/checkout@v4
-  #     - name: Install kcov
-  #       if: matrix.crystal == 'nightly'
-  #       run: |
-  #         sudo apt-get update &&
-  #         sudo apt-get install binutils-dev libssl-dev libcurl4-openssl-dev libelf-dev libstdc++-12-dev zlib1g-dev libdw-dev libiberty-dev
-  #         curl -L -o ./kcov.tar.gz https://github.com/SimonKagstrom/kcov/archive/refs/tags/v43.tar.gz &&
-  #         mkdir kcov-source &&
-  #         tar xzf kcov.tar.gz -C kcov-source --strip-components=1 &&
-  #         cd kcov-source &&
-  #         mkdir build &&
-  #         cd build &&
-  #         cmake .. &&
-  #         make -j$(nproc) &&
-  #         sudo make install
-  #     - name: Install Crystal
-  #       uses: crystal-lang/install-crystal@v1
-  #       with:
-  #         crystal: ${{ matrix.crystal }}
-  #     - name: Install Dependencies
-  #       run: shards install --skip-postinstall --skip-executables
-  #       env:
-  #         SHARDS_OVERRIDE: shard.dev.yml
-  #     - name: Compiled Specs
-  #       run: ./scripts/test.sh all compiled
-  #       shell: bash
-  #     - uses: codecov/codecov-action@v5
-  #       if: matrix.crystal == 'nightly' && github.event_name != 'schedule' # Only want to upload coverage report once in the matrix
-  #       with:
-  #         token: ${{ secrets.CODECOV_TOKEN }}
-  #         fail_ci_if_error: true
-  #         directory: coverage
-  #         files: '**/cov.xml' # There is no `unreachable.codecov.json` file when running _only_ compiled specs
-  #         flags: compiled
-  #         verbose: true
-  #     - uses: codecov/test-results-action@v1
-  #       if: matrix.crystal == 'nightly' && github.event_name != 'schedule' # Only want to upload coverage report once in the matrix
-  #       with:
-  #         token: ${{ secrets.CODECOV_TOKEN }}
-  #         fail_ci_if_error: true
-  #         directory: coverage
-  #         files: '**/junit.xml'
-  #         flags: compiled
-  #         verbose: true
+  test_compiled:
+    strategy:
+      fail-fast: false
+      matrix:
+        crystal:
+          - latest
+          - nightly
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - name: Install kcov
+        if: matrix.crystal == 'nightly'
+        run: |
+          sudo apt-get update &&
+          sudo apt-get install binutils-dev libssl-dev libcurl4-openssl-dev libelf-dev libstdc++-12-dev zlib1g-dev libdw-dev libiberty-dev
+          curl -L -o ./kcov.tar.gz https://github.com/SimonKagstrom/kcov/archive/refs/tags/v43.tar.gz &&
+          mkdir kcov-source &&
+          tar xzf kcov.tar.gz -C kcov-source --strip-components=1 &&
+          cd kcov-source &&
+          mkdir build &&
+          cd build &&
+          cmake .. &&
+          make -j$(nproc) &&
+          sudo make install
+      - name: Install Crystal
+        uses: crystal-lang/install-crystal@v1
+        with:
+          crystal: ${{ matrix.crystal }}
+      - name: Install Dependencies
+        run: shards install --skip-postinstall --skip-executables
+        env:
+          SHARDS_OVERRIDE: shard.dev.yml
+      - name: Compiled Specs
+        run: ./scripts/test.sh all compiled
+        shell: bash
+      - uses: codecov/codecov-action@v5
+        if: matrix.crystal == 'nightly' && github.event_name != 'schedule' # Only want to upload coverage report once in the matrix
+        with:
+          token: ${{ secrets.CODECOV_TOKEN }}
+          fail_ci_if_error: true
+          directory: coverage
+          files: '**/cov.xml' # There is no `unreachable.codecov.json` file when running _only_ compiled specs
+          flags: compiled
+          verbose: true
+      - uses: codecov/test-results-action@v1
+        if: matrix.crystal == 'nightly' && github.event_name != 'schedule' # Only want to upload coverage report once in the matrix
+        with:
+          token: ${{ secrets.CODECOV_TOKEN }}
+          fail_ci_if_error: true
+          directory: coverage
+          files: '**/junit.xml'
+          flags: compiled
+          verbose: true
   test_unit:
     strategy:
       fail-fast: false
       matrix:
         os:
           - ubuntu-latest
-          # - macos-latest
-          # - windows-latest
+          - macos-latest
+          - windows-latest
         crystal:
           - latest
-          # - nightly
+          - nightly
     runs-on: ${{ matrix.os }}
     steps:
       - uses: actions/checkout@v4
@@ -121,20 +121,20 @@ jobs:
         if: github.event_name == 'pull_request'
         with:
           fetch-depth: 0
-      # - name: Install kcov
-      #   if: matrix.os == 'ubuntu-latest' && matrix.crystal == 'nightly'
-      #   run: |
-      #     sudo apt-get update &&
-      #     sudo apt-get install binutils-dev libssl-dev libcurl4-openssl-dev libelf-dev libstdc++-12-dev zlib1g-dev libdw-dev libiberty-dev
-      #     curl -L -o ./kcov.tar.gz https://github.com/SimonKagstrom/kcov/archive/refs/tags/v43.tar.gz &&
-      #     mkdir kcov-source &&
-      #     tar xzf kcov.tar.gz -C kcov-source --strip-components=1 &&
-      #     cd kcov-source &&
-      #     mkdir build &&
-      #     cd build &&
-      #     cmake .. &&
-      #     make -j$(nproc) &&
-      #     sudo make install
+      - name: Install kcov
+        if: matrix.os == 'ubuntu-latest' && matrix.crystal == 'nightly'
+        run: |
+          sudo apt-get update &&
+          sudo apt-get install binutils-dev libssl-dev libcurl4-openssl-dev libelf-dev libstdc++-12-dev zlib1g-dev libdw-dev libiberty-dev
+          curl -L -o ./kcov.tar.gz https://github.com/SimonKagstrom/kcov/archive/refs/tags/v43.tar.gz &&
+          mkdir kcov-source &&
+          tar xzf kcov.tar.gz -C kcov-source --strip-components=1 &&
+          cd kcov-source &&
+          mkdir build &&
+          cd build &&
+          cmake .. &&
+          make -j$(nproc) &&
+          sudo make install
       - name: Install Crystal
         uses: crystal-lang/install-crystal@v1
         with:
@@ -143,26 +143,24 @@ jobs:
         run: shards install --skip-postinstall --skip-executables
         env:
           SHARDS_OVERRIDE: shard.dev.yml
-      - name: Order
-        run: crystal eval 'pp Dir["src/components/framework/spec/**/*_spec.cr"]'
       - name: Specs
-        run: ./scripts/test.sh framework unit
+        run: ./scripts/test.sh all unit
         shell: bash
-      # - uses: codecov/codecov-action@v5
-      #   if: matrix.os == 'ubuntu-latest' && matrix.crystal == 'nightly' && github.event_name != 'schedule' # Only want to upload coverage report once in the matrix
-      #   with:
-      #     token: ${{ secrets.CODECOV_TOKEN }}
-      #     fail_ci_if_error: true
-      #     directory: coverage
-      #     files: '**/cov.xml,**/unreachable.codecov.json'
-      #     flags: unit
-      #     verbose: true
-      # - uses: codecov/test-results-action@v1
-      #   if: matrix.os == 'ubuntu-latest' && matrix.crystal == 'nightly' && github.event_name != 'schedule' # Only want to upload coverage report once in the matrix
-      #   with:
-      #     token: ${{ secrets.CODECOV_TOKEN }}
-      #     fail_ci_if_error: true
-      #     directory: coverage
-      #     files: '**/junit.xml'
-      #     flags: unit
-      #     verbose: true
+      - uses: codecov/codecov-action@v5
+        if: matrix.os == 'ubuntu-latest' && matrix.crystal == 'nightly' && github.event_name != 'schedule' # Only want to upload coverage report once in the matrix
+        with:
+          token: ${{ secrets.CODECOV_TOKEN }}
+          fail_ci_if_error: true
+          directory: coverage
+          files: '**/cov.xml,**/unreachable.codecov.json'
+          flags: unit
+          verbose: true
+      - uses: codecov/test-results-action@v1
+        if: matrix.os == 'ubuntu-latest' && matrix.crystal == 'nightly' && github.event_name != 'schedule' # Only want to upload coverage report once in the matrix
+        with:
+          token: ${{ secrets.CODECOV_TOKEN }}
+          fail_ci_if_error: true
+          directory: coverage
+          files: '**/junit.xml'
+          flags: unit
+          verbose: true
diff --git a/src/components/framework/spec/spec/web_test_case_spec.cr b/src/components/framework/spec/spec/web_test_case_spec.cr
@@ -1,4 +1,4 @@
-# require "../spec_helper"
+require "../spec_helper"
 
 @[ASPEC::TestCase::Skip]
 private struct MockWebTestCase < ATH::Spec::WebTestCase

diff --git a/src/components/framework/spec/spec_helper.cr b/src/components/framework/spec/spec_helper.cr
@@ -5,9 +5,6 @@ require "../src/athena"
 require "./controllers/*"
 
 require "../src/spec"
-require "athena-event_dispatcher/spec"
-require "athena-console/spec"
-require "athena-validator/spec"
 
 Spec.before_each do
   ART.compile ATH::Routing::AnnotationRouteLoader.route_collection