Skip to content

Commit

Permalink
Merge pull request #436 from LightGuard/master
Browse files Browse the repository at this point in the history
Fixing travis
  • Loading branch information
LightGuard committed Sep 27, 2014
2 parents 0af59b8 + 6d7cb13 commit 694d921
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 3 deletions.
4 changes: 2 additions & 2 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ group :development do
gem 'rspec', '~> 2.14.1'
gem 'rake', '~> 10.2.2'
gem 'guard-rspec', '~> 4.2.0', :require => false
gem 'pry', :require => false
gem 'pry-byebug', :require => false
#gem 'pry', :require => false
#gem 'pry-byebug', :require => false
end

group :test do
Expand Down
4 changes: 3 additions & 1 deletion spec/awestruct/handlers/tilt_handler_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
require 'awestruct/config'
require 'awestruct/handlers/file_handler'
require 'awestruct/handlers/tilt_handler'
require 'awestruct/engine'

require 'hashery'
require 'tilt/template'
Expand Down Expand Up @@ -106,7 +107,8 @@ def create_context
context 'when loading an engine not installed' do
specify 'should not throw exceptions; instead have the error in the rendered output' do
# setup
Awestruct::Engine.instance.config.verbose = true
@site.config.verbose = true
Awestruct::Engine.new(@site.config)
Tilt::register Tilt::BogusTemplate, '.bogus',
log = StringIO.new
$LOG = Logger.new(log)
Expand Down

0 comments on commit 694d921

Please sign in to comment.