From: Andy Allan <git@gravitystorm.co.uk>
Date: Wed, 16 Oct 2024 15:55:33 +0000 (+0100)
Subject: Merge pull request #5216 from kcne/teaspoon-v2
X-Git-Tag: live~515
X-Git-Url: https://git.openstreetmap.org./rails.git/commitdiff_plain/96984421ad914a86f61d172301fad952df60536c?hp=-c

Merge pull request #5216 from kcne/teaspoon-v2

Re-enable JavaScript unit tests using Teaspoon
---

96984421ad914a86f61d172301fad952df60536c
diff --combined .github/workflows/tests.yml
index 55e6671bf,f8561b7b2..e5c9efa11
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@@ -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 }}
@@@ -73,7 -77,7 +77,7 @@@
      runs-on: ubuntu-latest
      steps:
      - 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 }}
          parallel-finished: true
diff --combined CONTRIBUTING.md
index a3252807a,3c16a9863..2571b9345
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@@ -43,6 -43,12 +43,12 @@@ You can run the existing test suite wit
  bundle exec rails test:all
  ```
  
+ You can run javascript tests with:
+ 
+ ```
+ bundle exec teaspoon
+ ```
+ 
  You can view test coverage statistics by browsing the `coverage` directory.
  
  The tests are automatically run on Pull Requests and other commits via github
@@@ -77,6 -83,15 +83,6 @@@ only submit changes to the `en.yml` fil
  [Translatewiki](https://translatewiki.net/wiki/Translating:OpenStreetMap) and should
  not be included in your pull request.
  
 -### Nominatim prefixes
 -
 -I18n keys under the `geocoder.search_osm_nominatim` keyspace are managed by the
 -Nominatim maintainers. From time to time they run stats over the Nominatim
 -database, and update the list of available keys manually.
 -
 -Adding or removing keys to this list is therefore discouraged, but contributions
 -to the descriptive texts are welcome.
 -
  ### Copyright attribution
  
  The list of attributions on the /copyright page is managed by the [OSMF Licensing
diff --combined Gemfile
index a2387771a,af3b9c09f..277346b83
--- a/Gemfile
+++ b/Gemfile
@@@ -141,15 -141,10 +141,15 @@@ gem "image_processing
  # Used to validate widths
  gem "unicode-display_width"
  
 +# Lock some modules to old versions for ruby 3.1 support
 +gem "zeitwerk", "< 2.7"
 +
  # Gems useful for development
  group :development do
    gem "better_errors"
    gem "binding_of_caller"
 +  gem "danger"
 +  gem "danger-auto_label"
    gem "debug_inspector"
    gem "i18n-tasks"
    gem "listen"
@@@ -183,6 -178,8 +183,8 @@@ en
  
  group :development, :test do
    gem "annotate"
+   gem "teaspoon"
+   gem "teaspoon-mocha", "~> 2.3.3"
  
    # See https://guides.rubyonrails.org/debugging_rails_applications.html#debugging-with-the-debug-gem
    gem "debug", :require => "debug/prelude"
diff --combined Gemfile.lock
index ffbb95eb9,27e45b18d..4de807dcb
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@@ -91,7 -91,7 +91,7 @@@ GE
      autoprefixer-rails (10.4.19.0)
        execjs (~> 2)
      aws-eventstream (1.3.0)
 -    aws-partitions (1.986.0)
 +    aws-partitions (1.990.0)
      aws-sdk-core (3.209.1)
        aws-eventstream (~> 1, >= 1.3.0)
        aws-partitions (~> 1, >= 1.651.0)
@@@ -150,40 -150,16 +150,40 @@@
        xpath (~> 3.2)
      childprocess (5.1.0)
        logger (~> 1.5)
 +    claide (1.1.0)
 +    claide-plugins (0.9.2)
 +      cork
 +      nap
 +      open4 (~> 1.3)
 +    colored2 (3.1.2)
      concurrent-ruby (1.3.4)
      config (5.5.2)
        deep_merge (~> 1.2, >= 1.2.1)
        ostruct
      connection_pool (2.4.1)
 +    cork (0.3.0)
 +      colored2 (~> 3.1)
      crack (1.0.0)
        bigdecimal
        rexml
      crass (1.0.6)
      dalli (3.2.8)
 +    danger (9.5.0)
 +      claide (~> 1.0)
 +      claide-plugins (>= 0.9.2)
 +      colored2 (~> 3.1)
 +      cork (~> 0.1)
 +      faraday (>= 0.9.0, < 3.0)
 +      faraday-http-cache (~> 2.0)
 +      git (~> 1.13)
 +      kramdown (~> 2.3)
 +      kramdown-parser-gfm (~> 1.0)
 +      octokit (>= 4.0)
 +      terminal-table (>= 1, < 4)
 +    danger-auto_label (1.3.1)
 +      danger-plugin-api (~> 1.0)
 +    danger-plugin-api (1.0.0)
 +      danger (> 2.0)
      dartsass-ruby (3.0.2)
        sass-embedded (~> 1.54, < 1.67)
      dartsass-sprockets (3.0.0)
@@@ -264,8 -240,6 +264,8 @@@
        faraday-net_http (>= 2.0, < 3.4)
        json
        logger
 +    faraday-http-cache (2.5.1)
 +      faraday (>= 0.8)
      faraday-net_http (3.3.0)
        net-http
      ffi (1.17.0)
@@@ -280,9 -254,6 +280,9 @@@
      fspath (3.1.2)
      gd2-ffij (0.4.0)
        ffi (>= 1.0.0)
 +    git (1.19.1)
 +      addressable (~> 2.8)
 +      rchardet (~> 1.8)
      globalid (1.2.1)
        activesupport (>= 6.1)
      google-protobuf (3.25.5)
@@@ -340,8 -311,6 +340,8 @@@
      kgio (2.11.4)
      kramdown (2.4.0)
        rexml
 +    kramdown-parser-gfm (1.1.0)
 +      kramdown (~> 2.0)
      language_server-protocol (3.17.0.3)
      libv8-node (18.19.0.0)
      libxml-ruby (5.0.3)
@@@ -375,10 -344,9 +375,10 @@@
      multi_json (1.15.0)
      multi_xml (0.7.1)
        bigdecimal (~> 3.1)
 +    nap (1.1.0)
      net-http (0.4.1)
        uri
 -    net-imap (0.4.16)
 +    net-imap (0.4.17)
        date
        net-protocol
      net-pop (0.1.2)
@@@ -404,9 -372,6 +404,9 @@@
        rack (>= 1.2, < 4)
        snaky_hash (~> 2.0)
        version_gem (~> 1.1)
 +    octokit (9.1.0)
 +      faraday (>= 1, < 3)
 +      sawyer (~> 0.9)
      omniauth (2.0.4)
        hashie (>= 3.4.6)
        rack (>= 1.6.2, < 3)
@@@ -442,7 -407,6 +442,7 @@@
      omniauth-rails_csrf_protection (1.0.2)
        actionpack (>= 4.2)
        omniauth (~> 2.0)
 +    open4 (1.3.4)
      openstreetmap-deadlock_retry (1.3.1)
      ostruct (0.6.0)
      overcommit (0.64.0)
@@@ -463,7 -427,7 +463,7 @@@
        nio4r (~> 2.0)
      quad_tile (1.0.1)
      racc (1.8.1)
 -    rack (2.2.9)
 +    rack (2.2.10)
      rack-cors (2.0.2)
        rack (>= 2.0.0)
      rack-openid (1.4.2)
@@@ -524,7 -488,6 +524,7 @@@
      rb-fsevent (0.11.2)
      rb-inotify (0.11.1)
        ffi (~> 1.0)
 +    rchardet (1.8.0)
      rdoc (6.7.0)
        psych (>= 4.0.0)
      regexp_parser (2.9.2)
@@@ -538,7 -501,7 +538,7 @@@
      rouge (4.4.0)
      rtlcss (0.2.1)
        mini_racer (>= 0.6.3)
 -    rubocop (1.66.1)
 +    rubocop (1.67.0)
        json (~> 2.3)
        language_server-protocol (>= 3.17.0)
        parallel (~> 1.10)
@@@ -579,9 -542,6 +579,9 @@@
      sass-embedded (1.64.2)
        google-protobuf (~> 3.23)
        rake (>= 13.0.0)
 +    sawyer (0.9.2)
 +      addressable (>= 2.3.5)
 +      faraday (>= 0.17.3, < 3)
      securerandom (0.3.1)
      selenium-webdriver (4.23.0)
        base64 (~> 0.2)
@@@ -614,6 -574,10 +614,10 @@@
      stringio (3.1.1)
      strong_migrations (1.8.0)
        activerecord (>= 5.2)
+     teaspoon (1.2.2)
+       railties (>= 3.2.5)
+     teaspoon-mocha (2.3.3)
+       teaspoon (>= 1.0.0)
      terminal-table (3.0.2)
        unicode-display_width (>= 1.1.1, < 3)
      terser (1.2.4)
@@@ -621,7 -585,7 +625,7 @@@
      thor (1.3.2)
      tilt (2.4.0)
      timeout (0.4.1)
 -    turbo-rails (2.0.10)
 +    turbo-rails (2.0.11)
        actionpack (>= 6.0.0)
        railties (>= 6.0.0)
      tzinfo (2.0.6)
@@@ -674,8 -638,6 +678,8 @@@ DEPENDENCIE
    config
    connection_pool
    dalli
 +  danger
 +  danger-auto_label
    dartsass-sprockets
    debug
    debug_inspector
@@@ -748,13 -710,14 +752,15 @@@
    simplecov-lcov
    sprockets-exporters_pack
    strong_migrations (< 2.0.0)
+   teaspoon
+   teaspoon-mocha (~> 2.3.3)
    terser
    turbo-rails
    unicode-display_width
    validates_email_format_of (>= 1.5.1)
    vendorer
    webmock
 +  zeitwerk (< 2.7)
  
  BUNDLED WITH
     2.5.16