Commit b2503e61c281fdb1d04a66aca4b3a0f485947a7d
1 parent
49557000
Exists in
master
and in
1 other branch
Small cleanup on spec_helper
Showing
1 changed file
with
3 additions
and
7 deletions
Show diff stats
spec/spec_helper.rb
| @@ -30,10 +30,6 @@ require 'errbit_plugin/mock_issue_tracker' | @@ -30,10 +30,6 @@ require 'errbit_plugin/mock_issue_tracker' | ||
| 30 | # in ./support/ and its subdirectories. | 30 | # in ./support/ and its subdirectories. |
| 31 | Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each {|f| require f} | 31 | Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each {|f| require f} |
| 32 | 32 | ||
| 33 | -Fabrication.configure do |config| | ||
| 34 | - fabricator_dir = "spec/fabricators" | ||
| 35 | -end | ||
| 36 | - | ||
| 37 | RSpec.configure do |config| | 33 | RSpec.configure do |config| |
| 38 | config.mock_with :rspec | 34 | config.mock_with :rspec |
| 39 | config.include Devise::TestHelpers, :type => :controller | 35 | config.include Devise::TestHelpers, :type => :controller |
| @@ -47,9 +43,9 @@ RSpec.configure do |config| | @@ -47,9 +43,9 @@ RSpec.configure do |config| | ||
| 47 | DatabaseCleaner.clean | 43 | DatabaseCleaner.clean |
| 48 | end | 44 | end |
| 49 | 45 | ||
| 50 | - config.include Haml, :type => :helper | ||
| 51 | - config.include Haml::Helpers, :type => :helper | ||
| 52 | - config.before(:each, :type => :helper) do |config| | 46 | + config.include Haml, type: :helper |
| 47 | + config.include Haml::Helpers, type: :helper | ||
| 48 | + config.before(:each, type: :helper) do |_| | ||
| 53 | init_haml_helpers | 49 | init_haml_helpers |
| 54 | end | 50 | end |
| 55 | end | 51 | end |