From f3d99a1e9c742081148bdb66aa0fa4e19fc20b64 Mon Sep 17 00:00:00 2001 From: Jeroen van Baarsen <jeroenvanbaarsen@gmail.com> Date: Fri, 13 Feb 2015 17:48:31 +0100 Subject: [PATCH] Started on the actual rspec 3 upgrade Signed-off-by: Jeroen van Baarsen <jeroenvanbaarsen@gmail.com> --- Gemfile | 4 ++-- Gemfile.lock | 27 ++++++++++++++------------- features/support/env.rb | 1 + spec/rails_helper.rb | 1 + 4 files changed, 18 insertions(+), 15 deletions(-) create mode 100644 spec/rails_helper.rb diff --git a/Gemfile b/Gemfile index 4f01d13a1..88f96fccc 100644 --- a/Gemfile +++ b/Gemfile @@ -225,8 +225,8 @@ group :development, :test do gem 'coveralls', require: false gem 'rubocop', '0.28.0', require: false gem 'spinach-rails' - gem "rspec-rails", '2.99' - gem 'capybara', '~> 2.2.1' + gem "rspec-rails", '3.0.0' + gem "capybara", '~> 2.2.1' gem 'capybara-screenshot', '~> 1.0.0' gem "pry-rails" gem "awesome_print" diff --git a/Gemfile.lock b/Gemfile.lock index e64a32b62..073545d2c 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -530,21 +530,22 @@ GEM rqrcode (0.4.2) rqrcode-rails3 (0.1.7) rqrcode (>= 0.4.2) - 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-mocks (2.99.3) - rspec-rails (2.99.0) + rspec-core (3.0.4) + rspec-support (~> 3.0.0) + rspec-expectations (3.0.4) + diff-lcs (>= 1.2.0, < 2.0) + rspec-support (~> 3.0.0) + rspec-mocks (3.0.4) + rspec-support (~> 3.0.0) + rspec-rails (3.0.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-core (~> 3.0.0) + rspec-expectations (~> 3.0.0) + rspec-mocks (~> 3.0.0) + rspec-support (~> 3.0.0) + rspec-support (3.0.4) rubocop (0.28.0) astrolabe (~> 1.3) parser (>= 2.2.0.pre.7, < 3.0) @@ -815,7 +816,7 @@ DEPENDENCIES request_store rerun (~> 0.10.0) rqrcode-rails3 - rspec-rails (= 2.99) + rspec-rails (= 3.0.0) rubocop (= 0.28.0) rugments (~> 1.0.0.beta7) sanitize (~> 2.0) diff --git a/features/support/env.rb b/features/support/env.rb index d4a878ea4..672251af0 100644 --- a/features/support/env.rb +++ b/features/support/env.rb @@ -25,6 +25,7 @@ WebMock.allow_net_connect! Spinach.hooks.before_run do include RSpec::Mocks::ExampleMethods + RSpec::Mocks.setup TestEnv.init(mailer: false) include FactoryGirl::Syntax::Methods diff --git a/spec/rails_helper.rb b/spec/rails_helper.rb new file mode 100644 index 000000000..671fd6c86 --- /dev/null +++ b/spec/rails_helper.rb @@ -0,0 +1 @@ +require "spec_helper" -- 2.30.9