diff --git a/Gemfile b/Gemfile index 97a2d08..c014250 100644 --- a/Gemfile +++ b/Gemfile @@ -6,6 +6,8 @@ gem 'rails', '5.1.4.rc1' 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 d2941d9..f5c2f79 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -38,8 +38,8 @@ GEM i18n (~> 0.7) minitest (~> 5.1) tzinfo (~> 1.1) - addressable (2.5.1) - public_suffix (~> 2.0, >= 2.0.2) + addressable (2.5.2) + public_suffix (>= 2.0.2, < 4.0) arel (8.0.0) aruba (0.14.2) childprocess (~> 0.5.6) @@ -164,7 +164,7 @@ GEM mime-types-data (3.2016.0521) mini_mime (0.1.4) mini_portile2 (2.2.0) - minitest (5.10.3) + minitest (5.10.1) multi_json (1.12.1) multi_test (0.1.2) mysql2 (0.4.9) @@ -188,7 +188,7 @@ GEM slop (~> 3.4) pry-rails (0.3.6) pry (>= 0.10.4) - public_suffix (2.0.5) + public_suffix (3.0.0) rack (2.0.3) rack-livereload (0.3.16) rack @@ -211,6 +211,7 @@ GEM nokogiri (>= 1.6) rails-html-sanitizer (1.0.3) loofah (~> 2.0) + rails-perftest (0.0.7) railties (5.1.4.rc1) actionpack (= 5.1.4.rc1) activesupport (= 5.1.4.rc1) @@ -247,6 +248,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.5.1) sass-listen (~> 4.0.0) @@ -323,6 +325,7 @@ DEPENDENCIES jquery-fileupload-rails jquery-rails launchy + minitest (= 5.10.1) mysql2 poltergeist powder @@ -330,10 +333,12 @@ DEPENDENCIES pry-rails rack-livereload rails (= 5.1.4.rc1) + rails-perftest rake rb-fsevent responders rspec-rails + ruby-prof (= 0.15.9) sass-rails simplecov sqlite3 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