Skip to content

Commit 24b7620

Browse files
author
David Revelo
committed
Require rails generator explicitely & avoid constant name clash
1 parent 2166b84 commit 24b7620

2 files changed

Lines changed: 6 additions & 5 deletions

File tree

lib/graphql_devise.rb

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
# frozen_string_literal: true
22

33
require 'rails'
4+
require 'rails/generators'
45
require 'graphql'
56
require 'devise_token_auth'
67
require 'zeitwerk'

spec/rails_helper.rb

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
require 'spec_helper'
44

55
ENV['RAILS_ENV'] ||= 'test'
6-
ENGINE_ROOT = File.join(File.dirname(__FILE__), '../')
6+
GQL_DEVISE_ROOT = File.join(File.dirname(__FILE__), '../')
77

88
require File.expand_path('dummy/config/environment.rb', __dir__)
99

@@ -16,20 +16,20 @@
1616
require 'generator_spec'
1717

1818
# Load RSpec helpers.
19-
Dir[File.join(ENGINE_ROOT, 'spec/support/**/*.rb')].each { |f| require f }
19+
Dir[File.join(GQL_DEVISE_ROOT, 'spec/support/**/*.rb')].each { |f| require f }
2020

2121
begin
2222
ActiveRecord::Migrator.migrations_paths = [
23-
File.join(ENGINE_ROOT, 'spec/dummy/db/migrate'),
24-
File.join(ENGINE_ROOT, 'spec/db/migrate')
23+
File.join(GQL_DEVISE_ROOT, 'spec/dummy/db/migrate'),
24+
File.join(GQL_DEVISE_ROOT, 'spec/db/migrate')
2525
]
2626
ActiveRecord::Migration.maintain_test_schema!
2727
rescue ActiveRecord::PendingMigrationError => e
2828
puts e.to_s.strip
2929
exit 1
3030
end
3131
RSpec.configure do |config|
32-
config.fixture_path = "#{ENGINE_ROOT}/spec/fixtures"
32+
config.fixture_path = "#{GQL_DEVISE_ROOT}/spec/fixtures"
3333

3434
config.use_transactional_fixtures = true
3535

0 commit comments

Comments
 (0)