Don't load tasks if they're already loaded
We were having problems under certain conditions with Travis and Knapsack where tasks were still being loaded twice and so they were being executed twice.
This commit is contained in:
2
Rakefile
2
Rakefile
@@ -3,5 +3,5 @@
|
||||
|
||||
require File.expand_path('../config/application', __FILE__)
|
||||
|
||||
Rails.application.load_tasks
|
||||
Rails.application.load_tasks if Rake::Task.tasks.empty?
|
||||
KnapsackPro.load_tasks if defined?(KnapsackPro)
|
||||
|
||||
@@ -12,7 +12,7 @@ require 'capybara/rails'
|
||||
require 'capybara/rspec'
|
||||
require 'selenium/webdriver'
|
||||
|
||||
Rails.application.load_tasks
|
||||
Rails.application.load_tasks if Rake::Task.tasks.empty?
|
||||
I18n.default_locale = :en
|
||||
|
||||
include Warden::Test::Helpers
|
||||
|
||||
Reference in New Issue
Block a user