From 084836f0009688dd06aa4335efb7559c5e3dec23 Mon Sep 17 00:00:00 2001
From: yoshihara <h.yoshihara@everyleaf.com>
Date: Thu, 2 Apr 2015 14:02:04 +0900
Subject: [PATCH 1/2] Update rspec ~> 3.0 and dependency gems to prepare rails
 4.2 updating

refs #161
---
 Gemfile      |  2 +-
 Gemfile.lock | 36 +++++++++++++++++++-----------------
 2 files changed, 20 insertions(+), 18 deletions(-)

diff --git a/Gemfile b/Gemfile
index 3d19ce4..b2a93de 100644
--- a/Gemfile
+++ b/Gemfile
@@ -8,7 +8,7 @@ group :development, :test do
   gem "rake"
   gem "pry"
   gem "pry-rails"
-  gem "rspec-rails", "~> 2.99"
+  gem "rspec-rails", "~> 3.0"
 end
 
 group :development do
diff --git a/Gemfile.lock b/Gemfile.lock
index 572692d..eda3eef 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -182,24 +182,26 @@ GEM
       thor (>= 0.18.1, < 2.0)
     rake (10.4.2)
     request_store (1.1.0)
-    rspec-collection_matchers (1.1.2)
-      rspec-expectations (>= 2.99.0.beta1)
-    rspec-core (2.99.2)
-    rspec-expectations (2.99.2)
-      diff-lcs (>= 1.1.3, < 2.0)
+    rspec-core (3.2.2)
+      rspec-support (~> 3.2.0)
+    rspec-expectations (3.2.0)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.2.0)
     rspec-its (1.0.1)
       rspec-core (>= 2.99.0.beta1)
       rspec-expectations (>= 2.99.0.beta1)
-    rspec-mocks (2.99.3)
-    rspec-rails (2.99.0)
-      actionpack (>= 3.0)
-      activemodel (>= 3.0)
-      activesupport (>= 3.0)
-      railties (>= 3.0)
-      rspec-collection_matchers
-      rspec-core (~> 2.99.0)
-      rspec-expectations (~> 2.99.0)
-      rspec-mocks (~> 2.99.0)
+    rspec-mocks (3.2.1)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.2.0)
+    rspec-rails (3.2.1)
+      actionpack (>= 3.0, < 4.3)
+      activesupport (>= 3.0, < 4.3)
+      railties (>= 3.0, < 4.3)
+      rspec-core (~> 3.2.0)
+      rspec-expectations (~> 3.2.0)
+      rspec-mocks (~> 3.2.0)
+      rspec-support (~> 3.2.0)
+    rspec-support (3.2.2)
     rubyzip (1.1.7)
     safe_yaml (1.0.4)
     sass (3.2.19)
@@ -228,7 +230,7 @@ GEM
     sucker_punch (1.0.5)
       celluloid (~> 0.15.2)
     thor (0.19.1)
-    thread_safe (0.3.4)
+    thread_safe (0.3.5)
     tilt (1.4.1)
     timecop (0.7.1)
     timers (1.1.0)
@@ -265,7 +267,7 @@ DEPENDENCIES
   pry-rails
   rake
   rspec-its
-  rspec-rails (~> 2.99)
+  rspec-rails (~> 3.0)
   simplecov (~> 0.7.1)
   timecop
   webmock (~> 1.18.0)

From 9dc12cc5bb014553ef3fd7c373ff7d9826ac2da4 Mon Sep 17 00:00:00 2001
From: yoshihara <h.yoshihara@everyleaf.com>
Date: Thu, 2 Apr 2015 14:03:09 +0900
Subject: [PATCH 2/2] Update capybara ~> 2.4.0 to surpress warning

refs #161

The below warning was surpressed by the newest capybara.
 c.f. https://github.com/jnicklas/capybara/issues/1254

Warning:
--------------------------------------------------------------------------------
Capybara::RSpecMatchers::HaveText implements a legacy RSpec matcher
protocol. For the current protocol you should expose the failure messages
via the `failure_message` and `failure_message_when_negated` methods.
(Used from /Users/yoshihara/everyleaf/fluentd-ui/spec/features/fluentd/setting/running_backup_spec.rb:85:in `block (6 levels) in <top (required)>')
--------------------------------------------------------------------------------

And specs are all green :)
---
 Gemfile      | 2 +-
 Gemfile.lock | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Gemfile b/Gemfile
index b2a93de..38e459b 100644
--- a/Gemfile
+++ b/Gemfile
@@ -19,7 +19,7 @@ group :test do
   gem "rspec-its"
   gem "factory_girl_rails"
   gem "database_cleaner", "~> 1.2.0"
-  gem "capybara", "~> 2.2.1"
+  gem "capybara", "~> 2.4.0"
   gem "capybara-screenshot"
   gem "simplecov", "~> 0.7.1", require: false
   gem "webmock", "~> 1.18.0"
diff --git a/Gemfile.lock b/Gemfile.lock
index eda3eef..35484c3 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -54,7 +54,7 @@ GEM
     addressable (2.3.6)
     arel (5.0.1.20140414130214)
     builder (3.2.2)
-    capybara (2.2.1)
+    capybara (2.4.4)
       mime-types (>= 1.16)
       nokogiri (>= 1.3.3)
       rack (>= 1.0.0)
@@ -256,7 +256,7 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  capybara (~> 2.2.1)
+  capybara (~> 2.4.0)
   capybara-screenshot
   database_cleaner (~> 1.2.0)
   factory_girl_rails