Remove unneeded configuration.orm_name

doorkeeper-gem · Dec 16, 2014 · e0ecef7 · e0ecef7
1 parent 5641f3d
commit e0ecef7
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/lib/doorkeeper/config.rb b/lib/doorkeeper/config.rb
@@ -208,10 +208,6 @@ def scopes
       @scopes ||= default_scopes + optional_scopes
     end
 
-    def orm_name
-      [:mongoid2, :mongoid3, :mongoid4].include?(orm.to_sym) ? :mongoid : orm
-    end
-
     def client_credentials_methods
       @client_credentials ||= [:from_basic, :from_params]
     end

diff --git a/spec/spec_helper_integration.rb b/spec/spec_helper_integration.rb
@@ -3,7 +3,7 @@
 TABLE_NAME_SUFFIX = ENV['table_name_suffix'] || nil
 
 orm = ENV['BUNDLE_GEMFILE'].match(/Gemfile\.(.+)\.rb/)
-DOORKEEPER_ORM = (orm && orm[1]) || :active_record
+DOORKEEPER_ORM = (orm && orm[1] || :active_record).to_sym
 
 $LOAD_PATH.unshift File.dirname(__FILE__)
 
@@ -24,7 +24,11 @@
 Rails.logger.info "====> Rails version: #{Rails.version}"
 Rails.logger.info "====> Ruby version: #{RUBY_VERSION}"
 
-require "support/orm/#{Doorkeeper.configuration.orm_name}"
+if [:mongoid2, :mongoid3, :mongoid4].include?(DOORKEEPER_ORM)
+  require "support/orm/mongoid"
+else
+  require "support/orm/#{DOORKEEPER_ORM}"
+end
 
 ENGINE_RAILS_ROOT = File.join(File.dirname(__FILE__), '../')