diff --git a/Gemfile b/Gemfile index c6606a9..3655043 100644 --- a/Gemfile +++ b/Gemfile @@ -73,11 +73,7 @@ gem 'friendly_id' gem 'data_migrate' gem 'meta-tags' gem 'honeybadger' -gem 'passwordless', github: 'mikker/passwordless', branch: 'master' -# gem 'passwordless' -# gem 'passwordless', '1.1.1' -# gem 'passwordless', github: 'mikker/passwordless', branch: 'master' -# gem 'passwordless', path: '/Users/yaroslavshmarov/Documents/GitHub.nosync/passwordless' +gem 'passwordless' gem 'pagy' gem 'good_job' gem 'view_component' diff --git a/Gemfile.lock b/Gemfile.lock index 43a23a3..157f51d 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,12 +1,3 @@ -GIT - remote: https://github.com/mikker/passwordless.git - revision: cd6ec4f261f218aeff82c7d1521c4a7ced506ab9 - branch: master - specs: - passwordless (1.1.0) - bcrypt (>= 3.1.11) - rails (>= 5.1.4) - GEM remote: https://rubygems.org/ specs: @@ -116,15 +107,14 @@ GEM bigdecimal rexml crass (1.0.6) - data_migrate (9.2.0) + data_migrate (9.3.0) activerecord (>= 6.1) railties (>= 6.1) date (3.3.4) debug (1.9.1) irb (~> 1.10) reline (>= 0.3.8) - drb (2.2.0) - ruby2_keywords + drb (2.2.1) erb_lint (0.5.0) activesupport better_html (>= 2.0.1) @@ -141,12 +131,12 @@ GEM net-http friendly_id (5.5.1) activerecord (>= 4.0.0) - fugit (1.9.0) + fugit (1.10.1) et-orbi (~> 1, >= 1.2.7) raabro (~> 1.4) globalid (1.2.1) activesupport (>= 6.1) - good_job (3.23.0) + good_job (3.26.1) activejob (>= 6.0.0) activerecord (>= 6.0.0) concurrent-ruby (>= 1.0.2) @@ -154,15 +144,15 @@ GEM railties (>= 6.0.0) thor (>= 0.14.1) hashdiff (1.1.0) - honeybadger (5.4.1) - i18n (1.14.1) + honeybadger (5.6.0) + i18n (1.14.4) concurrent-ruby (~> 1.0) importmap-rails (2.0.1) actionpack (>= 6.0.0) activesupport (>= 6.0.0) railties (>= 6.0.0) io-console (0.7.2) - irb (1.11.2) + irb (1.12.0) rdoc reline (>= 0.4.2) jbuilder (2.11.5) @@ -172,7 +162,7 @@ GEM language_server-protocol (3.17.0.3) launchy (2.5.2) addressable (~> 2.8) - letter_opener (1.8.1) + letter_opener (1.9.0) launchy (>= 2.2, < 3) letter_opener_web (2.0.0) actionmailer (>= 5.2) @@ -187,13 +177,13 @@ GEM net-imap net-pop net-smtp - marcel (1.0.2) + marcel (1.0.4) matrix (0.4.2) meta-tags (2.20.0) actionpack (>= 6.0.0, < 7.2) method_source (1.0.0) mini_mime (1.1.5) - minitest (5.21.2) + minitest (5.22.2) msgpack (1.7.2) mutex_m (0.2.0) net-http (0.4.1) @@ -212,12 +202,15 @@ GEM racc (~> 1.4) nokogiri (1.16.2-x86_64-linux) racc (~> 1.4) - pagy (6.4.3) + pagy (7.0.10) parallel (1.24.0) parser (3.3.0.5) ast (~> 2.4.1) racc - pg (1.5.4) + passwordless (1.4.0) + bcrypt (>= 3.1.11) + rails (>= 5.1.4) + pg (1.5.6) psych (5.1.2) stringio public_suffix (5.0.4) @@ -225,7 +218,7 @@ GEM nio4r (~> 2.0) raabro (1.4.0) racc (1.7.3) - rack (3.0.9) + rack (3.0.9.1) rack-host-redirect (1.3.0) rack rack-session (2.0.0) @@ -269,10 +262,10 @@ GEM rdoc (6.6.2) psych (>= 4.0.0) regexp_parser (2.9.0) - reline (0.4.2) + reline (0.4.3) io-console (~> 0.5) rexml (3.2.6) - rubocop (1.60.2) + rubocop (1.62.0) json (~> 2.3) language_server-protocol (>= 3.17.0) parallel (~> 1.10) @@ -280,20 +273,19 @@ GEM rainbow (>= 2.2.2, < 4.0) regexp_parser (>= 1.8, < 3.0) rexml (>= 3.2.5, < 4.0) - rubocop-ast (>= 1.30.0, < 2.0) + rubocop-ast (>= 1.31.1, < 2.0) ruby-progressbar (~> 1.7) unicode-display_width (>= 2.4.0, < 3.0) - rubocop-ast (1.30.0) - parser (>= 3.2.1.0) - rubocop-rails (2.23.1) + rubocop-ast (1.31.2) + parser (>= 3.3.0.4) + rubocop-rails (2.24.0) activesupport (>= 4.2.0) rack (>= 1.1) rubocop (>= 1.33.0, < 2.0) - rubocop-ast (>= 1.30.0, < 2.0) + rubocop-ast (>= 1.31.1, < 2.0) ruby-progressbar (1.13.0) - ruby2_keywords (0.0.5) rubyzip (2.3.2) - selenium-webdriver (4.17.0) + selenium-webdriver (4.18.1) base64 (~> 0.2) rexml (~> 3.2, >= 3.2.5) rubyzip (>= 1.2.2, < 3.0) @@ -313,9 +305,9 @@ GEM railties (>= 6.0.0) tailwindcss-rails (2.3.0-x86_64-linux) railties (>= 6.0.0) - thor (1.3.0) + thor (1.3.1) timeout (0.4.1) - turbo-rails (2.0.2) + turbo-rails (2.0.5) actionpack (>= 6.0.0) activejob (>= 6.0.0) railties (>= 6.0.0) @@ -323,7 +315,7 @@ GEM concurrent-ruby (~> 1.0) unicode-display_width (2.5.0) uri (0.13.0) - view_component (3.10.0) + view_component (3.11.0) activesupport (>= 5.2.0, < 8.0) concurrent-ruby (~> 1.0) method_source (~> 1.0) @@ -332,7 +324,7 @@ GEM activemodel (>= 6.0.0) bindex (>= 0.4.0) railties (>= 6.0.0) - webmock (3.20.0) + webmock (3.23.0) addressable (>= 2.8.0) crack (>= 0.3.2) hashdiff (>= 0.4.0, < 2.0.0) @@ -366,7 +358,7 @@ DEPENDENCIES letter_opener_web (~> 2.0) meta-tags pagy - passwordless! + passwordless pg (~> 1.1) puma rack-host-redirect diff --git a/test/test_helper.rb b/test/test_helper.rb index 343acaa..c6a3f37 100644 --- a/test/test_helper.rb +++ b/test/test_helper.rb @@ -15,4 +15,9 @@ class ActiveSupport::TestCase # WebMock.disable_net_connect!(allow_localhost: true) # required for not running real requests in test env (enforce stub) # Add more helper methods to be used by all tests here... + if defined?(ActionDispatch::IntegrationTest) + ActiveSupport.on_load(:action_dispatch_integration_test) do + include ::Passwordless::TestHelpers::RequestTestCase + end + end end