Skip to content

Commit

Permalink
Merge pull request ManageIQ#348 from carbonin/remove_rails_root
Browse files Browse the repository at this point in the history
Remove references to RAILS_ROOT
  • Loading branch information
bdunne authored Apr 30, 2018
2 parents 9cd0063 + ee90116 commit e1b4546
Show file tree
Hide file tree
Showing 2 changed files with 0 additions and 11 deletions.
6 changes: 0 additions & 6 deletions lib/gems/pending/util/postgres_admin.rb
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,6 @@
require 'pathname'
require 'linux_admin'

RAILS_ROOT ||= Pathname.new(__dir__).join("../../../")

class PostgresAdmin
def self.data_directory
Pathname.new(ENV.fetch("APPLIANCE_PG_DATA"))
Expand All @@ -30,10 +28,6 @@ def self.user
"postgres".freeze
end

def self.certificate_location
RAILS_ROOT.join("certs")
end

def self.logical_volume_name
"lv_pg".freeze
end
Expand Down
5 changes: 0 additions & 5 deletions spec/spec_helper.rb
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,6 @@
# $log ||= Logger.new(STDOUT)
# $log.level = Logger::DEBUG

# For Appliance console logging tests
require 'tmpdir'
RAILS_ROOT = Pathname.new(Dir.mktmpdir("manageiq-gems-pending"))
Dir.mkdir(RAILS_ROOT.join("log"))

# Requires supporting files with custom matchers and macros, etc,
# in ./support/ and its subdirectories.
Dir[File.expand_path(File.join(__dir__, 'support/**/*.rb'))].each { |f| require f }
Expand Down

0 comments on commit e1b4546

Please sign in to comment.