Merge pull request #20 from matthewlehner/master

Correct deprecated methods and requires in test suite
This commit is contained in:
John Bintz 2012-12-13 16:08:23 -08:00
commit 13c50ca118
2 changed files with 2 additions and 2 deletions

View File

@ -1,7 +1,7 @@
# A sample Guardfile # A sample Guardfile
# More info at https://github.com/guard/guard#readme # More info at https://github.com/guard/guard#readme
guard 'rspec', :version => 2, :cli => '-c' do guard 'rspec', :cli => '-c' do
watch(%r{^spec/.+_spec\.rb$}) watch(%r{^spec/.+_spec\.rb$})
watch(%r{^lib/(.+)\.rb$}) { |m| "spec/#{m[1]}_spec.rb" } watch(%r{^lib/(.+)\.rb$}) { |m| "spec/#{m[1]}_spec.rb" }
watch('spec/spec_helper.rb') { "spec" } watch('spec/spec_helper.rb') { "spec" }

View File

@ -1,4 +1,4 @@
require 'mocha' require 'mocha/api'
require 'webmock/rspec' require 'webmock/rspec'
require 'rack-livereload' require 'rack-livereload'