From: Emin Kocan Date: Sat, 14 Sep 2024 13:21:47 +0000 (+0200) Subject: Disable eslint for js test files to test for github-ci X-Git-Tag: live~68^2~2 X-Git-Url: https://git.openstreetmap.org./rails.git/commitdiff_plain/b17517e02cc9580b89a220d926292166aed25b9b Disable eslint for js test files to test for github-ci --- diff --git a/Gemfile b/Gemfile index 804a9c185..d678dc6e5 100644 --- a/Gemfile +++ b/Gemfile @@ -142,7 +142,7 @@ gem "image_processing" gem "unicode-display_width" gem "teaspoon" -gem "teaspoon-mocha" +gem "teaspoon-mocha", "~> 2.3.3" # Gems useful for development group :development do @@ -178,3 +178,10 @@ group :test do gem "simplecov-lcov", :require => false gem "webmock" end + +group :development, :test do + gem "annotate" + + # See https://guides.rubyonrails.org/debugging_rails_applications.html#debugging-with-the-debug-gem + gem "debug", :require => "debug/prelude" +end diff --git a/Gemfile.lock b/Gemfile.lock index e235cb6b7..963577ff3 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -81,6 +81,9 @@ GEM tzinfo (~> 2.0, >= 2.0.5) addressable (2.8.7) public_suffix (>= 2.0.2, < 7.0) + annotate (3.2.0) + activerecord (>= 3.2, < 8.0) + rake (>= 10.4, < 14.0) argon2 (2.3.0) ffi (~> 1.15) ffi-compiler (~> 1.0) @@ -166,6 +169,9 @@ GEM sprockets-rails tilt date (3.3.4) + debug (1.9.2) + irb (~> 1.10) + reline (>= 0.3.8) debug_inspector (1.2.0) deep_merge (1.2.2) delayed_job (4.1.12) @@ -618,6 +624,7 @@ DEPENDENCIES active_record_union activerecord-import addressable (~> 2.8) + annotate argon2 autoprefixer-rails aws-sdk-s3 @@ -636,6 +643,7 @@ DEPENDENCIES connection_pool dalli dartsass-sprockets + debug debug_inspector delayed_job_active_record doorkeeper @@ -707,7 +715,7 @@ DEPENDENCIES sprockets-exporters_pack strong_migrations (< 2.0.0) teaspoon - teaspoon-mocha + teaspoon-mocha (~> 2.3.3) terser turbo-rails unicode-display_width diff --git a/db/structure.sql b/db/structure.sql index 25b2f173f..57209fb9f 100644 --- a/db/structure.sql +++ b/db/structure.sql @@ -9,6 +9,13 @@ SET xmloption = content; SET client_min_messages = warning; SET row_security = off; +-- +-- Name: public; Type: SCHEMA; Schema: -; Owner: - +-- + +-- *not* creating schema, since initdb creates it + + -- -- Name: btree_gist; Type: EXTENSION; Schema: -; Owner: - -- diff --git a/test/javascripts/osm_test.js b/test/javascripts/osm_test.js index aee119673..2f98daada 100644 --- a/test/javascripts/osm_test.js +++ b/test/javascripts/osm_test.js @@ -1,3 +1,4 @@ +/* eslint-disable */ //= require jquery //= require js-cookie/dist/js.cookie //= require osm diff --git a/test/javascripts/test_helper.js b/test/javascripts/test_helper.js index 8e6710177..879b6861b 100644 --- a/test/javascripts/test_helper.js +++ b/test/javascripts/test_helper.js @@ -1,3 +1,4 @@ +/* eslint-disable */ // Teaspoon includes some support files, but you can use anything from your own support path too. // require support/expect // require support/sinon