fix deprecated
Joel AZEMAR
committed Apr 14, 2014
commit f16fc50950658acd19066841e63c4a39ae7fbd84
Showing 2
changed files with
14 additions
and 5 deletions
spec/spec_helper.rb
+1
-0
| @@ | @@ -1,6 +1,7 @@ |
| require 'rubygems' | |
| require 'bundler/setup' | |
| + | require 'common' |
| require 'i18n-spec' | |
| require 'coveralls' | |
spec/support/helpers.rb
+13
-5
| @@ | @@ -1,3 +1,5 @@ |
| + | require 'common' |
| + | |
| module Spec | |
| module Helpers | |
| @@ | @@ -6,16 +8,22 @@ module Spec |
| end | |
| def remove_logs | |
| - | # FileUtils.rm_rf(File.expand_path('../../fixtures/default/log', __FILE__)) |
| + | FileUtils.rm_rf(File.expand_path('../../fixtures/default/log', __FILE__)) |
| end | |
| def run_server | |
| - | path = 'spec/fixtures/default' |
| - | Locomotive::Common::Logger.setup(path, false) |
| + | Locomotive::Common.configure do |config| |
| + | path = File.join(File.expand_path('../../spec/fixtures/default/log/locomotivecms.log')) |
| + | config.notifier = Locomotive::Common::Logger.setup(path) |
| + | end |
| + | |
| reader = Locomotive::Mounter::Reader::FileSystem.instance | |
| - | reader.run!(path: path) |
| + | reader.run!(path: 'spec/fixtures/default') |
| - | require 'locomotive/steam/initializers' |
| + | # require 'locomotive/steam/initializers' |
| + | require_relative '../../lib/locomotive/steam/initializers/sprockets.rb' |
| + | require_relative '../../lib/locomotive/steam/initializers/i18n.rb' |
| + | require_relative '../../lib/locomotive/steam/initializers/dragonfly.rb' |
| Locomotive::Steam::Server.new(reader) | |
| end | |