Skip to content

Commit 4fb08b4

Browse files
committed
update gem rspec-rails from v2.13.1 to 2.14.1
minitest5の変更のためか、rails 4.1でrspec 2.13.1だとwarnがでるらしい。 @see rspec/rspec-rails#772
1 parent ae4a340 commit 4fb08b4

File tree

3 files changed

+12
-10
lines changed

3 files changed

+12
-10
lines changed

Gemfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ gem 'rails', '4.1.1'
66

77
group :development, :test do
88
gem 'sqlite3', '1.3.8'
9-
gem 'rspec-rails', '2.13.1'
9+
gem 'rspec-rails', '2.14.1'
1010
end
1111

1212
group :test do

Gemfile.lock

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ GEM
5050
ffi (1.9.3)
5151
hike (1.2.3)
5252
i18n (0.6.9)
53-
jbuilder (2.1.0)
53+
jbuilder (2.1.1)
5454
activesupport (>= 3.0.0, < 5)
5555
multi_json (~> 1.2)
5656
jquery-rails (3.1.0)
@@ -94,17 +94,18 @@ GEM
9494
rake (10.3.2)
9595
rdoc (3.12.2)
9696
json (~> 1.4)
97-
rspec-core (2.13.1)
98-
rspec-expectations (2.13.0)
97+
rspec-core (2.14.8)
98+
rspec-expectations (2.14.5)
9999
diff-lcs (>= 1.1.3, < 2.0)
100-
rspec-mocks (2.13.1)
101-
rspec-rails (2.13.1)
100+
rspec-mocks (2.14.6)
101+
rspec-rails (2.14.1)
102102
actionpack (>= 3.0)
103+
activemodel (>= 3.0)
103104
activesupport (>= 3.0)
104105
railties (>= 3.0)
105-
rspec-core (~> 2.13.0)
106-
rspec-expectations (~> 2.13.0)
107-
rspec-mocks (~> 2.13.0)
106+
rspec-core (~> 2.14.0)
107+
rspec-expectations (~> 2.14.0)
108+
rspec-mocks (~> 2.14.0)
108109
rubyzip (0.9.9)
109110
sass (3.2.19)
110111
sass-rails (4.0.3)
@@ -159,7 +160,7 @@ DEPENDENCIES
159160
pg (= 0.15.1)
160161
rails (= 4.1.1)
161162
rails_12factor (= 0.0.2)
162-
rspec-rails (= 2.13.1)
163+
rspec-rails (= 2.14.1)
163164
sass-rails (~> 4.0.3)
164165
sdoc (= 0.3.20)
165166
selenium-webdriver (= 2.35.1)

spec/spec_helper.rb

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
require 'rspec/rails'
55
require 'rspec/autorun'
66

7+
78
# Requires supporting ruby files with custom matchers and macros, etc,
89
# in spec/support/ and its subdirectories.
910
Dir[Rails.root.join("spec/support/**/*.rb")].each { |f| require f }

0 commit comments

Comments
 (0)