diff --git a/spec/controllers/invitations_controller_spec.rb b/spec/controllers/invitations_controller_spec.rb index 07272b689..0a986d201 100644 --- a/spec/controllers/invitations_controller_spec.rb +++ b/spec/controllers/invitations_controller_spec.rb @@ -2,7 +2,7 @@ # licensed under the Affero General Public License version 3 or later. See # the COPYRIGHT file. -require File.join(File.dirname(__FILE__), "..", "spec_helper") +require 'spec_helper' describe InvitationsController do include Devise::TestHelpers diff --git a/spec/models/jobs/socket_webfinger_spec.rb b/spec/models/jobs/socket_webfinger_spec.rb index c17b70a07..a3b59b033 100644 --- a/spec/models/jobs/socket_webfinger_spec.rb +++ b/spec/models/jobs/socket_webfinger_spec.rb @@ -1,4 +1,4 @@ -require File.join(Rails.root, 'spec/spec_helper') +require 'spec_helper' describe Jobs::SocketWebfinger do before do diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb index 35323e43b..83feae286 100644 --- a/spec/spec_helper.rb +++ b/spec/spec_helper.rb @@ -14,6 +14,8 @@ require 'factory_girl' include Devise::TestHelpers include WebMock::API include HelperMethods + +`rm #{File.join(Rails.root, 'tmp', 'fixture_builder.yml')}` # # Requires supporting files with custom matchers and macros, etc, # in ./support/ and its subdirectories.