diff --git a/Gemfile b/Gemfile index 10bd33d26a..b4ecf7958e 100644 --- a/Gemfile +++ b/Gemfile @@ -135,9 +135,9 @@ group :test do gem 'rack_session_access' gem 'database_cleaner' gem "cucumber-rails-training-wheels" # http://aslakhellesoy.com/post/11055981222/the-training-wheels-came-off - gem 'rspec', '~> 2.14' + gem 'rspec', '~> 2.99.0.beta2' # also add to development group, so "spec" rake task gets loaded - gem "rspec-rails", "~> 2.14", :group => :development + gem "rspec-rails", "~> 2.99.0.beta2", :group => :development gem 'rspec-example_disabler', github: 'finnlabs/rspec-example_disabler', branch: 'master' gem 'capybara' gem 'capybara-screenshot' diff --git a/Gemfile.lock b/Gemfile.lock index 40f2c402c0..c34525fda4 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -276,22 +276,25 @@ GEM json (~> 1.4) ref (1.0.5) request_store (1.0.5) - 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.beta2) + rspec-core (= 2.99.0.beta2) + rspec-expectations (= 2.99.0.beta2) + rspec-mocks (= 2.99.0.beta2) + rspec-collection_matchers (0.0.3) + rspec-expectations (>= 2.99.0.beta1) + rspec-core (2.99.0.beta2) + rspec-expectations (2.99.0.beta2) diff-lcs (>= 1.1.3, < 2.0) - rspec-mocks (2.14.6) - rspec-rails (2.14.2) + rspec-mocks (2.99.0.beta2) + rspec-rails (2.99.0.beta2) 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-collection_matchers + rspec-core (= 2.99.0.beta2) + rspec-expectations (= 2.99.0.beta2) + rspec-mocks (= 2.99.0.beta2) ruby-prof (0.13.0) ruby-progressbar (1.2.0) rubytree (0.8.3) @@ -424,9 +427,9 @@ DEPENDENCIES rb-readline rdoc (>= 2.4.2) request_store - rspec (~> 2.14) + rspec (~> 2.99.0.beta2) rspec-example_disabler! - rspec-rails (~> 2.14) + rspec-rails (~> 2.99.0.beta2) ruby-prof ruby-progressbar rubytree (~> 0.8.3)