kotovalexarian-likes-gitlab/gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

Started on the actual rspec 3 upgrade

Browse source 
Signed-off-by: Jeroen van Baarsen <jeroenvanbaarsen@gmail.com>
This commit is contained in:
Jeroen van Baarsen 2015-02-13 17:48:31 +01:00 committed by Dmitriy Zaporozhets
parent 75f7a9648e
commit f3d99a1e9c
4 changed files with 18 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Gemfile
View file

@ -225,8 +225,8 @@ group :development, :test do
gem 'coveralls', require: false gem 'coveralls', require: false
gem 'rubocop', '0.28.0', require: false gem 'rubocop', '0.28.0', require: false
gem 'spinach-rails' gem 'spinach-rails'
gem "rspec-rails", '2.99' gem "rspec-rails", '3.0.0'
gem 'capybara', '~> 2.2.1' gem "capybara", '~> 2.2.1'
gem 'capybara-screenshot', '~> 1.0.0' gem 'capybara-screenshot', '~> 1.0.0'
gem "pry-rails" gem "pry-rails"
gem "awesome_print" gem "awesome_print"

27
Gemfile.lock
View file

@ -530,21 +530,22 @@ GEM
rqrcode (0.4.2) rqrcode (0.4.2)
rqrcode-rails3 (0.1.7) rqrcode-rails3 (0.1.7)
rqrcode (>= 0.4.2) rqrcode (>= 0.4.2)
rspec-collection_matchers (1.1.2) rspec-core (3.0.4)
rspec-expectations (>= 2.99.0.beta1) rspec-support (~> 3.0.0)
rspec-core (2.99.2) rspec-expectations (3.0.4)
rspec-expectations (2.99.2) diff-lcs (>= 1.2.0, < 2.0)
diff-lcs (>= 1.1.3, < 2.0) rspec-support (~> 3.0.0)
rspec-mocks (2.99.3) rspec-mocks (3.0.4)
rspec-rails (2.99.0) rspec-support (~> 3.0.0)
rspec-rails (3.0.0)
actionpack (>= 3.0) actionpack (>= 3.0)
activemodel (>= 3.0)
activesupport (>= 3.0) activesupport (>= 3.0)
railties (>= 3.0) railties (>= 3.0)
rspec-collection_matchers rspec-core (~> 3.0.0)
rspec-core (~> 2.99.0) rspec-expectations (~> 3.0.0)
rspec-expectations (~> 2.99.0) rspec-mocks (~> 3.0.0)
rspec-mocks (~> 2.99.0) rspec-support (~> 3.0.0)
rspec-support (3.0.4)
rubocop (0.28.0) rubocop (0.28.0)
astrolabe (~> 1.3) astrolabe (~> 1.3)
parser (>= 2.2.0.pre.7, < 3.0) parser (>= 2.2.0.pre.7, < 3.0)
@ -815,7 +816,7 @@ DEPENDENCIES
request_store request_store
rerun (~> 0.10.0) rerun (~> 0.10.0)
rqrcode-rails3 rqrcode-rails3
rspec-rails (= 2.99) rspec-rails (= 3.0.0)
rubocop (= 0.28.0) rubocop (= 0.28.0)
rugments (~> 1.0.0.beta7) rugments (~> 1.0.0.beta7)
sanitize (~> 2.0) sanitize (~> 2.0)

1
features/support/env.rb
View file

@ -25,6 +25,7 @@ WebMock.allow_net_connect!
Spinach.hooks.before_run do Spinach.hooks.before_run do
include RSpec::Mocks::ExampleMethods include RSpec::Mocks::ExampleMethods
RSpec::Mocks.setup
TestEnv.init(mailer: false) TestEnv.init(mailer: false)
include FactoryGirl::Syntax::Methods include FactoryGirl::Syntax::Methods

1
spec/rails_helper.rb Normal file
View file

@ -0,0 +1 @@
require "spec_helper"