Skip to content

Commit

Permalink
Merge branch 'hotfix/codeclimate' into develop
Browse files Browse the repository at this point in the history
  • Loading branch information
bogdanRada committed May 23, 2014
2 parents 42ec6b2 + ca0541b commit 2ed0b6b
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 1 deletion.
5 changes: 4 additions & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,7 @@ rvm:
- jruby-19mode
- 2.0.0
env:
- RAILS_ENV=test RACK_ENV=test
- RAILS_ENV=test RACK_ENV=test
addons:
code_climate:
repo_token: 914d2ef5cd8835295d483ff2143e58ed06bb20b25aca3e451be29f8963f76f4
1 change: 1 addition & 0 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ gem 'mocha', ">=1.1.0", :require => false
#gem "mocha", "~> 0.12.8", :require => false
gem 'webmock'
gem 'coveralls', require: false
gem "codeclimate-test-reporter", group: :test, require: nil

unless ENV["TRAVIS"]
gem 'rvm-tester'
Expand Down
6 changes: 6 additions & 0 deletions spec/spec_helper.rb
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,12 @@

at_exit do; end
end

if ENV["TRAVIS"]
require "codeclimate-test-reporter"
CodeClimate::TestReporter.start
end

require 'active_support'
require 'nori'
require 'nokogiri'
Expand Down

0 comments on commit 2ed0b6b

Please sign in to comment.