Download as
Browse Code »

Commit 9afccaa8c69879436c9b0617f8f0243eceee4677

Authored by Dmitriy Zaporozhets
2 parents a5d7d125 2855a799
Exists in spb-stable and in 3 other branches 6-8-stable, 7-0-stable, 7-0-stable-spb

Merge pull request #6554 from tsigo/remove-spork 

Remove Spork
Showing 4 changed files with 45 additions and 61 deletions   Show diff stats
.rspec
  Diff comments   View file @9afccaa
1   ---color --drb
  1 +--color
... ...
Gemfile
  Diff comments   View file @9afccaa
... ... @@ -218,7 +218,6 @@ group :development, :test do
218 218 # PhantomJS driver for Capybara
219 219 gem 'poltergeist', '~> 1.4.1'
220 220  
221   - gem 'spork', '~> 1.0rc'
222 221 gem 'jasmine', '2.0.0.rc5'
223 222  
224 223 gem "spring", '1.1.1'
... ...
Gemfile.lock
  Diff comments   View file @9afccaa
... ... @@ -484,7 +484,6 @@ GEM
484 484 capybara (>= 2.0.0)
485 485 railties (>= 3)
486 486 spinach (>= 0.4)
487   - spork (1.0.0rc4)
488 487 spring (1.1.1)
489 488 spring-commands-rspec (1.0.1)
490 489 spring (>= 0.9.1)
... ... @@ -661,7 +660,6 @@ DEPENDENCIES
661 660 slack-notifier (~> 0.2.0)
662 661 slim
663 662 spinach-rails
664   - spork (~> 1.0rc)
665 663 spring (= 1.1.1)
666 664 spring-commands-rspec (= 1.0.1)
667 665 spring-commands-spinach (= 1.0.0)
... ...
spec/spec_helper.rb
  Diff comments   View file @9afccaa
1   -require 'rubygems'
2   -require 'spork'
  1 +# This file is copied to spec/ when you run 'rails generate rspec:install'
  2 +ENV["RAILS_ENV"] ||= 'test'
  3 +require File.expand_path("../../config/environment", __FILE__)
3 4  
4   -Spork.prefork do
5   - require 'simplecov' unless ENV['CI']
  5 +require 'simplecov' unless ENV['CI']
6 6  
7   - if ENV['TRAVIS']
8   - require 'coveralls'
9   - Coveralls.wear!
10   - end
11   -
12   - # This file is copied to spec/ when you run 'rails generate rspec:install'
13   - ENV["RAILS_ENV"] ||= 'test'
14   - require File.expand_path("../../config/environment", __FILE__)
15   - require 'rspec/rails'
16   - require 'capybara/rails'
17   - require 'capybara/rspec'
18   - require 'webmock/rspec'
19   - require 'email_spec'
20   - require 'sidekiq/testing/inline'
21   - require 'capybara/poltergeist'
22   -
23   - # Loading more in this block will cause your tests to run faster. However,
24   -
25   - # if you change any configuration or code from libraries loaded here, you'll
26   - # need to restart spork for it take effect.
27   - Capybara.javascript_driver = :poltergeist
28   - Capybara.default_wait_time = 10
29   -
30   - # Requires supporting ruby files with custom matchers and macros, etc,
31   - # in spec/support/ and its subdirectories.
32   - Dir[Rails.root.join("spec/support/**/*.rb")].each {|f| require f}
33   -
34   - WebMock.disable_net_connect!(allow_localhost: true)
35   -
36   - RSpec.configure do |config|
37   - config.mock_with :rspec
38   -
39   - config.include LoginHelpers, type: :feature
40   - config.include LoginHelpers, type: :request
41   - config.include FactoryGirl::Syntax::Methods
42   - config.include Devise::TestHelpers, type: :controller
43   -
44   - config.include TestEnv
45   -
46   - # If you're not using ActiveRecord, or you'd prefer not to run each of your
47   - # examples within a transaction, remove the following line or assign false
48   - # instead of true.
49   - config.use_transactional_fixtures = false
50   -
51   - config.before(:suite) do
52   - TestEnv.init(observers: false, init_repos: true, repos: false)
53   - end
54   - config.before(:each) do
55   - TestEnv.setup_stubs
56   - end
57   - end
  7 +if ENV['TRAVIS']
  8 + require 'coveralls'
  9 + Coveralls.wear!
58 10 end
59 11  
60   -Spork.each_run do
61   - # This code will be run each time you run your specs.
  12 +require 'rspec/rails'
  13 +require 'capybara/rails'
  14 +require 'capybara/rspec'
  15 +require 'webmock/rspec'
  16 +require 'email_spec'
  17 +require 'sidekiq/testing/inline'
  18 +require 'capybara/poltergeist'
  19 +
  20 +Capybara.javascript_driver = :poltergeist
  21 +Capybara.default_wait_time = 10
  22 +
  23 +# Requires supporting ruby files with custom matchers and macros, etc,
  24 +# in spec/support/ and its subdirectories.
  25 +Dir[Rails.root.join("spec/support/**/*.rb")].each {|f| require f}
  26 +
  27 +WebMock.disable_net_connect!(allow_localhost: true)
62 28  
  29 +RSpec.configure do |config|
  30 + config.mock_with :rspec
  31 +
  32 + config.include LoginHelpers, type: :feature
  33 + config.include LoginHelpers, type: :request
  34 + config.include FactoryGirl::Syntax::Methods
  35 + config.include Devise::TestHelpers, type: :controller
  36 +
  37 + config.include TestEnv
  38 +
  39 + # If you're not using ActiveRecord, or you'd prefer not to run each of your
  40 + # examples within a transaction, remove the following line or assign false
  41 + # instead of true.
  42 + config.use_transactional_fixtures = false
  43 +
  44 + config.before(:suite) do
  45 + TestEnv.init(observers: false, init_repos: true, repos: false)
  46 + end
  47 + config.before(:each) do
  48 + TestEnv.setup_stubs
  49 + end
63 50 end
... ...