Merge branch 'master' into new-gui

This commit is contained in:
Reinier Balt 2013-09-25 16:22:47 +02:00
commit d44538f604
18 changed files with 328 additions and 119 deletions

View file

@ -68,7 +68,6 @@ group :test do
gem "mocha", :require => false
gem "aruba", git: 'https://github.com/cucumber/aruba', :require => false # need 0.5.4 for piping files; 0.5.3 is latest
gem "simplecov"
gem "timecop", "~> 0.6.2"
# Note that > 2.14 has problems, see:
@ -82,6 +81,7 @@ group :test do
#gem "capybara-screenshot"
#gem "launchy"
gem "simplecov"
# get test coverage info on codeclimate
gem "codeclimate-test-reporter", group: :test, require: nil
end