Updated Gemfile.lock to get rails security updates, nokogiri and

friends updated, and other goodies. Had to update tests to work with minitest-rails 1.0 changes.
seattlerb · Sep 14, 2014 · f239aad · f239aad
1 parent 4dac56f
commit f239aad
Show file tree

Hide file tree

Showing 16 changed files with 83 additions and 79 deletions.
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -1,94 +1,96 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    ZenTest (4.9.5)
-    actionmailer (3.2.17)
-      actionpack (= 3.2.17)
+    ZenTest (4.10.1)
+    actionmailer (3.2.19)
+      actionpack (= 3.2.19)
       mail (~> 2.5.4)
-    actionpack (3.2.17)
-      activemodel (= 3.2.17)
-      activesupport (= 3.2.17)
+    actionpack (3.2.19)
+      activemodel (= 3.2.19)
+      activesupport (= 3.2.19)
       builder (~> 3.0.0)
       erubis (~> 2.7.0)
       journey (~> 1.0.4)
       rack (~> 1.4.5)
       rack-cache (~> 1.2)
       rack-test (~> 0.6.1)
       sprockets (~> 2.2.1)
-    activemodel (3.2.17)
-      activesupport (= 3.2.17)
+    activemodel (3.2.19)
+      activesupport (= 3.2.19)
       builder (~> 3.0.0)
-    activerecord (3.2.17)
-      activemodel (= 3.2.17)
-      activesupport (= 3.2.17)
+    activerecord (3.2.19)
+      activemodel (= 3.2.19)
+      activesupport (= 3.2.19)
       arel (~> 3.0.2)
       tzinfo (~> 0.3.29)
-    activeresource (3.2.17)
-      activemodel (= 3.2.17)
-      activesupport (= 3.2.17)
-    activesupport (3.2.17)
+    activeresource (3.2.19)
+      activemodel (= 3.2.19)
+      activesupport (= 3.2.19)
+    activesupport (3.2.19)
       i18n (~> 0.6, >= 0.6.4)
       multi_json (~> 1.0)
     addressable (2.3.6)
     arel (3.0.3)
     atomic (1.1.16)
     autotest-rails (4.1.2)
       ZenTest (~> 4.5)
-    bcrypt-ruby (3.0.1)
+    bcrypt (3.1.7)
+    bcrypt-ruby (3.1.5)
+      bcrypt (>= 3.1.3)
     bootstrap-sass (2.3.2.2)
       sass (~> 3.2)
-    buftok (0.1)
+    buftok (0.2.0)
     builder (3.0.4)
     coffee-rails (3.2.2)
       coffee-script (>= 2.2.0)
       railties (~> 3.2.0)
-    coffee-script (2.2.0)
+    coffee-script (2.3.0)
       coffee-script-source
       execjs
-    coffee-script-source (1.7.0)
+    coffee-script-source (1.8.0)
     descendants_tracker (0.0.3)
-    devise (2.1.2)
+    devise (2.1.4)
       bcrypt-ruby (~> 3.0)
       orm_adapter (~> 0.1)
       railties (~> 3.1)
       warden (~> 1.2.1)
     equalizer (0.0.9)
     erubis (2.7.0)
     excon (0.33.0)
-    execjs (2.0.2)
+    execjs (2.2.1)
     faraday (0.9.0)
       multipart-post (>= 1.2, < 3)
     font-awesome-rails (3.2.1.3)
       railties (>= 3.2, < 5.0)
     haml (4.0.5)
       tilt
-    heroku (3.9.6)
+    heroku (3.9.7)
       excon (= 0.33.0)
       heroku-api (= 0.3.18)
-      launchy (= 2.4.2)
-      netrc (= 0.7.7)
+      launchy (>= 0.3.2)
+      netrc (~> 0.7.7)
       rest-client (= 1.6.7)
-      rubyzip (= 0.9.9)
+      rubyzip
     heroku-api (0.3.18)
       excon (~> 0.27)
       multi_json (~> 1.8)
     hike (1.2.3)
-    http (0.5.0)
+    http (0.5.1)
       http_parser.rb
     http_parser.rb (0.5.3)
     httparty (0.8.3)
       multi_json (~> 1.0)
       multi_xml
-    i18n (0.6.9)
+    i18n (0.6.11)
     journey (1.0.4)
-    jquery-rails (3.1.0)
+    jquery-rails (3.1.2)
       railties (>= 3.0, < 5.0)
       thor (>= 0.14, < 2.0)
     jquery-ui-rails (3.0.1)
       jquery-rails
       railties (>= 3.1.0)
     json (1.8.1)
-    kaminari (0.15.1)
+    kaminari (0.16.1)
       actionpack (>= 3.0.0)
       activesupport (>= 3.0.0)
     kgio (2.9.2)
@@ -100,39 +102,39 @@ GEM
     memoizable (0.2.0)
       thread_safe (~> 0.1.3)
     mime-types (1.25.1)
-    mini_portile (0.5.3)
-    minitest (4.3.2)
-    minitest-rails (0.3)
-      minitest (~> 4.0)
-      rails (~> 3.0)
-    multi_json (1.10.0)
-    multi_xml (0.5.1)
+    mini_portile (0.6.0)
+    minitest (4.7.5)
+    minitest-rails (0.9.2)
+      minitest (~> 4.7)
+      rails (>= 3.0)
+    multi_json (1.10.1)
+    multi_xml (0.5.5)
     multipart-post (2.0.0)
     nested_form (0.3.2)
     netrc (0.7.7)
-    nokogiri (1.6.1)
-      mini_portile (~> 0.5.0)
-    orm_adapter (0.4.0)
+    nokogiri (1.6.3.1)
+      mini_portile (= 0.6.0)
+    orm_adapter (0.5.0)
     pg (0.12.2)
-    polyglot (0.3.4)
+    polyglot (0.3.5)
     rack (1.4.5)
     rack-cache (1.2)
       rack (>= 0.4)
-    rack-pjax (0.7.0)
+    rack-pjax (0.8.0)
       nokogiri (~> 1.5)
-      rack (~> 1.3)
+      rack (~> 1.1)
     rack-ssl (1.3.4)
       rack
     rack-test (0.6.2)
       rack (>= 1.0)
-    rails (3.2.17)
-      actionmailer (= 3.2.17)
-      actionpack (= 3.2.17)
-      activerecord (= 3.2.17)
-      activeresource (= 3.2.17)
-      activesupport (= 3.2.17)
+    rails (3.2.19)
+      actionmailer (= 3.2.19)
+      actionpack (= 3.2.19)
+      activerecord (= 3.2.19)
+      activeresource (= 3.2.19)
+      activesupport (= 3.2.19)
       bundler (~> 1.0)
-      railties (= 3.2.17)
+      railties (= 3.2.19)
     rails_admin (0.4.9)
       bootstrap-sass (~> 2.2)
       builder (~> 3.0)
@@ -148,9 +150,9 @@ GEM
       remotipart (~> 1.0)
       safe_yaml (~> 0.6)
       sass-rails (~> 3.1)
-    railties (3.2.17)
-      actionpack (= 3.2.17)
-      activesupport (= 3.2.17)
+    railties (3.2.19)
+      actionpack (= 3.2.19)
+      activesupport (= 3.2.19)
       rack-ssl (~> 1.3.2)
       rake (>= 0.8.7)
       rdoc (~> 3.4)
@@ -162,9 +164,9 @@ GEM
     remotipart (1.2.1)
     rest-client (1.6.7)
       mime-types (>= 1.16)
-    rubyzip (0.9.9)
+    rubyzip (1.1.6)
     safe_yaml (0.9.7)
-    sass (3.3.4)
+    sass (3.4.4)
     sass-rails (3.2.6)
       railties (~> 3.2.0)
       sass (>= 3.1.10)
@@ -175,7 +177,7 @@ GEM
       multi_json (~> 1.0)
       rack (~> 1.0)
       tilt (~> 1.1, != 1.3.0)
-    sqlite3 (1.3.5)
+    sqlite3 (1.3.9)
     strong_parameters (0.2.3)
       actionpack (~> 3.0)
       activemodel (~> 3.0)
@@ -188,8 +190,9 @@ GEM
     treetop (1.4.15)
       polyglot
       polyglot (>= 0.3.1)
-    twitter (5.0.0)
-      buftok (~> 0.1.0)
+    twitter (5.0.1)
+      addressable (~> 2.3)
+      buftok (~> 0.2.0)
       descendants_tracker (~> 0.0.1)
       equalizer (~> 0.0.7)
       faraday (>= 0.8, < 0.10)
@@ -198,15 +201,15 @@ GEM
       json (~> 1.8)
       memoizable (~> 0.2.0)
       simple_oauth (~> 0.2.0)
-    tzinfo (0.3.39)
-    uglifier (1.2.3)
+    tzinfo (0.3.41)
+    uglifier (1.2.7)
       execjs (>= 0.3.0)
-      multi_json (>= 1.0.2)
-    unicorn (4.8.2)
+      multi_json (~> 1.3)
+    unicorn (4.8.3)
       kgio (~> 2.6)
       rack
       raindrops (~> 0.7)
-    warden (1.2.1)
+    warden (1.2.3)
       rack (>= 1.0)
 
 PLATFORMS

diff --git a/test/controllers/about_controller_test.rb b/test/controllers/about_controller_test.rb
@@ -1,6 +1,6 @@
 require "minitest_helper"
 
-class AboutControllerTest < MiniTest::Rails::ActionController::TestCase
+class AboutControllerTest < ActionController::TestCase
   def test_index
     get :index
     assert_response :success

diff --git a/test/controllers/members_controller_test.rb b/test/controllers/members_controller_test.rb
@@ -1,6 +1,6 @@
 require "minitest_helper"
 
-class MembersControllerTest < MiniTest::Rails::ActionController::TestCase
+class MembersControllerTest < ActionController::TestCase
   def setup
     @member = Member.create!(:name        => "Test Name",
                              :verified    => true)
@@ -49,4 +49,4 @@ def test_create_fails_with_spam_trap
 
     assert_redirected_to members_path
   end
-end
+end
diff --git a/test/controllers/newsletter_controller_test.rb b/test/controllers/newsletter_controller_test.rb
@@ -1,6 +1,6 @@
 require "minitest_helper"
 
-class NewsletterControllerTest < MiniTest::Rails::ActionController::TestCase
+class NewsletterControllerTest < ActionController::TestCase
   def test_subscribe_to_discussion
     mock = MiniTest::Mock.new
     mock.expect :call, nil, [{'email' => '[email protected]'}]

diff --git a/test/controllers/suggestions_controller_test.rb b/test/controllers/suggestions_controller_test.rb
@@ -1,6 +1,6 @@
 require "minitest_helper"
 
-class SuggestionsControllerTest < MiniTest::Rails::ActionController::TestCase
+class SuggestionsControllerTest < ActionController::TestCase
 
   before do
     @suggestion = suggestions(:one)

diff --git a/test/controllers/talks_controller_test.rb b/test/controllers/talks_controller_test.rb
@@ -1,6 +1,6 @@
 require "minitest_helper"
 
-class TalksControllerTest < MiniTest::Rails::ActionController::TestCase
+class TalksControllerTest < ActionController::TestCase
   def setup
     @talk = Talk.create!(:title       => "My Test Talk",
                          :description => "Description",

diff --git a/test/helpers/application_helper_test.rb b/test/helpers/application_helper_test.rb
@@ -1,6 +1,6 @@
 require "minitest_helper"
 
-class ApplicationHelperTest < MiniTest::Rails::ActionView::TestCase
+class ApplicationHelperTest < ActionView::TestCase
   def test_twitter_image
     handle = "test"
     expected = "https://api.twitter.com/1/users/profile_image?screen_name=#{handle}&size=bigger"

diff --git a/test/helpers/talks_helper_test.rb b/test/helpers/talks_helper_test.rb
@@ -1,6 +1,6 @@
 require "minitest_helper"
 
-class TalksHelperTest < MiniTest::Rails::ActionView::TestCase
+class TalksHelperTest < ActionView::TestCase
   def test_indefinite_Articlerize
     assert_equal "A beginner", indefinite_Articlerize("beginner")
     assert_equal "An intermediate", indefinite_Articlerize("intermediate")

diff --git a/test/mailers/admin_mailer_test.rb b/test/mailers/admin_mailer_test.rb
@@ -1,6 +1,6 @@
 require "minitest_helper"
 
-class AdminMailerTest < MiniTest::Rails::ActionMailer::TestCase
+class AdminMailerTest < ActionMailer::TestCase
 
   def test_talk_notification_mail_fields
     talk = Talk.new(:kind              => "beginner",
@@ -21,4 +21,4 @@ def test_talk_notification_mail_fields
     assert_match /Talk about Rails 4 vulnerability fixes./, mail.encoded
   end
 
-end
+end
diff --git a/test/minitest_helper.rb b/test/minitest_helper.rb
@@ -2,6 +2,7 @@
 require File.expand_path('../../config/environment', __FILE__)
 
 require "minitest/autorun"
+require "rails/test_help"
 require "minitest/rails"
 require "minitest/pride"
 
@@ -11,7 +12,7 @@
 # Uncomment if you want awesome colorful output
 # require "minitest/pride"
 
-class MiniTest::Rails::ActiveSupport::TestCase
+class ActiveSupport::TestCase
   # Setup all fixtures in test/fixtures/*.(yml|csv) for all tests in alphabetical order.
   fixtures :all
 

diff --git a/test/models/admin_test.rb b/test/models/admin_test.rb
@@ -1,6 +1,6 @@
 require "minitest_helper"
 
-class AdminTest < MiniTest::Rails::ActiveSupport::TestCase
+class AdminTest < ActiveSupport::TestCase
   def test_validation
     admin = Admin.new(:email    => "[email protected]",
                     :password => "testtest")

diff --git a/test/models/event_test.rb b/test/models/event_test.rb
@@ -1,6 +1,6 @@
 require "minitest_helper"
 
-class EventTest < MiniTest::Rails::ActiveSupport::TestCase
+class EventTest < ActiveSupport::TestCase
   def test_valid
     e = Event.new(:date => '2014-03-26')
     assert e.valid?

diff --git a/test/models/member_test.rb b/test/models/member_test.rb
@@ -1,6 +1,6 @@
 require "minitest_helper"
 
-class MemberTest < MiniTest::Rails::ActiveSupport::TestCase
+class MemberTest < ActiveSupport::TestCase
   def test_valid
     member = Member.new(:name => "Member")
     assert member.valid?

diff --git a/test/models/project_test.rb b/test/models/project_test.rb
@@ -1,6 +1,6 @@
 require "minitest_helper"
 
-class ProjectTest < MiniTest::Rails::ActiveSupport::TestCase
+class ProjectTest < ActiveSupport::TestCase
   def test_valid
     p = Project.new(:name => "Test Project")
     assert p.valid?

diff --git a/test/models/suggestion_test.rb b/test/models/suggestion_test.rb
@@ -1,6 +1,6 @@
 require "minitest_helper"
 
-class SuggestionTest < MiniTest::Rails::ActiveSupport::TestCase
+class SuggestionTest < ActiveSupport::TestCase
   def test_valid
     suggestion = Suggestion.new(:title => "WOOT", :suggester => "Fred")
     assert suggestion.valid?

diff --git a/test/models/talk_test.rb b/test/models/talk_test.rb
@@ -1,6 +1,6 @@
 require "minitest_helper"
 
-class TalkTest < MiniTest::Rails::ActiveSupport::TestCase
+class TalkTest < ActiveSupport::TestCase
   def test_talks_restricted_to_specific_types
     beginner     = Talk.new(:kind      => "beginner",
                             :title     => "A",