diff --git a/Gemfile b/Gemfile index ab88171..01ff0e2 100644 --- a/Gemfile +++ b/Gemfile @@ -6,6 +6,8 @@ gem 'rails', '5.0.1' ruby '2.3.4' gem 'rake' +gem 'rails-perftest' +gem 'ruby-prof', '0.15.9' # Bundle edge Rails instead: # gem 'rails', git: 'https://github.com/rails/rails' @@ -73,9 +75,7 @@ gem 'jquery-rails' gem 'powder' gem 'aruba' -#gem 'minitest', '~> 4.0', :require=> "minitest/autorun" -#gem 'minitest' # Deploy with Capistrano # gem 'capistrano' @@ -98,3 +98,6 @@ gem 'therubyracer' #For Rails 4.2 gem 'responders' + +# Locked at 5.10.1, see https://github.com/seattlerb/minitest/issues/689 +gem "minitest", "5.10.1" diff --git a/Gemfile.lock b/Gemfile.lock index 3f4a200..8700731 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -163,7 +163,7 @@ GEM mime-types-data (~> 3.2015) mime-types-data (3.2016.0521) mini_portile2 (2.2.0) - minitest (5.10.2) + minitest (5.10.1) multi_json (1.12.1) multi_test (0.1.2) mysql2 (0.4.8) @@ -210,6 +210,7 @@ GEM nokogiri (>= 1.6) rails-html-sanitizer (1.0.3) loofah (~> 2.0) + rails-perftest (0.0.7) railties (5.0.1) actionpack (= 5.0.1) activesupport (= 5.0.1) @@ -246,6 +247,7 @@ GEM rspec-mocks (~> 3.6.0) rspec-support (~> 3.6.0) rspec-support (3.6.0) + ruby-prof (0.15.9) ruby_dep (1.5.0) sass (3.4.25) sass-rails (5.0.6) @@ -318,6 +320,7 @@ DEPENDENCIES jquery-fileupload-rails jquery-rails launchy + minitest (= 5.10.1) mysql2 poltergeist powder @@ -325,10 +328,12 @@ DEPENDENCIES pry-rails rack-livereload rails (= 5.0.1) + rails-perftest rake rb-fsevent responders rspec-rails + ruby-prof (= 0.15.9) sass-rails simplecov sqlite3 @@ -343,4 +348,4 @@ RUBY VERSION ruby 2.3.4p301 BUNDLED WITH - 1.15.1 + 1.15.3 diff --git a/test/fixtures/benefits.yml b/test/fixtures/benefits.yml index c63aac0..9cfe87b 100644 --- a/test/fixtures/benefits.yml +++ b/test/fixtures/benefits.yml @@ -4,8 +4,8 @@ # model remove the '{}' from the fixture names and add the columns immediately # below each fixture, per the syntax in the comments below # -one: {} +#one: {} # column: value # -two: {} +#two: {} # column: value