diff --git a/ruby/.simplecov b/ruby/.simplecov index e2b9790a8..dfe6c4166 100644 --- a/ruby/.simplecov +++ b/ruby/.simplecov @@ -1,5 +1,15 @@ if ENV['COVERAGE'] == "1" + require 'simplecov-rcov' + class SimpleCov::Formatter::MergedFormatter + def format(result) + SimpleCov::Formatter::HTMLFormatter.new.format(result) + SimpleCov::Formatter::RcovFormatter.new.format(result) + end + end + + SimpleCov.formatter = SimpleCov::Formatter::MergedFormatter + SimpleCov.start do add_filter "/test/" add_filter "/bin/" diff --git a/ruby/Gemfile b/ruby/Gemfile index cf01f710b..47bababdd 100644 --- a/ruby/Gemfile +++ b/ruby/Gemfile @@ -44,6 +44,7 @@ gem 'builder' group :test do gem 'simplecov', '~> 0.7.1' + gem 'simplecov-rcov' gem 'factory_girl', '4.1.0' gem "rspec", "2.11" gem 'spork', '0.9.0' diff --git a/web/app/assets/javascripts/recordingManager.js b/web/app/assets/javascripts/recordingManager.js index 54c8bc6e7..75de3e2ef 100644 --- a/web/app/assets/javascripts/recordingManager.js +++ b/web/app/assets/javascripts/recordingManager.js @@ -115,7 +115,6 @@ "JK.RecordingManagerCommandProgress", "JK.RecordingManagerCommandStop", "JK.RecordingManagerCommandsChanged" - ) return this;