mirrors/fluentd-ui
1
0
Fork 0
mirror of https://github.com/fluent/fluentd-ui.git synced 2026-05-05 02:46:11 +02:00
Code Issues Projects Releases Wiki Activity

Downgrade rspec 3.00 -> 2.99 because rails g controller generated a spec that require 'rails_helper', but we haven't it"

Browse Source 
Re-run rails g rspec:install causes many conflicts on spec_helper.rb
I'll investigate and solve it in the future
This commit is contained in:
uu59 2014-06-04 15:33:23 +09:00
parent 0273a8dbe0
commit e2c9cf5a3f
3 changed files with 15 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Gemfile
View File

@ -7,7 +7,7 @@ gemspec
group :development, :test do
gem "rake"
gem "pry"
gem "rspec-rails", "~> 3.0"
gem "rspec-rails", "~> 2.99"
end
group :test do

27
Gemfile.lock
View File

@ -156,22 +156,21 @@ GEM
rake (>= 0.8.7)
thor (>= 0.18.1, < 2.0)
rake (10.3.2)
rspec-core (3.0.0)
rspec-support (~> 3.0.0)
rspec-expectations (3.0.0)
diff-lcs (>= 1.2.0, < 2.0)
rspec-support (~> 3.0.0)
rspec-mocks (3.0.0)
rspec-support (~> 3.0.0)
rspec-rails (3.0.1)
rspec-collection_matchers (0.0.4)
rspec-expectations (>= 2.99.0.beta1)
rspec-core (2.99.0)
rspec-expectations (2.99.0)
diff-lcs (>= 1.1.3, < 2.0)
rspec-mocks (2.99.0)
rspec-rails (2.99.0)
actionpack (>= 3.0)
activemodel (>= 3.0)
activesupport (>= 3.0)
railties (>= 3.0)
rspec-core (~> 3.0.0)
rspec-expectations (~> 3.0.0)
rspec-mocks (~> 3.0.0)
rspec-support (~> 3.0.0)
rspec-support (3.0.0)
rspec-collection_matchers
rspec-core (~> 2.99.0)
rspec-expectations (~> 2.99.0)
rspec-mocks (~> 2.99.0)
safe_yaml (1.0.3)
sass (3.2.19)
sass-rails (4.0.3)
@ -228,6 +227,6 @@ DEPENDENCIES
fluentd-ui!
pry
rake
rspec-rails (~> 3.0)
rspec-rails (~> 2.99)
simplecov (~> 0.7.1)
webmock (~> 1.18.0)

2
spec/controllers/tutorials_controller_spec.rb
View File

@ -1,4 +1,4 @@
require 'rails_helper'
require 'spec_helper'
RSpec.describe TutorialsController, :type => :controller do