]> git.openstreetmap.org Git - rails.git/commitdiff
Merge pull request #5216 from kcne/teaspoon-v2
authorAndy Allan <git@gravitystorm.co.uk>
Wed, 16 Oct 2024 15:55:33 +0000 (16:55 +0100)
committerGitHub <noreply@github.com>
Wed, 16 Oct 2024 15:55:33 +0000 (16:55 +0100)
Re-enable JavaScript unit tests using Teaspoon

1  2 
.github/workflows/tests.yml
CONTRIBUTING.md
Gemfile
Gemfile.lock

index 55e6671bfb0db9bac551e41cc1cac43086453768,f8561b7b256d6a2a2cab5ad924a9f139b67fd7e4..e5c9efa11cc3d3ac4762c2724cedc7fce92e34b5
@@@ -58,10 -58,14 +58,14 @@@ jobs
        run: bundle exec bin/yarn install
      - name: Compile assets
        run: bundle exec rails assets:precompile
+     - name: Create tmp/pids directory
+       run: mkdir -p tmp/pids
      - name: Run tests
        run: bundle exec rails test:all
+     - name: Run javascript tests
+       run: bundle exec teaspoon
      - name: Report completion to Coveralls
 -      uses: coverallsapp/github-action@v2.3.0
 +      uses: coverallsapp/github-action@v2.3.2
        with:
          github-token: ${{ secrets.github_token }}
          flag-name: ubuntu-${{ matrix.ubuntu }}-ruby-${{ matrix.ruby }}
diff --cc CONTRIBUTING.md
Simple merge
diff --cc Gemfile
Simple merge
diff --cc Gemfile.lock
Simple merge