From 273753e336f3b07aae6b987a7bbd1c2cc8896179 Mon Sep 17 00:00:00 2001 From: yafeilee Date: Mon, 21 Jul 2014 14:51:21 +0800 Subject: [PATCH] upgrade all gems to newest versions --- Gemfile.lock | 122 ++++++++++-------- .../controllers/subscribes_controller_spec.rb | 6 +- spec/models/post_spec.rb | 2 +- spec/models/subscribe_spec.rb | 8 +- spec/spec_helper.rb | 1 + 5 files changed, 77 insertions(+), 62 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 81e9bac..387e458 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -27,11 +27,11 @@ GEM minitest (~> 5.1) thread_safe (~> 0.1) tzinfo (~> 1.1) - angularjs-rails (1.2.16) + angularjs-rails (1.2.20) arel (5.0.1.20140414130214) - bson (2.2.4) + bson (2.3.0) builder (3.2.2) - capybara (2.2.1) + capybara (2.4.1) mime-types (>= 1.16) nokogiri (>= 1.3.3) rack (>= 1.0.0) @@ -49,19 +49,22 @@ GEM celluloid (0.15.2) timers (~> 1.1.0) chunky_png (1.3.1) + codeclimate-test-reporter (0.3.0) + simplecov (>= 0.7.1, < 1.0.0) coderay (1.1.0) coffee-rails (4.0.1) coffee-script (>= 2.2.0) railties (>= 4.0.0, < 5.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.7.1) connection_pool (2.0.0) database_cleaner (1.3.0) diff-lcs (1.2.5) + docile (1.1.5) erubis (2.7.0) - execjs (2.0.2) + execjs (2.2.1) factory_girl (4.4.0) activesupport (>= 3.0.0) factory_girl_rails (4.4.1) @@ -75,7 +78,7 @@ GEM foundation-icons-sass-rails (3.0.0) railties (>= 3.1.1) sass-rails (>= 3.1.1) - foundation-rails (5.2.2.0) + foundation-rails (5.2.3.0) railties (>= 3.1.0) sass (>= 3.2.0) guard (2.6.1) @@ -87,25 +90,25 @@ GEM guard-bundler (2.0.0) bundler (~> 1.0) guard (~> 2.2) - guard-rails (0.5.0) - guard (>= 2.0.0) - guard-rspec (4.2.9) + guard-rails (0.5.3) + guard (~> 2.0) + guard-rspec (4.2.10) guard (~> 2.1) rspec (>= 2.14, < 4.0) hike (1.2.3) html_truncator (0.4.0) nokogiri (~> 1.5) - i18n (0.6.9) - jquery-rails (3.1.0) + i18n (0.6.11) + jquery-rails (3.1.1) railties (>= 3.0, < 5.0) thor (>= 0.14, < 2.0) json (1.8.1) kgio (2.9.2) - listen (2.7.5) + listen (2.7.9) celluloid (>= 0.15.2) rb-fsevent (>= 0.9.3) rb-inotify (>= 0.9) - lumberjack (1.0.5) + lumberjack (1.0.9) mail (2.5.4) mime-types (~> 1.16) treetop (~> 1.4.8) @@ -114,10 +117,10 @@ GEM mini_magick (3.7.0) subexec (~> 0.2.1) mini_portile (0.6.0) - minitest (5.3.4) - mongoid (4.0.0.beta1) - activemodel (>= 4.0.0) - moped (~> 2.0.beta6) + minitest (5.4.0) + mongoid (4.0.0) + activemodel (~> 4.0) + moped (~> 2.0.0) origin (~> 2.1) tzinfo (>= 0.3.37) mongoid-grid_fs (2.1.0) @@ -126,30 +129,31 @@ GEM mongoid-pagination (0.2.0) activesupport mongoid - mongoid-rspec (1.4.6) - mongoid (>= 3.0.0.rc) + mongoid-rspec (1.10.0) + mongoid (>= 3.0.1) rake - rspec (>= 2.9) - moped (2.0.0.rc1) + rspec (>= 2.14) + moped (2.0.0) bson (~> 2.2) connection_pool (~> 2.0) optionable (~> 0.2.0) multi_json (1.10.1) - newrelic_rpm (3.8.1.221) - nokogiri (1.6.2.1) + netrc (0.7.7) + newrelic_rpm (3.9.0.229) + nokogiri (1.6.3) mini_portile (= 0.6.0) optionable (0.2.0) origin (2.1.1) - polyglot (0.3.4) + polyglot (0.3.5) pry (0.9.12.6) coderay (~> 1.0) method_source (~> 0.8) slop (~> 3.4) - pry-nav (0.2.3) + pry-nav (0.2.2) pry (~> 0.9.10) pry-rails (0.3.2) pry (>= 0.9.10) - quiet_assets (1.0.2) + quiet_assets (1.0.3) railties (>= 3.1, < 5.0) rack (1.5.2) rack-test (0.6.2) @@ -172,35 +176,39 @@ GEM raindrops (0.13.0) rake (10.3.2) rb-fsevent (0.9.4) - rb-inotify (0.9.4) + rb-inotify (0.9.5) ffi (>= 0.5.0) redcarpet (3.1.2) - redis (3.0.7) - redis-namespace (1.4.1) - redis (~> 3.0.4) - rest-client (1.6.7) - mime-types (>= 1.16) - rouge (1.3.4) + redis (3.1.0) + redis-namespace (1.5.0) + redis (~> 3.0, >= 3.0.4) + rest-client (1.7.2) + mime-types (>= 1.16, < 3.0) + netrc (~> 0.7) + rouge (1.5.1) rqrcode-with-patches (0.5.4) chunky_png - rspec (2.14.1) - rspec-core (~> 2.14.0) - rspec-expectations (~> 2.14.0) - rspec-mocks (~> 2.14.0) - rspec-core (2.14.8) - rspec-expectations (2.14.5) + rspec (2.99.0) + rspec-core (~> 2.99.0) + rspec-expectations (~> 2.99.0) + rspec-mocks (~> 2.99.0) + rspec-collection_matchers (1.0.0) + rspec-expectations (>= 2.99.0.beta1) + rspec-core (2.99.1) + rspec-expectations (2.99.1) diff-lcs (>= 1.1.3, < 2.0) - rspec-mocks (2.14.6) - rspec-rails (2.14.2) + rspec-mocks (2.99.1) + rspec-rails (2.99.0) actionpack (>= 3.0) activemodel (>= 3.0) activesupport (>= 3.0) railties (>= 3.0) - rspec-core (~> 2.14.0) - rspec-expectations (~> 2.14.0) - rspec-mocks (~> 2.14.0) - rspec-sidekiq (1.0.0) - rspec (>= 2.0.0) + rspec-collection_matchers + rspec-core (~> 2.99.0) + rspec-expectations (~> 2.99.0) + rspec-mocks (~> 2.99.0) + rspec-sidekiq (1.1.0) + rspec (~> 2.0) sidekiq (>= 2.4.0) sass (3.2.19) sass-rails (4.0.3) @@ -208,7 +216,7 @@ GEM sass (~> 3.2.0) sprockets (~> 2.8, <= 2.11.0) sprockets-rails (~> 2.0) - sidekiq (3.1.0) + sidekiq (3.2.1) celluloid (>= 0.15.2) connection_pool (>= 2.0.0) json @@ -217,15 +225,20 @@ GEM simple_form (3.0.2) actionpack (~> 4.0) activemodel (~> 4.0) - slim (2.0.2) + simplecov (0.9.0) + docile (~> 1.1.0) + multi_json + simplecov-html (~> 0.8.0) + simplecov-html (0.8.0) + slim (2.0.3) temple (~> 0.6.6) tilt (>= 1.3.3, < 2.1) - slim-rails (2.1.4) + slim-rails (2.1.5) actionpack (>= 3.0, < 4.2) activesupport (>= 3.0, < 4.2) railties (>= 3.0, < 4.2) slim (~> 2.0) - slop (3.5.0) + slop (3.6.0) spring (1.1.3) sprockets (2.11.0) hike (~> 1.2) @@ -237,9 +250,9 @@ GEM activesupport (>= 3.0) sprockets (~> 2.8) subexec (0.2.3) - temple (0.6.7) + temple (0.6.8) thor (0.19.1) - thread_safe (0.3.3) + thread_safe (0.3.4) tilt (1.4.1) timers (1.1.0) treetop (1.4.15) @@ -247,7 +260,7 @@ GEM polyglot (>= 0.3.1) tzinfo (1.1.0) thread_safe (~> 0.1) - uglifier (2.5.0) + uglifier (2.5.3) execjs (>= 0.3.0) json (>= 1.8.0) unicorn (4.8.3) @@ -265,6 +278,7 @@ DEPENDENCIES capybara carrierwave-mongoid chunky_png + codeclimate-test-reporter coffee-rails (~> 4.0.1) database_cleaner factory_girl_rails diff --git a/spec/controllers/subscribes_controller_spec.rb b/spec/controllers/subscribes_controller_spec.rb index 3cc33b6..15037e6 100644 --- a/spec/controllers/subscribes_controller_spec.rb +++ b/spec/controllers/subscribes_controller_spec.rb @@ -5,15 +5,15 @@ describe SubscribesController do describe "POST 'create'" do it "post ok" do post 'create', email: 'tester@test.com' - expect(JSON.parse(response.body)['success']).to be_true + expect(JSON.parse(response.body)['success']).to be_truthy expect(Subscribe.all.size).to eq(1) end it "post with disabled email" do subscribe = Subscribe.create(email: 'tester@test.com', enable: false) post 'create', email: 'tester@test.com' - expect(JSON.parse(response.body)['success']).to be_true - expect(subscribe.reload.enable).to be_true + expect(JSON.parse(response.body)['success']).to be_truthy + expect(subscribe.reload.enable).to be_truthy end end diff --git a/spec/models/post_spec.rb b/spec/models/post_spec.rb index ca5e54f..e30d11a 100644 --- a/spec/models/post_spec.rb +++ b/spec/models/post_spec.rb @@ -2,6 +2,6 @@ require 'spec_helper' describe Post do it "validates should be ok" do - expect(create(:post)).to be_true + expect(create(:post)).to be_truthy end end diff --git a/spec/models/subscribe_spec.rb b/spec/models/subscribe_spec.rb index 0d1f6a4..acc252e 100644 --- a/spec/models/subscribe_spec.rb +++ b/spec/models/subscribe_spec.rb @@ -1,18 +1,18 @@ require 'spec_helper' describe Subscribe do it "validates should be ok" do - expect(create(:subscribe)).to be_true + expect(create(:subscribe)).to be_truthy end it 'uniqueness' do create(:subscribe) two = build(:subscribe) - expect(two.save).to be_false + expect(two.save).to be_falsey end it "default is true" do subscribe = Subscribe.create(email: 'tester@test.com') - expect(subscribe.enable).to be_true + expect(subscribe.enable).to be_truthy end it "subscribe_list" do @@ -23,6 +23,6 @@ describe Subscribe do it "unsubscribe?" do subscribe = Subscribe.create(email: 'tester@test.com', enable: false) - expect(Subscribe.unsubscribe?('tester@test.com')).to be_true + expect(Subscribe.unsubscribe?('tester@test.com')).to be_truthy end end diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb index c82b917..c9ef59b 100644 --- a/spec/spec_helper.rb +++ b/spec/spec_helper.rb @@ -11,6 +11,7 @@ require 'rspec/autorun' Dir[Rails.root.join("spec/support/**/*.rb")].each {|f| require f} RSpec.configure do |config| + config.infer_spec_type_from_file_location! config.include FactoryGirl::Syntax::Methods config.before :each do DatabaseCleaner.strategy = :truncation