diff options
| author | Jeroen van Baarsen <jeroenvanbaarsen@gmail.com> | 2015-02-13 17:48:31 +0100 |
|---|---|---|
| committer | Robert Speicher <rspeicher@gmail.com> | 2015-06-14 22:59:39 -0400 |
| commit | 82b801fdea54b254fa4c19a01f6ca628790e2de4 (patch) | |
| tree | 04c08d136446f03373e898b9440c6c31c893b33f | |
| parent | 5c6d83b8e772dedb753336d83783123e166fbe40 (diff) | |
| download | gitlab-ce-82b801fdea54b254fa4c19a01f6ca628790e2de4.tar.gz | |
Started on the actual rspec 3 upgrade
Signed-off-by: Jeroen van Baarsen <jeroenvanbaarsen@gmail.com>
| -rw-r--r-- | Gemfile | 4 | ||||
| -rw-r--r-- | Gemfile.lock | 27 | ||||
| -rw-r--r-- | features/support/env.rb | 1 | ||||
| -rw-r--r-- | spec/rails_helper.rb | 1 |
4 files changed, 18 insertions, 15 deletions
@@ -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 fd7cbd508e5..38407ee653f 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 d4a878ea4ce..672251af084 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 00000000000..671fd6c8666 --- /dev/null +++ b/spec/rails_helper.rb @@ -0,0 +1 @@ +require "spec_helper" |