From 00af6ef9deb8bc4f7eca233276c3c40e554a2b26 Mon Sep 17 00:00:00 2001 From: Maikel Linke Date: Wed, 13 Jan 2016 12:11:42 +1100 Subject: [PATCH] cleanup knapsack integration --- spec/spec_helper.rb | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb index b398eba25c..80d7c2eeb7 100644 --- a/spec/spec_helper.rb +++ b/spec/spec_helper.rb @@ -1,13 +1,10 @@ -require 'knapsack' - -# CUSTOM_CONFIG_GOES_HERE - -Knapsack::Adapters::RSpecAdapter.bind - 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['CI'] + +require 'knapsack' +Knapsack::Adapters::RSpecAdapter.bind ENV["RAILS_ENV"] ||= 'test' require File.expand_path("../../config/environment", __FILE__)