Skip to content

Commit 849c244

Browse files
authored
Fix parent class name generator for rails 6 (lynndylanhurley#1414)
1 parent 449a0be commit 849c244

File tree

3 files changed

+3
-3
lines changed

3 files changed

+3
-3
lines changed

lib/generators/devise_token_auth/install_generator.rb

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ def create_user_model
2626
inclusion = 'include DeviseTokenAuth::Concerns::User'
2727
unless parse_file_for_line(fname, inclusion)
2828

29-
active_record_needle = (Rails::VERSION::MAJOR == 5) ? 'ApplicationRecord' : 'ActiveRecord::Base'
29+
active_record_needle = (Rails::VERSION::MAJOR >= 5) ? 'ApplicationRecord' : 'ActiveRecord::Base'
3030
inject_into_file fname, after: "class #{user_class} < #{active_record_needle}\n" do <<-'RUBY'
3131
# Include default devise modules.
3232
devise :database_authenticatable, :registerable,

test/lib/generators/devise_token_auth/install_generator_test.rb

+1-1
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ class InstallGeneratorTest < Rails::Generators::TestCase
7070
case DEVISE_TOKEN_AUTH_ORM
7171
when :active_record
7272
# account for rails version 5
73-
active_record_needle = (Rails::VERSION::MAJOR == 5) ? 'ApplicationRecord' : 'ActiveRecord::Base'
73+
active_record_needle = (Rails::VERSION::MAJOR >= 5) ? 'ApplicationRecord' : 'ActiveRecord::Base'
7474

7575
@f = File.open(@fname, 'w') do |f|
7676
f.write <<-RUBY

test/lib/generators/devise_token_auth/install_generator_with_namespace_test.rb

+1-1
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ class InstallGeneratorTest < Rails::Generators::TestCase
7575
case DEVISE_TOKEN_AUTH_ORM
7676
when :active_record
7777
# account for rails version 5
78-
active_record_needle = (Rails::VERSION::MAJOR == 5) ? 'ApplicationRecord' : 'ActiveRecord::Base'
78+
active_record_needle = (Rails::VERSION::MAJOR >= 5) ? 'ApplicationRecord' : 'ActiveRecord::Base'
7979

8080
@f = File.open(@fname, 'w') do |f|
8181
f.write <<-RUBY

0 commit comments

Comments
 (0)