Commit 961b56a6 authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets

Merge pull request #3852 from axilleas/minitest-fix

Add minitest to Gemfile. Fix #3826
parents 78ff99a7 1c1e7975
...@@ -153,6 +153,9 @@ group :development, :test do ...@@ -153,6 +153,9 @@ group :development, :test do
gem "launchy" gem "launchy"
gem 'factory_girl_rails' gem 'factory_girl_rails'
# Prevent occasions where minitest is not bundled in packaged versions of ruby (see #3826)
gem 'minitest'
# Generate Fake data # Generate Fake data
gem "ffaker" gem "ffaker"
......
...@@ -263,6 +263,7 @@ GEM ...@@ -263,6 +263,7 @@ GEM
treetop (~> 1.4.8) treetop (~> 1.4.8)
method_source (0.8.1) method_source (0.8.1)
mime-types (1.23) mime-types (1.23)
minitest (4.7.4)
modernizr (2.6.2) modernizr (2.6.2)
sprockets (~> 2.0) sprockets (~> 2.0)
multi_json (1.7.2) multi_json (1.7.2)
...@@ -538,6 +539,7 @@ DEPENDENCIES ...@@ -538,6 +539,7 @@ DEPENDENCIES
kaminari (~> 0.14.1) kaminari (~> 0.14.1)
launchy launchy
letter_opener letter_opener
minitest
modernizr (= 2.6.2) modernizr (= 2.6.2)
mysql2 mysql2
omniauth (~> 1.1.3) omniauth (~> 1.1.3)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment