diff --git a/Gemfile b/Gemfile index 27e5005..a958a89 100644 --- a/Gemfile +++ b/Gemfile @@ -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 diff --git a/Gemfile.lock b/Gemfile.lock index ba14444..fe23ee1 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -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) diff --git a/spec/controllers/tutorials_controller_spec.rb b/spec/controllers/tutorials_controller_spec.rb index c9fc1af..d8db500 100644 --- a/spec/controllers/tutorials_controller_spec.rb +++ b/spec/controllers/tutorials_controller_spec.rb @@ -1,4 +1,4 @@ -require 'rails_helper' +require 'spec_helper' RSpec.describe TutorialsController, :type => :controller do