Testing against minitest 5 / Rails 4.1

Gemfile

@@ -2,14 +2,14 @@ source 'https://rubygems.org'
 
 gemspec
 
-version = ENV['RAILS_VERSION'] || '3.2'
+version = ENV['RAILS_VERSION'] || '4.1'
 rails = case version
 when 'master'
   { github: 'rails/rails' }
 when '4.0-protected-attributes'
   gem 'protected_attributes'
   "~> #{version}.0"
-when '4.0'
+when /4\.0|4\.1/
   "~> #{version}.0"
 when '3.2'
   gem 'strong_parameters'

merit.gemspec

@@ -13,10 +13,9 @@ Gem::Specification.new do |s|
 
   s.add_dependency 'ambry',  '~> 0.3.0'
   s.add_development_dependency 'rails', '>= 3.2.0'
-  s.add_development_dependency 'jquery-rails', '~> 2.1'
   s.add_development_dependency 'capybara'
   s.add_development_dependency 'simplecov'
   s.add_development_dependency 'rubocop'
-  s.add_development_dependency 'minitest-rails'
+  s.add_development_dependency 'minitest-rails', '2.1.0'
   s.add_development_dependency 'mocha', '0.14'
 end

test/unit/score_test.rb

@@ -2,11 +2,8 @@
 
 describe Merit::Score do
   it 'Point#sash_id delegates to Score' do
-    score = mock()
-    score.stubs(:sash_id).returns(33)
-
-    point = Merit::Score::Point.new
-    point.stubs(:score).returns(score)
+    score = Merit::Score.new(sash_id: 33)
+    point = Merit::Score::Point.new(score: score)
 
     point.sash_id.must_be :==, score.sash_id
   end