Move distributor config to its own file, re-enable pry for tests

This commit is contained in:
Rohan Mitchell
2013-09-10 09:50:16 +10:00
parent 64a3a309f5
commit 91550ac82f
3 changed files with 4 additions and 5 deletions

View File

@@ -79,7 +79,3 @@ module Openfoodweb
config.assets.precompile += ['store/all.css', 'store/all.js', 'admin/all.css', 'admin/*.js', 'admin/**/*.js', 'comfortable_mexican_sofa/*', 'search/all.css', 'search/*.js']
end
end
# YAML distributors config
DISTRIBUTOR_CONFIG = YAML.load(File.read(File.expand_path('../distributors.yml', __FILE__)))
DISTRIBUTOR_CONFIG.merge! DISTRIBUTOR_CONFIG.fetch(Rails.env, {})

View File

@@ -0,0 +1,3 @@
# YAML distributors config
DISTRIBUTOR_CONFIG = YAML.load(File.read(File.expand_path('../../distributors.yml', __FILE__)))
DISTRIBUTOR_CONFIG.merge! DISTRIBUTOR_CONFIG.fetch(Rails.env, {})

View File

@@ -5,7 +5,7 @@ SimpleCov.start
require 'rubygems'
# Require pry when we're not inside Travis-CI
#require 'pry' unless ENV['HAS_JOSH_K_SEAL_OF_APPROVAL']
require 'pry' unless ENV['HAS_JOSH_K_SEAL_OF_APPROVAL']
ENV["RAILS_ENV"] ||= 'test'
require File.expand_path("../../config/environment", __FILE__)